use actual pool name instead of default name

Author: lplewa

docs/config/ctl.rst

@@ -84,7 +84,7 @@ to providers or pools created after the defaults are set. For example::
 
 Every subsequently created disjoint pool will use ``custom`` as its name unless
 overridden by explicit parameters. Defaults may be supplied programmatically or
-via configuration and are saved internally and applied during initalization of
+via configuration and are saved internally and applied during initialization of
 a matching provider or pool.
 
 Environment variables
@@ -346,7 +346,7 @@ Disjoint pool (``disjoint``)
       provider.
    :type bytes: ``size_t``
 
-   **Access:** read-write. (write is only avaiable through defaults)
+   **Access:** read-write. (write is only available through defaults)
    **Defaults / Env:** supported.
 
    Governs how much memory the pool grabs in each slab. Lower values reduce
@@ -359,7 +359,7 @@ Disjoint pool (``disjoint``)
       cached by the pool.
    :type bytes: ``size_t``
 
-   **Access:** read-write. (write is only avaiable through defaults)
+   **Access:** read-write. (write is only available through defaults)
    **Defaults / Env:** supported.
 
    Sets the cut-off for pooling allocations. Requests larger than this value are
@@ -372,7 +372,7 @@ Disjoint pool (``disjoint``)
       may retain.
    :type count: ``size_t``
 
-   **Access:** read-write. (write is only avaiable through defaults)
+   **Access:** read-write. (write is only available through defaults)
    **Defaults / Env:** supported.
 
    Caps the pool's cached slabs per bucket to limit memory retention. Shrinking
@@ -385,7 +385,7 @@ Disjoint pool (``disjoint``)
       serve.
    :type bytes: ``size_t``
 
-   **Access:** read-write. (write is only avaiable through defaults)
+   **Access:** read-write. (write is only available through defaults)
    **Defaults / Env:** supported.
 
    Controls the smallest chunk size kept in the pool, which in turn affects the
@@ -397,7 +397,7 @@ Disjoint pool (``disjoint``)
    :param level: Receives or supplies the tracing level for the pool.
    :type level: ``int`` (``0`` disables tracing)
 
-   **Access:** read-write. (write is only avaiable through defaults)
+   **Access:** read-write. (write is only available through defaults)
    **Defaults / Env:** supported.
 
    Controls the disjoint pool's tracing features. ``0`` disables tracing.

examples/ctl/ctl_example.c

@@ -204,7 +204,7 @@ static umf_result_t ctl_ctl(void *provider, umf_ctl_query_source_t source,
         return UMF_RESULT_SUCCESS;
     }
     if (queryType == CTL_QUERY_RUNNABLE &&
-        strcmp(formatted, "substraction") == 0) {
+        strcmp(formatted, "subtraction") == 0) {
         if (p->m) {
             p->c = (p->a - p->b) % p->m;
         } else {
@@ -300,9 +300,9 @@ int main(void) {
 
     // Execute subtraction and fetch the result
     res =
-        umfCtlExec("umf.provider.by_handle.{}.substraction", NULL, 0, provider);
+        umfCtlExec("umf.provider.by_handle.{}.subtraction", NULL, 0, provider);
     if (res != UMF_RESULT_SUCCESS) {
-        fprintf(stderr, "Failed to execute substraction!\n");
+        fprintf(stderr, "Failed to execute subtraction!\n");
         goto out;
     }
     res = umfCtlGet("umf.provider.by_handle.{}.c", &result, sizeof(result),
@@ -311,7 +311,7 @@ int main(void) {
         fprintf(stderr, "Failed to get c!\n");
         goto out;
     }
-    printf("substraction result: %d\n", result);
+    printf("subtraction result: %d\n", result);
 
 out:
     umfMemoryProviderDestroy(provider);

examples/ctl/ctl_statistics_example.c

@@ -201,7 +201,7 @@ int main(void) {
         goto cleanup;
     }
 
-    /* set name of the pool so we can easly ref it by using name */
+    /* set name of the pool so we can easily ref it by using name */
     res = umfDisjointPoolParamsSetName(disjoint_params, pool_name);
     if (res != UMF_RESULT_SUCCESS) {
         fprintf(stderr, "Failed to name disjoint pool (error %d)\n", (int)res);

src/memory_pool.c

@@ -469,15 +469,14 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
         goto err_pool_init;
     }
 
-    // Set default property "name" to pool if exists
     const char *pname = NULL;
-    ret = ops->get_name(NULL, &pname);
+    ret = ops->get_name(pool->pool_priv, &pname);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("Failed to get pool name");
         goto err_pool_init;
     }
     assert(pname != NULL);
-
+    utils_warn_invalid_name("Memory pool", pname);
     ctl_default_apply(pool_default_list, pname, ops->ext_ctl, pool->pool_priv);
 
     ret = umfPoolPostInitialize(&pool->ops, pool->pool_priv);
@@ -489,12 +488,6 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
     *hPool = pool;
     pools_by_name_add(pool);
 
-    const char *pool_name = NULL;
-    if (ops->get_name(pool->pool_priv, &pool_name) == UMF_RESULT_SUCCESS &&
-        pool_name) {
-        utils_warn_invalid_name("Memory pool", pool_name);
-    }
-
     LOG_INFO("Memory pool created: %p", (void *)pool);
     return UMF_RESULT_SUCCESS;
 

src/memory_provider.c

@@ -345,10 +345,20 @@ umf_result_t umfMemoryProviderCreate(const umf_memory_provider_ops_t *ops,
 
     utils_init_once(&mem_provider_ctl_initialized, provider_ctl_init);
     const char *pname = NULL;
-    if (provider->ops.get_name(NULL, &pname) == UMF_RESULT_SUCCESS && pname) {
-        ctl_default_apply(provider_default_list, pname, provider->ops.ext_ctl,
-                          provider->provider_priv);
+
+    ret = provider->ops.get_name(provider->provider_priv, &pname);
+    if (ret != UMF_RESULT_SUCCESS) {
+        LOG_ERR("Failed to get pool name");
+        umf_ba_global_free(provider);
+        return ret;
     }
+
+    assert(pname != NULL);
+    utils_warn_invalid_name("Memory provider", pname);
+
+    ctl_default_apply(provider_default_list, pname, provider->ops.ext_ctl,
+                      provider->provider_priv);
+
     ret = umfProviderPostInitialize(&provider->ops, provider_priv);
     if (ret != UMF_RESULT_SUCCESS && ret != UMF_RESULT_ERROR_INVALID_CTL_PATH) {
         LOG_ERR("Failed to post-initialize provider");
@@ -358,13 +368,6 @@ umf_result_t umfMemoryProviderCreate(const umf_memory_provider_ops_t *ops,
 
     *hProvider = provider;
 
-    const char *provider_name = NULL;
-    if (provider->ops.get_name(provider->provider_priv, &provider_name) ==
-            UMF_RESULT_SUCCESS &&
-        provider_name) {
-        utils_warn_invalid_name("Memory provider", provider_name);
-    }
-
     return UMF_RESULT_SUCCESS;
 }