add separate tracker for Proxy Lib

Author: bratpiorka

include/umf/memory_pool.h

@@ -37,6 +37,7 @@ typedef enum umf_pool_create_flag_t {
          << 0), ///< Pool will own the specified provider and destroy it in umfPoolDestroy
     UMF_POOL_CREATE_FLAG_DISABLE_TRACKING =
         (1 << 1), ///< Pool will not track memory allocations
+    UMF_POOL_CREATE_FLAG_PROXY_POOL = (1 << 2), ///< Reserved for UMF Proxy Pool
     /// @cond
     UMF_POOL_CREATE_FLAG_FORCE_UINT32 = 0x7fffffff
     /// @endcond

src/CMakeLists.txt

@@ -117,7 +117,8 @@ set(UMF_SOURCES
     critnib/critnib.c
     ravl/ravl.c
     pool/pool_proxy.c
-    pool/pool_scalable.c)
+    pool/pool_scalable.c
+    tracker.c)
 
 if(NOT UMF_DISABLE_HWLOC)
     set(UMF_SOURCES ${UMF_SOURCES} ${HWLOC_DEPENDENT_SOURCES}

src/libumf.c

@@ -10,14 +10,18 @@
 #include <stddef.h>
 
 #include "base_alloc_global.h"
+#include "libumf.h"
 #include "memspace_internal.h"
-#include "provider_tracking.h"
 #include "utils_log.h"
 #if !defined(UMF_NO_HWLOC)
 #include "topology.h"
 #endif
 
 umf_memory_tracker_handle_t TRACKER = NULL;
+umf_memory_tracker_handle_t umfMemoryTrackerGet() {
+    // return UMF tracker
+    return TRACKER;
+}
 
 static unsigned long long umfRefCount = 0;
 

src/libumf.def

@@ -42,6 +42,7 @@ EXPORTS
     umfMemoryProviderPurgeLazy
     umfMemoryProviderPutIPCHandle
     umfMemoryTrackerGetAllocInfo
+    umfMemoryTrackerGetAllocInfoTracker
     umfMempolicyCreate
     umfMempolicyDestroy
     umfMempolicySetCustomSplitPartitions

src/libumf.h

@@ -7,6 +7,8 @@
  *
  */
 
+#include "tracker.h"
+
 #ifndef UMF_LIBUMF_H
 #define UMF_LIBUMF_H 1
 
@@ -17,6 +19,8 @@ extern "C" {
 // initializes runtime state needed by the library (needed mostly for static libraries on Windows)
 void libumfInit(void);
 
+umf_memory_tracker_handle_t umfMemoryTrackerGet();
+
 #ifdef __cplusplus
 }
 #endif

src/libumf.map

@@ -36,6 +36,7 @@ UMF_1.0 {
         umfMemoryProviderPurgeLazy;
         umfMemoryProviderPutIPCHandle;
         umfMemoryTrackerGetAllocInfo;
+        umfMemoryTrackerGetAllocInfoTracker;
         umfMempolicyCreate;
         umfMempolicyDestroy;
         umfMempolicySetCustomSplitPartitions;

src/memory_pool.c

@@ -31,6 +31,18 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
+    if ((flags & UMF_POOL_CREATE_FLAG_DISABLE_TRACKING) &&
+        (flags & UMF_POOL_CREATE_FLAG_PROXY_POOL)) {
+        // setting both flags is invalid
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
+
+    if (flags == UMF_POOL_CREATE_FLAG_PROXY_POOL && params == NULL) {
+        // if UMF_POOL_CREATE_FLAG_PROXY_POOL flag is set the valid tracker
+        // should be passed in params
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
+
     umf_result_t ret = UMF_RESULT_SUCCESS;
     umf_memory_pool_handle_t pool =
         umf_ba_global_alloc(sizeof(umf_memory_pool_t));
@@ -40,12 +52,25 @@ static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
 
     assert(ops->version == UMF_VERSION_CURRENT);
 
+    umf_memory_tracker_handle_t tracker = NULL;
+    if (flags == UMF_POOL_CREATE_FLAG_PROXY_POOL) {
+        // if UMF_POOL_CREATE_FLAG_PROXY_POOL is set use the tracker from
+        // params
+        tracker = params;
+    }
+
     if (!(flags & UMF_POOL_CREATE_FLAG_DISABLE_TRACKING)) {
-        // Wrap provider with memory tracking provider.
+        // Wrap provider with memory tracking provider
+        if (tracker == NULL) {
+            // if UMF_POOL_CREATE_FLAG_PROXY_POOL is disabled use the default
+            // tracker
+            tracker = umfMemoryTrackerGet();
+        }
+
         // Check if the provider supports the free() operation.
         bool upstreamDoesNotFree = umfIsFreeOpDefault(provider);
         ret = umfTrackingMemoryProviderCreate(provider, pool, &pool->provider,
-                                              upstreamDoesNotFree);
+                                              tracker, upstreamDoesNotFree);
         if (ret != UMF_RESULT_SUCCESS) {
             goto err_provider_create;
         }