Fixes after latest review

Author: KFilipek

include/umf/memory_pool_ops.h

@@ -144,9 +144,11 @@ typedef struct umf_memory_pool_ops_t {
                         void *arg, size_t size, umf_ctl_query_type_t queryType);
 
     ///
-    /// @brief Get the name of the memory pool.
-    /// @param pool pointer to the memory pool
-    /// @return name of the memory pool
+    /// @brief Retrieves the name of the disjoint memory pool [optional]
+    /// @param pool pointer to the memory pool or NULL value
+    /// @return A constant character string representing the pool's name.
+    ///         Returns "disjoint" if `pool` is NULL, otherwise returns the
+    ///         configured name of the specific pool instance.
     ///
     const char *(*get_name)(void *pool);
 } umf_memory_pool_ops_t;

src/ctl/ctl.c

@@ -544,24 +544,6 @@ int ctl_load_config_from_file(struct ctl *ctl, void *ctx,
 }
 #endif
 
-/*
- * ctl_new -- allocates and initializes ctl data structures
- */
-struct ctl *ctl_new(void) {
-    struct ctl *c = Zalloc(sizeof(struct ctl));
-    if (c == NULL) {
-        return NULL;
-    }
-
-    c->first_free = 0;
-    return c;
-}
-
-/*
- * ctl_delete -- deletes ctl
- */
-void ctl_delete(struct ctl *c) { umf_ba_global_free(c); }
-
 /*
  * ctl_parse_ll -- (internal) parses and returns a long long signed integer
  */

src/ctl/ctl.h

@@ -113,9 +113,6 @@ struct ctl {
     int first_free;
 };
 
