enable tracker in ProxyLib by default

Author: bratpiorka

.github/workflows/proxy_lib.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Run "ctest --output-on-failure" with proxy library
         working-directory: ${{env.BUILD_DIR}}
-        run: LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure
+        run: LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure -E "proxy_lib_memoryPool"
 
       - name: Run "./test/umf_test-memoryPool" with proxy library
         working-directory: ${{env.BUILD_DIR}}

src/provider/provider_tracking.c

@@ -48,13 +48,14 @@ static umf_result_t umfMemoryTrackerAdd(umf_memory_tracker_handle_t hTracker,
     int ret = critnib_insert(hTracker->map, (uintptr_t)ptr, value, 0);
 
     if (ret == 0) {
-        LOG_DEBUG("memory region is added, tracker=%p, ptr=%p, size=%zu",
-                  (void *)hTracker, ptr, size);
+        LOG_DEBUG(
+            "memory region is added, tracker=%p, ptr=%p, pool=%p, size=%zu",
+            (void *)hTracker, ptr, (void *)pool, size);
         return UMF_RESULT_SUCCESS;
     }
 
-    LOG_ERR("failed to insert tracker value, ret=%d, ptr=%p, size=%zu", ret,
-            ptr, size);
+    LOG_ERR("failed to insert tracker value, ret=%d, ptr=%p, pool=%p, size=%zu",
+            ret, ptr, (void *)pool, size);
 
     umf_ba_free(hTracker->tracker_allocator, value);
 
@@ -161,11 +162,35 @@ static umf_result_t trackingAlloc(void *hProvider, size_t size,
         return ret;
     }
 
-    umf_result_t ret2 = umfMemoryTrackerAdd(p->hTracker, p->pool, *ptr, size);
-    if (ret2 != UMF_RESULT_SUCCESS) {
-        LOG_ERR("failed to add allocated region to the tracker, ptr = %p, size "
+    // check if the allocation was already added to the tracker
+    // (in case of using ProxyLib)
+    tracker_value_t *value =
+        (tracker_value_t *)critnib_get(p->hTracker->map, *(uintptr_t *)ptr);
+    if (value) {
+        assert(value->pool != p->pool);
+
+        LOG_DEBUG("ptr already exists in the tracker (added by Proxy Lib) - "
+                  "updating value, ptr=%p, size=%zu, old pool: %p, new pool %p",
+                  *ptr, size, (void *)value->pool, (void *)p->pool);
+
+        // the allocation was made by the ProxyLib so we only update the tracker
+        value->pool = p->pool;
+        int crit_ret = critnib_insert(p->hTracker->map, *(uintptr_t *)ptr,
+                                      value, 1 /* update */);
+
+        // this cannot fail since we know the element exists  and there is
+        // nothing to allocate
+        assert(crit_ret == 0);
+        (void)crit_ret;
+    } else {
+        umf_result_t ret2 =
+            umfMemoryTrackerAdd(p->hTracker, p->pool, *ptr, size);
+        if (ret2 != UMF_RESULT_SUCCESS) {
+            LOG_ERR(
+                "failed to add allocated region to the tracker, ptr = %p, size "
                 "= %zu, ret = %d",
                 *ptr, size, ret2);
+        }
     }
 
     return ret;

src/proxy_lib/proxy_lib.c

@@ -124,8 +124,6 @@ void proxy_lib_create_common(void) {
 
     } else if (utils_env_var_has_str("UMF_PROXY",
                                      "page.disposition=shared-shm")) {
-        LOG_DEBUG("proxy_lib: using the MAP_SHARED visibility mode with the "
-                  "named shared memory");
         os_params.visibility = UMF_MEM_MAP_SHARED;
 
         memset(shm_name, 0, NAME_MAX);
@@ -145,9 +143,8 @@ void proxy_lib_create_common(void) {
         exit(-1);
     }
 
-    umf_result =
-        umfPoolCreate(umfPoolManagerOps(), OS_memory_provider, NULL,
-                      UMF_POOL_CREATE_FLAG_DISABLE_TRACKING, &Proxy_pool);
+    umf_result = umfPoolCreate(umfPoolManagerOps(), OS_memory_provider, NULL, 0,
+                               &Proxy_pool);
     if (umf_result != UMF_RESULT_SUCCESS) {
         LOG_ERR("creating UMF pool manager failed");
         exit(-1);