Skip to content

Commit 0c199bd

Browse files
committed
use actual pool name instead of default name
1 parent d1ce946 commit 0c199bd

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

src/memory_pool.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -469,15 +469,14 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
469469
goto err_pool_init;
470470
}
471471

472-
// Set default property "name" to pool if exists
473472
const char *pname = NULL;
474-
ret = ops->get_name(NULL, &pname);
473+
ret = ops->get_name(pool->pool_priv, &pname);
475474
if (ret != UMF_RESULT_SUCCESS) {
476475
LOG_ERR("Failed to get pool name");
477476
goto err_pool_init;
478477
}
479478
assert(pname != NULL);
480-
479+
utils_warn_invalid_name("Memory pool", pname);
481480
ctl_default_apply(pool_default_list, pname, ops->ext_ctl, pool->pool_priv);
482481

483482
ret = umfPoolPostInitialize(&pool->ops, pool->pool_priv);
@@ -489,12 +488,6 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
489488
*hPool = pool;
490489
pools_by_name_add(pool);
491490

492-
const char *pool_name = NULL;
493-
if (ops->get_name(pool->pool_priv, &pool_name) == UMF_RESULT_SUCCESS &&
494-
pool_name) {
495-
utils_warn_invalid_name("Memory pool", pool_name);
496-
}
497-
498491
LOG_INFO("Memory pool created: %p", (void *)pool);
499492
return UMF_RESULT_SUCCESS;
500493

src/memory_provider.c

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,20 @@ umf_result_t umfMemoryProviderCreate(const umf_memory_provider_ops_t *ops,
345345

346346
utils_init_once(&mem_provider_ctl_initialized, provider_ctl_init);
347347
const char *pname = NULL;
348-
if (provider->ops.get_name(NULL, &pname) == UMF_RESULT_SUCCESS && pname) {
349-
ctl_default_apply(provider_default_list, pname, provider->ops.ext_ctl,
350-
provider->provider_priv);
348+
349+
ret = provider->ops.get_name(provider->provider_priv, &pname);
350+
if (ret != UMF_RESULT_SUCCESS) {
351+
LOG_ERR("Failed to get pool name");
352+
umf_ba_global_free(provider);
353+
return ret;
351354
}
355+
356+
assert(pname != NULL);
357+
utils_warn_invalid_name("Memory provider", pname);
358+
359+
ctl_default_apply(provider_default_list, pname, provider->ops.ext_ctl,
360+
provider->provider_priv);
361+
352362
ret = umfProviderPostInitialize(&provider->ops, provider_priv);
353363
if (ret != UMF_RESULT_SUCCESS && ret != UMF_RESULT_ERROR_INVALID_CTL_PATH) {
354364
LOG_ERR("Failed to post-initialize provider");
@@ -358,13 +368,6 @@ umf_result_t umfMemoryProviderCreate(const umf_memory_provider_ops_t *ops,
358368

359369
*hProvider = provider;
360370

361-
const char *provider_name = NULL;
362-
if (provider->ops.get_name(provider->provider_priv, &provider_name) ==
363-
UMF_RESULT_SUCCESS &&
364-
provider_name) {
365-
utils_warn_invalid_name("Memory provider", provider_name);
366-
}
367-
368371
return UMF_RESULT_SUCCESS;
369372
}
370373

0 commit comments

Comments
 (0)