-struct ctl *ctl_new(void);
-void ctl_delete(struct ctl *c);
-
 void initialize_global_ctl(void);
 
 int ctl_load_config_from_string(struct ctl *ctl, void *ctx,

src/memory_pool.c

@@ -69,7 +69,7 @@ static int CTL_SUBTREE_HANDLER(default)(void *ctx,
         }
         if (UMF_DEFAULT_SIZE == i) {
             LOG_ERR("Default entries array is full");
-            return -1;
+            return UMF_RESULT_ERROR_OUT_OF_RESOURCES;
         }
     } else if (queryType == CTL_QUERY_READ) {
         int i = 0;

src/pool/pool_scalable.c

@@ -116,7 +116,7 @@ static const char *tbb_symbol[TBB_POOL_SYMBOLS_MAX] = {
 #endif
 };
 
-struct ctl *pool_scallable_ctl_root;
+struct ctl pool_scallable_ctl_root;
 
 static UTIL_ONCE_FLAG ctl_initialized = UTIL_ONCE_FLAG_INIT;
 
@@ -411,15 +411,13 @@ static umf_result_t tbb_get_last_allocation_error(void *pool) {
     return TLS_last_allocation_error;
 }
 
-static void initialize_pool_ctl(void) { pool_scallable_ctl_root = ctl_new(); }
-
 static umf_result_t pool_ctl(void *hPool, int operationType, const char *name,
                              void *arg, size_t size,
                              umf_ctl_query_type_t query_type) {
     (void)operationType; // unused
     umf_memory_pool_handle_t pool_provider = (umf_memory_pool_handle_t)hPool;
-    utils_init_once(&ctl_initialized, initialize_pool_ctl);
-    return ctl_query(pool_scallable_ctl_root, pool_provider->pool_priv,
+    utils_init_once(&ctl_initialized, NULL);
+    return ctl_query(&pool_scallable_ctl_root, pool_provider->pool_priv,
                      CTL_QUERY_PROGRAMMATIC, name, query_type, arg, size);
 }
 

src/provider/provider_fixed_memory.c

@@ -57,12 +57,11 @@ static __TLS fixed_last_native_error_t TLS_last_native_error;
 #define CTL_PROVIDER_TYPE fixed_memory_provider_t
 #include "provider_ctl_stats_impl.h"
 
-struct ctl *fixed_memory_ctl_root;
+struct ctl fixed_memory_ctl_root;
 static UTIL_ONCE_FLAG ctl_initialized = UTIL_ONCE_FLAG_INIT;
 
 static void initialize_fixed_ctl(void) {
-    fixed_memory_ctl_root = ctl_new();
-    CTL_REGISTER_MODULE(fixed_memory_ctl_root, stats);
+    CTL_REGISTER_MODULE(&fixed_memory_ctl_root, stats);
 }
 
 static const char *Native_error_str[] = {
@@ -283,7 +282,7 @@ static umf_result_t fixed_ctl(void *provider, int operationType,
                               const char *name, void *arg, size_t size,
                               umf_ctl_query_type_t query_type) {
     utils_init_once(&ctl_initialized, initialize_fixed_ctl);
-    return ctl_query(fixed_memory_ctl_root, provider, operationType, name,
+    return ctl_query(&fixed_memory_ctl_root, provider, operationType, name,
                      query_type, arg, size);
 }
 

src/provider/provider_os_memory.c

@@ -173,7 +173,7 @@ static const char *Native_error_str[] = {
         "HWLOC topology discovery failed",
 };
 
-struct ctl *os_memory_ctl_root;
+struct ctl os_memory_ctl_root;
 
 static UTIL_ONCE_FLAG ctl_initialized = UTIL_ONCE_FLAG_INIT;
 
@@ -197,9 +197,8 @@ static const umf_ctl_node_t CTL_NODE(params)[] = {CTL_LEAF_RO(ipc_enabled),
                                                   CTL_NODE_END};
 
 static void initialize_os_ctl(void) {
-    os_memory_ctl_root = ctl_new();
-    CTL_REGISTER_MODULE(os_memory_ctl_root, params);
-    CTL_REGISTER_MODULE(os_memory_ctl_root, stats);
+    CTL_REGISTER_MODULE(&os_memory_ctl_root, params);
+    CTL_REGISTER_MODULE(&os_memory_ctl_root, stats);
 }
 
 static void os_store_last_native_error(int32_t native_error, int errno_value) {
@@ -1446,7 +1445,7 @@ static umf_result_t os_ctl(void *hProvider, int operationType, const char *name,
                            void *arg, size_t size,
                            umf_ctl_query_type_t query_type) {
     utils_init_once(&ctl_initialized, initialize_os_ctl);
-    return ctl_query(os_memory_ctl_root, hProvider, operationType, name,
+    return ctl_query(&os_memory_ctl_root, hProvider, operationType, name,
                      query_type, arg, size);
 }
 

test/ctl/ctl_debug.c

@@ -13,13 +13,13 @@
 
 #include "ctl_debug.h"
 
-static struct ctl *ctl_debug;
+static struct ctl ctl_debug;
 
 static int alloc_pattern = 0;
 static int enable_logging = 0;
 static int log_level = 0;
 
-struct ctl *get_debug_ctl(void) { return ctl_debug; }
+struct ctl *get_debug_ctl(void) { return &ctl_debug; }
 
 /*
  * CTL_WRITE_HANDLER(alloc_pattern) -- sets the alloc_pattern field in heap
@@ -137,9 +137,4 @@ static const umf_ctl_node_t CTL_NODE(debug)[] = {CTL_CHILD(heap),
  */
 void debug_ctl_register(struct ctl *ctl) { CTL_REGISTER_MODULE(ctl, debug); }
 
-void initialize_debug_ctl(void) {
-    ctl_debug = ctl_new();
-    debug_ctl_register(ctl_debug);
-}
-
-void deinitialize_debug_ctl(void) { ctl_delete(ctl_debug); }
+void initialize_debug_ctl(void) { debug_ctl_register(&ctl_debug); }

test/ctl/ctl_unittest.cpp

@@ -50,7 +50,6 @@ TEST_F(test, ctl_debug_read_from_string) {
               0);
 
     debug_ctl_register(ctl_handler);
-    deinitialize_debug_ctl();
 }
 
 int ctl_config_write_to_file(const char *filename, const char *data) {
@@ -89,6 +88,5 @@ TEST_F(test, ctl_debug_read_from_file) {
     ASSERT_EQ(value, 1);
 
     debug_ctl_register(ctl_handler);
-    deinitialize_debug_ctl();
 #endif
 }