To append

Author: KFilipek

include/umf/base.h

@@ -58,6 +58,19 @@ enum ctl_query_type {
     MAX_CTL_QUERY_TYPE
 };
 
+// struct ctl;
+
+// enum ctl_query_source;
+
+// int ctl_query(struct ctl *ctl, void *ctx, enum ctl_query_source source,
+//               const char *name, enum ctl_query_type type, void *arg);
+
+int umfCtlGet(const char *name, void *ctx, void *arg);
+
+// void umfCtlSet(const char *name, ...) { (void)name; }
+
+// void umfCtlExec(const char *name, ...) { (void)name; }
+
 #ifdef __cplusplus
 }
 #endif

src/ctl/ctl.c

@@ -79,6 +79,11 @@ char *Strdup(const char *s) {
     return p;
 }
 
+int umfCtlGet(const char *name, void *ctx, void *arg) {
+    return ctl_query(NULL, ctx, CTL_QUERY_PROGRAMMATIC, name, CTL_QUERY_READ,
+                     arg);
+}
+
 /*
  * ctl_find_node -- (internal) searches for a matching entry point in the
  *    provided nodes
@@ -629,9 +634,3 @@ int ctl_arg_string(const void *arg, void *dest, size_t dest_size) {
 
     return 0;
 }
-
-void umfCtlGet(const char *name, ...) { (void)name; }
-
-void umfCtlSet(const char *name, ...) { (void)name; }
-
-void umfCtlExec(const char *name, ...) { (void)name; }

src/ctl/ctl.h

@@ -45,15 +45,6 @@ enum ctl_query_source {
     MAX_CTL_QUERY_SOURCE
 };
 
-// enum ctl_query_type {
-//     CTL_QUERY_READ,
-//     CTL_QUERY_WRITE,
-//     CTL_QUERY_RUNNABLE,
-//     CTL_QUERY_SUBTREE,
-
-//     MAX_CTL_QUERY_TYPE
-// };
-
 typedef int (*node_callback)(void *ctx, enum ctl_query_source type, void *arg,
                              struct ctl_index_utlist *indexes, char *extra_name,
                              enum ctl_query_type query_type);

src/libumf.def

@@ -14,6 +14,9 @@ EXPORTS
     umfTearDown
     umfGetCurrentVersion
     umfCloseIPCHandle
+    ;umfCtlExec
+    umfCtlGet
+    ;umfCtlSet
     umfCUDAMemoryProviderOps
     umfCUDAMemoryProviderParamsCreate
     umfCUDAMemoryProviderParamsDestroy

src/libumf.map

@@ -8,6 +8,9 @@ UMF_0.10 {
         umfTearDown;
         umfGetCurrentVersion;
         umfCloseIPCHandle;
+        umfCtlExec;
+        umfCtlGet;
+        umfCtlSet;
         umfCUDAMemoryProviderOps;
         umfCUDAMemoryProviderParamsCreate;
         umfCUDAMemoryProviderParamsDestroy;

test/CMakeLists.txt

@@ -197,8 +197,14 @@ add_umf_test(
     LIBS ${UMF_LOGGER_LIBS})
 
 add_umf_test(
-    NAME ctl
-    SRCS ctl/test.cpp ctl/ctl_debug.c ../src/ctl/ctl.c ${BA_SOURCES_FOR_TEST}
+    NAME ctl_unittest
+    SRCS ctl/ctl_unittest.cpp ctl/ctl_debug.c ../src/ctl/ctl.c
+         ${BA_SOURCES_FOR_TEST}
+    LIBS ${UMF_UTILS_FOR_TEST})
+
+add_umf_test(
+    NAME ctl_api
+    SRCS ctl/ctl_api.cpp ${BA_SOURCES_FOR_TEST}
     LIBS ${UMF_UTILS_FOR_TEST})
 
 add_umf_test(

test/ctl/ctl_api.cpp

@@ -0,0 +1,45 @@
+/*
+ *
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ */
+
+#include <umf.h>
+#include <umf/memory_provider.h>
+#include <umf/providers/provider_os_memory.h>
+
+#include "../common/base.hpp"
+#include "gtest/gtest.h"
+
+using namespace umf_test;
+
+TEST_F(test, ctl_by_handle_os_provider) {
+    umf_memory_provider_handle_t hProvider = NULL;
+    umf_memory_provider_ops_t *os_provider_ops = umfOsMemoryProviderOps();
+    umf_os_memory_provider_params_handle_t os_memory_provider_params = NULL;
+
+    umfOsMemoryProviderParamsCreate(&os_memory_provider_params);
+    int ret = umfMemoryProviderCreate(os_provider_ops,
+                                      os_memory_provider_params, &hProvider);
+    if (ret == UMF_RESULT_ERROR_NOT_SUPPORTED) {
+        umfOsMemoryProviderParamsDestroy(os_memory_provider_params);
+        GTEST_SKIP();
+    }
+    ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
+
+    int ipc_enabled = 0xBAD;
+    // WRAPPER HERE
+    // ret = ctl_query(NULL, hProvider, CTL_QUERY_PROGRAMMATIC,
+    //                 "umf.provider.by_handle.ipc_enabled", CTL_QUERY_READ,
+    //                 &ipc_enabled);
+    ret = umfCtlGet("umf.provider.by_handle.ipc_enabled", hProvider,
+                    &ipc_enabled);
+    ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
+    ASSERT_EQ(ipc_enabled, 0);
+
+    umfOsMemoryProviderParamsDestroy(os_memory_provider_params);
+    umfMemoryProviderDestroy(hProvider);
+}

test/ctl/test.cpp renamed to test/ctl/ctl_unittest.cpp

@@ -11,7 +11,7 @@
 #include "ctl/ctl.h"
 #include "ctl/ctl_debug.h"
 #include "umf/base.h"
-#include "umf/memory_provider.h"
+#include "gtest/gtest.h"
 #include <umf.h>
 #include <umf/providers/provider_os_memory.h>
 
@@ -95,24 +95,3 @@ TEST_F(test, ctl_debug_read_from_file) {
     deinitialize_debug_ctl();
 #endif
 }
-
-TEST_F(test, by_handle_provider_ctl) {
-    umf_memory_provider_handle_t hProvider = NULL;
-    umf_memory_provider_ops_t *os_provider_ops = umfOsMemoryProviderOps();
-    umf_os_memory_provider_params_handle_t os_memory_provider_params = NULL;
-
-    umfOsMemoryProviderParamsCreate(&os_memory_provider_params);
-    int ret = umfMemoryProviderCreate(os_provider_ops,
-                                      os_memory_provider_params, &hProvider);
-    ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
-
-    int ipc_enabled = 0xBAD;
-    ret = ctl_query(NULL, hProvider, CTL_QUERY_PROGRAMMATIC,
-                    "umf.provider.by_handle.ipc_enabled", CTL_QUERY_READ,
-                    &ipc_enabled);
-    ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
-    ASSERT_EQ(ipc_enabled, 0);
-
-    umfOsMemoryProviderParamsDestroy(os_memory_provider_params);
-    umfMemoryProviderDestroy(hProvider);
-}