Skip to content

Remove dead code #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Remove dead code #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56a7c1d
Add missing checks to memory_provider.c
ldorau Nov 14, 2024
ac2389b
Remove dead code
ldorau Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions examples/custom_file_provider/custom_file_provider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ static void file_deinit(void *provider) {
// Function to allocate memory from the file provider
static umf_result_t file_alloc(void *provider, size_t size, size_t alignment,
void **ptr) {
if (provider == NULL || ptr == NULL) {
fprintf(stderr, "Provider or ptr cannot be null\n");
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
file_provider_t *file_provider = (file_provider_t *)provider;
size_t page_size = file_provider->page_size;

Expand Down Expand Up @@ -165,8 +161,8 @@ static umf_result_t file_alloc(void *provider, size_t size, size_t alignment,

// Function to free allocated memory from the file provider
static umf_result_t file_free(void *provider, void *ptr, size_t size) {
if (provider == NULL || ptr == NULL) {
fprintf(stderr, "Provider or ptr cannot be null\n");
if (ptr == NULL) {
fprintf(stderr, "ptr cannot be null\n");
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
file_provider_t *file_provider = (file_provider_t *)provider;
Expand Down Expand Up @@ -221,11 +217,6 @@ static void file_get_last_native_error(void *provider, const char **ppMessage,
static umf_result_t file_get_recommended_page_size(void *provider, size_t size,
size_t *pageSize) {
(void)size; // Unused parameter
if (provider == NULL || pageSize == NULL) {
fprintf(stderr, "Provider or pageSize cannot be null\n");
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

file_provider_t *file_provider = (file_provider_t *)provider;
*pageSize = file_provider->page_size;
return UMF_RESULT_SUCCESS;
Expand All @@ -235,11 +226,6 @@ static umf_result_t file_get_recommended_page_size(void *provider, size_t size,
static umf_result_t file_get_min_page_size(void *provider, void *ptr,
size_t *pageSize) {
(void)ptr; // Unused parameter
if (provider == NULL || pageSize == NULL) {
fprintf(stderr, "Provider or pageSize cannot be null\n");
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

file_provider_t *file_provider = (file_provider_t *)provider;
*pageSize = file_provider->page_size;
return UMF_RESULT_SUCCESS;
Expand Down
50 changes: 29 additions & 21 deletions src/memory_provider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ checkErrorAndSetLastProvider(umf_result_t result,
umf_result_t umfMemoryProviderAlloc(umf_memory_provider_handle_t hProvider,
size_t size, size_t alignment, void **ptr) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
umf_result_t res =
hProvider->ops.alloc(hProvider->provider_priv, size, alignment, ptr);
checkErrorAndSetLastProvider(res, hProvider);
Expand Down Expand Up @@ -258,6 +259,7 @@ umf_result_t
umfMemoryProviderGetRecommendedPageSize(umf_memory_provider_handle_t hProvider,
size_t size, size_t *pageSize) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((pageSize != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
umf_result_t res = hProvider->ops.get_recommended_page_size(
hProvider->provider_priv, size, pageSize);
checkErrorAndSetLastProvider(res, hProvider);
Expand All @@ -268,6 +270,7 @@ umf_result_t
umfMemoryProviderGetMinPageSize(umf_memory_provider_handle_t hProvider,
void *ptr, size_t *pageSize) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((pageSize != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
umf_result_t res = hProvider->ops.get_min_page_size(
hProvider->provider_priv, ptr, pageSize);
checkErrorAndSetLastProvider(res, hProvider);
Expand All @@ -282,6 +285,7 @@ const char *umfMemoryProviderGetName(umf_memory_provider_handle_t hProvider) {
umf_result_t umfMemoryProviderPurgeLazy(umf_memory_provider_handle_t hProvider,
void *ptr, size_t size) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
umf_result_t res =
hProvider->ops.ext.purge_lazy(hProvider->provider_priv, ptr, size);
checkErrorAndSetLastProvider(res, hProvider);
Expand All @@ -291,6 +295,7 @@ umf_result_t umfMemoryProviderPurgeLazy(umf_memory_provider_handle_t hProvider,
umf_result_t umfMemoryProviderPurgeForce(umf_memory_provider_handle_t hProvider,
void *ptr, size_t size) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
umf_result_t res =
hProvider->ops.ext.purge_force(hProvider->provider_priv, ptr, size);
checkErrorAndSetLastProvider(res, hProvider);
Expand All @@ -305,15 +310,11 @@ umf_result_t
umfMemoryProviderAllocationSplit(umf_memory_provider_handle_t hProvider,
void *ptr, size_t totalSize,
size_t firstSize) {
if (!ptr) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
if (firstSize == 0 || totalSize == 0) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
if (firstSize >= totalSize) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((firstSize != 0 && totalSize != 0),
UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((firstSize < totalSize), UMF_RESULT_ERROR_INVALID_ARGUMENT);

umf_result_t res = hProvider->ops.ext.allocation_split(
hProvider->provider_priv, ptr, totalSize, firstSize);
Expand All @@ -325,18 +326,13 @@ umf_result_t
umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,
void *lowPtr, void *highPtr,
size_t totalSize) {
if (!lowPtr || !highPtr) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
if (totalSize == 0) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
if ((uintptr_t)lowPtr >= (uintptr_t)highPtr) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
if ((uintptr_t)highPtr - (uintptr_t)lowPtr > totalSize) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((lowPtr && highPtr), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((totalSize != 0), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK(((uintptr_t)lowPtr < (uintptr_t)highPtr),
UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK(((uintptr_t)highPtr - (uintptr_t)lowPtr < totalSize),
UMF_RESULT_ERROR_INVALID_ARGUMENT);

umf_result_t res = hProvider->ops.ext.allocation_merge(
hProvider->provider_priv, lowPtr, highPtr, totalSize);
Expand All @@ -347,6 +343,8 @@ umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,
umf_result_t
umfMemoryProviderGetIPCHandleSize(umf_memory_provider_handle_t hProvider,
size_t *size) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((size != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
return hProvider->ops.ipc.get_ipc_handle_size(hProvider->provider_priv,
size);
}
Expand All @@ -355,27 +353,37 @@ umf_result_t
umfMemoryProviderGetIPCHandle(umf_memory_provider_handle_t hProvider,
const void *ptr, size_t size,
void *providerIpcData) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((providerIpcData != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
return hProvider->ops.ipc.get_ipc_handle(hProvider->provider_priv, ptr,
size, providerIpcData);
}

umf_result_t
umfMemoryProviderPutIPCHandle(umf_memory_provider_handle_t hProvider,
void *providerIpcData) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((providerIpcData != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
return hProvider->ops.ipc.put_ipc_handle(hProvider->provider_priv,
providerIpcData);
}

umf_result_t
umfMemoryProviderOpenIPCHandle(umf_memory_provider_handle_t hProvider,
void *providerIpcData, void **ptr) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((providerIpcData != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
return hProvider->ops.ipc.open_ipc_handle(hProvider->provider_priv,
providerIpcData, ptr);
}

umf_result_t
umfMemoryProviderCloseIPCHandle(umf_memory_provider_handle_t hProvider,
void *ptr, size_t size) {
UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
UMF_CHECK((ptr != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
return hProvider->ops.ipc.close_ipc_handle(hProvider->provider_priv, ptr,
size);
}
19 changes: 0 additions & 19 deletions src/provider/provider_coarse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,10 +1478,6 @@ coarse_memory_provider_get_stats(void *provider,

static umf_result_t coarse_memory_provider_purge_lazy(void *provider, void *ptr,
size_t size) {
if (provider == NULL || ptr == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

coarse_memory_provider_t *coarse_provider =
(struct coarse_memory_provider_t *)provider;
if (coarse_provider->upstream_memory_provider == NULL) {
Expand All @@ -1495,10 +1491,6 @@ static umf_result_t coarse_memory_provider_purge_lazy(void *provider, void *ptr,

static umf_result_t coarse_memory_provider_purge_force(void *provider,
void *ptr, size_t size) {
if (provider == NULL || ptr == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

coarse_memory_provider_t *coarse_provider =
(struct coarse_memory_provider_t *)provider;
if (coarse_provider->upstream_memory_provider == NULL) {
Expand All @@ -1514,11 +1506,6 @@ static umf_result_t coarse_memory_provider_allocation_split(void *provider,
void *ptr,
size_t totalSize,
size_t firstSize) {
if (provider == NULL || ptr == NULL || (firstSize >= totalSize) ||
firstSize == 0) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

umf_result_t umf_result;

coarse_memory_provider_t *coarse_provider =
Expand Down Expand Up @@ -1578,12 +1565,6 @@ static umf_result_t coarse_memory_provider_allocation_merge(void *provider,
void *lowPtr,
void *highPtr,
size_t totalSize) {
if (provider == NULL || lowPtr == NULL || highPtr == NULL ||
((uintptr_t)highPtr <= (uintptr_t)lowPtr) ||
((uintptr_t)highPtr - (uintptr_t)lowPtr >= totalSize)) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

umf_result_t umf_result;

coarse_memory_provider_t *coarse_provider =
Expand Down
47 changes: 5 additions & 42 deletions src/provider/provider_cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static void init_cu_global_state(void) {

static umf_result_t cu_memory_provider_initialize(void *params,
void **provider) {
if (provider == NULL || params == NULL) {
if (params == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

Expand Down Expand Up @@ -214,11 +214,6 @@ static umf_result_t cu_memory_provider_initialize(void *params,
}

static void cu_memory_provider_finalize(void *provider) {
if (provider == NULL) {
ASSERT(0);
return;
}

umf_ba_global_free(provider);
}

Expand Down Expand Up @@ -250,10 +245,6 @@ static inline umf_result_t set_context(CUcontext required_ctx,
static umf_result_t cu_memory_provider_alloc(void *provider, size_t size,
size_t alignment,
void **resultPtr) {
if (provider == NULL || resultPtr == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;

if (alignment > cu_provider->min_alignment) {
Expand Down Expand Up @@ -318,10 +309,6 @@ static umf_result_t cu_memory_provider_free(void *provider, void *ptr,
size_t bytes) {
(void)bytes;

if (provider == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

if (ptr == NULL) {
return UMF_RESULT_SUCCESS;
}
Expand Down Expand Up @@ -385,10 +372,6 @@ static umf_result_t cu_memory_provider_get_min_page_size(void *provider,
size_t *pageSize) {
(void)ptr;

if (provider == NULL || pageSize == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;

CUmemAllocationProp allocProps = {0};
Expand All @@ -407,10 +390,6 @@ cu_memory_provider_get_recommended_page_size(void *provider, size_t size,
size_t *pageSize) {
(void)size;

if (provider == NULL || pageSize == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;

CUmemAllocationProp allocProps = {0};
Expand All @@ -431,10 +410,7 @@ static const char *cu_memory_provider_get_name(void *provider) {

static umf_result_t cu_memory_provider_get_ipc_handle_size(void *provider,
size_t *size) {
if (provider == NULL || size == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

(void)provider;
*size = sizeof(cu_ipc_data_t);
return UMF_RESULT_SUCCESS;
}
Expand All @@ -443,12 +419,9 @@ static umf_result_t cu_memory_provider_get_ipc_handle(void *provider,
const void *ptr,
size_t size,
void *providerIpcData) {
(void)provider;
(void)size;

if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

CUresult cu_result;
cu_ipc_data_t *cu_ipc_data = (cu_ipc_data_t *)providerIpcData;

Expand All @@ -463,20 +436,14 @@ static umf_result_t cu_memory_provider_get_ipc_handle(void *provider,

static umf_result_t cu_memory_provider_put_ipc_handle(void *provider,
void *providerIpcData) {
if (provider == NULL || providerIpcData == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

(void)provider;
(void)providerIpcData;
return UMF_RESULT_SUCCESS;
}

static umf_result_t cu_memory_provider_open_ipc_handle(void *provider,
void *providerIpcData,
void **ptr) {
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;

CUresult cu_result;
Expand Down Expand Up @@ -505,10 +472,6 @@ static umf_result_t
cu_memory_provider_close_ipc_handle(void *provider, void *ptr, size_t size) {
(void)size;

if (provider == NULL || ptr == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

CUresult cu_result;

cu_result = g_cu_ops.cuIpcCloseMemHandle((CUdeviceptr)ptr);
Expand Down
Loading
Loading