TEST

Author: KFilipek

src/ctl/ctl.c

@@ -410,14 +410,10 @@ int ctl_query(struct ctl *ctl, void *ctx, umf_ctl_query_source_t source,
         errno = EINVAL;
         goto out;
     }
-    const char *extra_name = &name[0];
-    if (strstr(extra_name, "by_handle") != NULL) {
-        extra_name = &name[0] + name_offset;
-    }
 
     ret =
         ctl_exec_query[n->type == CTL_NODE_SUBTREE ? CTL_QUERY_SUBTREE : type](
-            ctx, n, source, arg, size, indexes, extra_name, type);
+            ctx, n, source, arg, size, indexes, name + name_offset, type);
 out:
     ctl_delete_indexes(indexes);
 

src/memory_pool.c

@@ -50,7 +50,7 @@ static int CTL_SUBTREE_HANDLER(default)(void *ctx,
                                         const char *extra_name,
                                         umf_ctl_query_type_t queryType) {
     (void)indexes, (void)source, (void)size, (void)ctx;
-    // assert(queryType == CTL_QUERY_WRITE && "not supported query type");
+
     if (queryType == CTL_QUERY_WRITE) {
         int i = 0;
         for (; i < UMF_DEFAULT_SIZE; i++) {
@@ -72,10 +72,6 @@ static int CTL_SUBTREE_HANDLER(default)(void *ctx,
                 break;
             }
         }
-        if (UMF_DEFAULT_SIZE == i) {
-            LOG_ERR("Default entries array is full");
-            return -1;
-        }
     }
     return 0;
 }

src/pool/pool_disjoint_ctl.h

@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 */
 
-#include "pool/pool_disjoint_internal.h"
-#include <stdio.h>
 #include <string.h>
 
 #include <ctl/ctl.h>
@@ -15,6 +13,8 @@
 #include <umf/memory_pool_ops.h>
 #include <umf/memory_provider.h>
 
+#include "pool/pool_disjoint_internal.h"
+
 struct ctl disjoint_ctl_root;
 static UTIL_ONCE_FLAG ctl_initialized = UTIL_ONCE_FLAG_INIT;
 
@@ -23,16 +23,14 @@ static int CTL_READ_HANDLER(name)(void *ctx, umf_ctl_query_source_t source,
                                   umf_ctl_index_utlist_t *indexes,
                                   const char *extra_name,
                                   umf_ctl_query_type_t queryType) {
-    (void)source, (void)indexes, (void)queryType, (void)size;
+    (void)source, (void)indexes, (void)queryType, (void)size, (void)extra_name;
     disjoint_pool_t *pool = (disjoint_pool_t *)ctx;
 
     if (arg == NULL) {
         return -1;
     }
 
-    if (strstr(extra_name, pool->params.name) != NULL) {
-        strncpy(pool->params.name, (char *)arg, sizeof(pool->params.name) - 1);
-    }
+    strncpy(pool->params.name, (char *)arg, sizeof(pool->params.name) - 1);
     return 0;
 }