Skip to content

Commit ac2389b

Browse files
ldorauldorau
committed
Remove dead code
Remove dead code - remove checks run always earlier in src/memory_provider.c. Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
1 parent 56a7c1d commit ac2389b

7 files changed

Lines changed: 28 additions & 246 deletions

File tree

‎examples/custom_file_provider/custom_file_provider.c‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ static void file_deinit(void *provider) {
113113
// Function to allocate memory from the file provider
114114
static umf_result_t file_alloc(void *provider, size_t size, size_t alignment,
115115
void **ptr) {
116-
if (provider == NULL || ptr == NULL) {
117-
fprintf(stderr, "Provider or ptr cannot be null\n");
118-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
119-
}
120116
file_provider_t *file_provider = (file_provider_t *)provider;
121117
size_t page_size = file_provider->page_size;
122118

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

166162
// Function to free allocated memory from the file provider
167163
static umf_result_t file_free(void *provider, void *ptr, size_t size) {
168-
if (provider == NULL || ptr == NULL) {
169-
fprintf(stderr, "Provider or ptr cannot be null\n");
164+
if (ptr == NULL) {
165+
fprintf(stderr, "ptr cannot be null\n");
170166
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
171167
}
172168
file_provider_t *file_provider = (file_provider_t *)provider;
@@ -221,11 +217,6 @@ static void file_get_last_native_error(void *provider, const char **ppMessage,
221217
static umf_result_t file_get_recommended_page_size(void *provider, size_t size,
222218
size_t *pageSize) {
223219
(void)size; // Unused parameter
224-
if (provider == NULL || pageSize == NULL) {
225-
fprintf(stderr, "Provider or pageSize cannot be null\n");
226-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
227-
}
228-
229220
file_provider_t *file_provider = (file_provider_t *)provider;
230221
*pageSize = file_provider->page_size;
231222
return UMF_RESULT_SUCCESS;
@@ -235,11 +226,6 @@ static umf_result_t file_get_recommended_page_size(void *provider, size_t size,
235226
static umf_result_t file_get_min_page_size(void *provider, void *ptr,
236227
size_t *pageSize) {
237228
(void)ptr; // Unused parameter
238-
if (provider == NULL || pageSize == NULL) {
239-
fprintf(stderr, "Provider or pageSize cannot be null\n");
240-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
241-
}
242-
243229
file_provider_t *file_provider = (file_provider_t *)provider;
244230
*pageSize = file_provider->page_size;
245231
return UMF_RESULT_SUCCESS;

‎src/provider/provider_coarse.c‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,10 +1478,6 @@ coarse_memory_provider_get_stats(void *provider,
14781478

14791479
static umf_result_t coarse_memory_provider_purge_lazy(void *provider, void *ptr,
14801480
size_t size) {
1481-
if (provider == NULL || ptr == NULL) {
1482-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
1483-
}
1484-
14851481
coarse_memory_provider_t *coarse_provider =
14861482
(struct coarse_memory_provider_t *)provider;
14871483
if (coarse_provider->upstream_memory_provider == NULL) {
@@ -1495,10 +1491,6 @@ static umf_result_t coarse_memory_provider_purge_lazy(void *provider, void *ptr,
14951491

14961492
static umf_result_t coarse_memory_provider_purge_force(void *provider,
14971493
void *ptr, size_t size) {
1498-
if (provider == NULL || ptr == NULL) {
1499-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
1500-
}
1501-
15021494
coarse_memory_provider_t *coarse_provider =
15031495
(struct coarse_memory_provider_t *)provider;
15041496
if (coarse_provider->upstream_memory_provider == NULL) {
@@ -1514,11 +1506,6 @@ static umf_result_t coarse_memory_provider_allocation_split(void *provider,
15141506
void *ptr,
15151507
size_t totalSize,
15161508
size_t firstSize) {
1517-
if (provider == NULL || ptr == NULL || (firstSize >= totalSize) ||
1518-
firstSize == 0) {
1519-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
1520-
}
1521-
15221509
umf_result_t umf_result;
15231510

15241511
coarse_memory_provider_t *coarse_provider =
@@ -1578,12 +1565,6 @@ static umf_result_t coarse_memory_provider_allocation_merge(void *provider,
15781565
void *lowPtr,
15791566
void *highPtr,
15801567
size_t totalSize) {
1581-
if (provider == NULL || lowPtr == NULL || highPtr == NULL ||
1582-
((uintptr_t)highPtr <= (uintptr_t)lowPtr) ||
1583-
((uintptr_t)highPtr - (uintptr_t)lowPtr >= totalSize)) {
1584-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
1585-
}
1586-
15871568
umf_result_t umf_result;
15881569

15891570
coarse_memory_provider_t *coarse_provider =

‎src/provider/provider_cuda.c‎

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static void init_cu_global_state(void) {
160160

161161
static umf_result_t cu_memory_provider_initialize(void *params,
162162
void **provider) {
163-
if (provider == NULL || params == NULL) {
163+
if (params == NULL) {
164164
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
165165
}
166166

@@ -214,11 +214,6 @@ static umf_result_t cu_memory_provider_initialize(void *params,
214214
}
215215

216216
static void cu_memory_provider_finalize(void *provider) {
217-
if (provider == NULL) {
218-
ASSERT(0);
219-
return;
220-
}
221-
222217
umf_ba_global_free(provider);
223218
}
224219

@@ -250,10 +245,6 @@ static inline umf_result_t set_context(CUcontext required_ctx,
250245
static umf_result_t cu_memory_provider_alloc(void *provider, size_t size,
251246
size_t alignment,
252247
void **resultPtr) {
253-
if (provider == NULL || resultPtr == NULL) {
254-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
255-
}
256-
257248
cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;
258249

259250
if (alignment > cu_provider->min_alignment) {
@@ -318,10 +309,6 @@ static umf_result_t cu_memory_provider_free(void *provider, void *ptr,
318309
size_t bytes) {
319310
(void)bytes;
320311

321-
if (provider == NULL) {
322-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
323-
}
324-
325312
if (ptr == NULL) {
326313
return UMF_RESULT_SUCCESS;
327314
}
@@ -385,10 +372,6 @@ static umf_result_t cu_memory_provider_get_min_page_size(void *provider,
385372
size_t *pageSize) {
386373
(void)ptr;
387374

388-
if (provider == NULL || pageSize == NULL) {
389-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
390-
}
391-
392375
cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;
393376

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

410-
if (provider == NULL || pageSize == NULL) {
411-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
412-
}
413-
414393
cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;
415394

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

432411
static umf_result_t cu_memory_provider_get_ipc_handle_size(void *provider,
433412
size_t *size) {
434-
if (provider == NULL || size == NULL) {
435-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
436-
}
437-
413+
(void)provider;
438414
*size = sizeof(cu_ipc_data_t);
439415
return UMF_RESULT_SUCCESS;
440416
}
@@ -443,12 +419,9 @@ static umf_result_t cu_memory_provider_get_ipc_handle(void *provider,
443419
const void *ptr,
444420
size_t size,
445421
void *providerIpcData) {
422+
(void)provider;
446423
(void)size;
447424

448-
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
449-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
450-
}
451-
452425
CUresult cu_result;
453426
cu_ipc_data_t *cu_ipc_data = (cu_ipc_data_t *)providerIpcData;
454427

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

464437
static umf_result_t cu_memory_provider_put_ipc_handle(void *provider,
465438
void *providerIpcData) {
466-
if (provider == NULL || providerIpcData == NULL) {
467-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
468-
}
469-
439+
(void)provider;
440+
(void)providerIpcData;
470441
return UMF_RESULT_SUCCESS;
471442
}
472443

473444
static umf_result_t cu_memory_provider_open_ipc_handle(void *provider,
474445
void *providerIpcData,
475446
void **ptr) {
476-
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
477-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
478-
}
479-
480447
cu_memory_provider_t *cu_provider = (cu_memory_provider_t *)provider;
481448

482449
CUresult cu_result;
@@ -505,10 +472,6 @@ static umf_result_t
505472
cu_memory_provider_close_ipc_handle(void *provider, void *ptr, size_t size) {
506473
(void)size;
507474

508-
if (provider == NULL || ptr == NULL) {
509-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
510-
}
511-
512475
CUresult cu_result;
513476

514477
cu_result = g_cu_ops.cuIpcCloseMemHandle((CUdeviceptr)ptr);

‎src/provider/provider_devdax_memory.c‎

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ devdax_translate_params(umf_devdax_memory_provider_params_t *in_params,
9797
static umf_result_t devdax_initialize(void *params, void **provider) {
9898
umf_result_t ret;
9999

100-
if (provider == NULL || params == NULL) {
100+
if (params == NULL) {
101101
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
102102
}
103103

@@ -185,11 +185,6 @@ static umf_result_t devdax_initialize(void *params, void **provider) {
185185
}
186186

187187
static void devdax_finalize(void *provider) {
188-
if (provider == NULL) {
189-
assert(0);
190-
return;
191-
}
192-
193188
devdax_memory_provider_t *devdax_provider = provider;
194189
utils_mutex_destroy_not_free(&devdax_provider->lock);
195190
utils_munmap(devdax_provider->base, devdax_provider->size);
@@ -234,10 +229,6 @@ static umf_result_t devdax_alloc(void *provider, size_t size, size_t alignment,
234229
void **resultPtr) {
235230
int ret;
236231

237-
if (provider == NULL || resultPtr == NULL) {
238-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
239-
}
240-
241232
// alignment must be a power of two and a multiple or a divider of the page size
242233
if (alignment && ((alignment & (alignment - 1)) ||
243234
((alignment % DEVDAX_PAGE_SIZE_2MB) &&
@@ -309,11 +300,8 @@ static void devdax_get_last_native_error(void *provider, const char **ppMessage,
309300
static umf_result_t devdax_get_recommended_page_size(void *provider,
310301
size_t size,
311302
size_t *page_size) {
312-
(void)size; // unused
313-
314-
if (provider == NULL || page_size == NULL) {
315-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
316-
}
303+
(void)provider; // unused
304+
(void)size; // unused
317305

318306
*page_size = DEVDAX_PAGE_SIZE_2MB;
319307

@@ -338,10 +326,6 @@ static umf_result_t devdax_purge_lazy(void *provider, void *ptr, size_t size) {
338326
}
339327

340328
static umf_result_t devdax_purge_force(void *provider, void *ptr, size_t size) {
341-
if (provider == NULL || ptr == NULL) {
342-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
343-
}
344-
345329
errno = 0;
346330
if (utils_purge(ptr, size, UMF_PURGE_FORCE)) {
347331
devdax_store_last_native_error(
@@ -364,18 +348,15 @@ static umf_result_t devdax_allocation_split(void *provider, void *ptr,
364348
(void)ptr;
365349
(void)totalSize;
366350
(void)firstSize;
367-
368351
return UMF_RESULT_SUCCESS;
369352
}
370353

371354
static umf_result_t devdax_allocation_merge(void *provider, void *lowPtr,
372355
void *highPtr, size_t totalSize) {
373-
if (provider == NULL || lowPtr == NULL || highPtr == NULL ||
374-
((uintptr_t)highPtr <= (uintptr_t)lowPtr) ||
375-
((uintptr_t)highPtr - (uintptr_t)lowPtr >= totalSize)) {
376-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
377-
}
378-
356+
(void)provider;
357+
(void)lowPtr;
358+
(void)highPtr;
359+
(void)totalSize;
379360
return UMF_RESULT_SUCCESS;
380361
}
381362

@@ -388,9 +369,7 @@ typedef struct devdax_ipc_data_t {
388369
} devdax_ipc_data_t;
389370

390371
static umf_result_t devdax_get_ipc_handle_size(void *provider, size_t *size) {
391-
if (provider == NULL || size == NULL) {
392-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
393-
}
372+
(void)provider;
394373

395374
*size = sizeof(devdax_ipc_data_t);
396375

@@ -399,10 +378,6 @@ static umf_result_t devdax_get_ipc_handle_size(void *provider, size_t *size) {
399378

400379
static umf_result_t devdax_get_ipc_handle(void *provider, const void *ptr,
401380
size_t size, void *providerIpcData) {
402-
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
403-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
404-
}
405-
406381
devdax_memory_provider_t *devdax_provider =
407382
(devdax_memory_provider_t *)provider;
408383

@@ -419,10 +394,6 @@ static umf_result_t devdax_get_ipc_handle(void *provider, const void *ptr,
419394

420395
static umf_result_t devdax_put_ipc_handle(void *provider,
421396
void *providerIpcData) {
422-
if (provider == NULL || providerIpcData == NULL) {
423-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
424-
}
425-
426397
devdax_memory_provider_t *devdax_provider =
427398
(devdax_memory_provider_t *)provider;
428399
devdax_ipc_data_t *devdax_ipc_data = (devdax_ipc_data_t *)providerIpcData;
@@ -439,10 +410,6 @@ static umf_result_t devdax_put_ipc_handle(void *provider,
439410

440411
static umf_result_t devdax_open_ipc_handle(void *provider,
441412
void *providerIpcData, void **ptr) {
442-
if (provider == NULL || providerIpcData == NULL || ptr == NULL) {
443-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
444-
}
445-
446413
*ptr = NULL;
447414

448415
devdax_ipc_data_t *devdax_ipc_data = (devdax_ipc_data_t *)providerIpcData;
@@ -502,10 +469,6 @@ static umf_result_t devdax_open_ipc_handle(void *provider,
502469

503470
static umf_result_t devdax_close_ipc_handle(void *provider, void *ptr,
504471
size_t size) {
505-
if (provider == NULL || ptr == NULL) {
506-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
507-
}
508-
509472
size = ALIGN_UP(size, DEVDAX_PAGE_SIZE_2MB);
510473

511474
errno = 0;

0 commit comments

Comments
 (0)