DEBUG umfMemoryTrackerAddIpcSegment()

Author: ldorau

src/critnib/critnib.c

@@ -588,8 +588,12 @@ void *critnib_remove(struct critnib *c, word key, void **ref) {
 del_leaf:
     value = k->value;
     if (c->cb_free_leaf) {
-        utils_atomic_store_release_ptr(&k->to_be_freed, value);
-        utils_atomic_store_release_ptr(&k->value, NULL);
+        fprintf(stderr, "%p critnib_remove_IN(value=%p/%p, ref_count=%lu)\n",
+                (void *)k->key, value, k->to_be_freed, k->ref_count);
+        if (value) {
+            utils_atomic_store_release_ptr(&k->to_be_freed, value);
+            utils_atomic_store_release_ptr(&k->value, NULL);
+        }
         *ref = k;
     }
     c->pending_del_leaves[del] = k;
@@ -607,20 +611,32 @@ int critnib_release(struct critnib *c, void *ref) {
         return -1;
     }
 
+    fprintf(stderr, ">>> critnib_release(ref=%p)\n", ref);
+
     struct critnib_leaf *k = (struct critnib_leaf *)ref;
 
     uint64_t ref_count;
     utils_atomic_load_acquire_u64(&k->ref_count, &ref_count);
 
     if (ref_count == 0) {
+        fprintf(stderr,
+                "%p critnib_release(value=%p/%p, ref_count=0) RETURN ! k=%p\n",
+                (void *)k->key, k->value, k->to_be_freed, k);
         return -1;
     }
 
     /* decrement the reference count */
     if (utils_atomic_decrement_u64(&k->ref_count) == 1) {
         void *to_be_freed = NULL;
         utils_atomic_load_acquire_ptr(&k->to_be_freed, &to_be_freed);
+        fprintf(stderr,
+                "%p critnib_release(value=%p/%p, ref_count=0) ==0 k=%p\n",
+                (void *)k->key, k->value, to_be_freed, k);
         if (to_be_freed) {
+            fprintf(
+                stderr,
+                "%p c->cb_free_leaf(key=%p, value=%p/%p, ref_count=0) k=%p\n",
+                to_be_freed, (void *)k->key, k->value, to_be_freed, k);
             utils_atomic_store_release_ptr(&k->to_be_freed, NULL);
             c->cb_free_leaf(c->leaf_allocator, to_be_freed);
         }
@@ -639,6 +655,10 @@ int critnib_release(struct critnib *c, void *ref) {
         }
 
         return 0;
+    } else {
+        fprintf(stderr,
+                "%p critnib_release(value=%p/%p, ref_count=%lu) ELSE k=%p\n",
+                (void *)k->key, k->value, k->to_be_freed, k->ref_count, k);
     }
 
 #ifndef NDEBUG

src/provider/provider_tracking.c

@@ -415,6 +415,8 @@ umfMemoryTrackerAddIpcSegment(umf_memory_tracker_handle_t hTracker,
     int ret =
         critnib_insert(hTracker->ipc_segments_map, (uintptr_t)ptr, value, 0);
     if (ret == 0) {
+        fprintf(stderr, "%p critnib_insert(value=%p) %s:%i\n", ptr, value,
+                __FILE__, __LINE__);
         LOG_DEBUG("IPC memory region is added, tracker=%p, ptr=%p, size=%zu, "
                   "provider=%p, cache_entry=%p",
                   (void *)hTracker, ptr, size, (void *)provider,
@@ -444,7 +446,14 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
     void *ref_value = NULL;
     void *value =
         critnib_remove(hTracker->ipc_segments_map, (uintptr_t)ptr, &ref_value);
+    fprintf(stderr, "%p critnib_remove(ptr=%p, value=%p) %s:%i\n", ptr, ptr,
+            value, __FILE__, __LINE__);
     if (!value) {
+        if (ref_value) {
+            fprintf(stderr, "%p critnib_release %s:%i NO VALUE!\n", ptr,
+                    __FILE__, __LINE__);
+            critnib_release(hTracker->ipc_segments_map, ref_value);
+        }
         LOG_ERR("pointer %p not found in the ipc_segments_map", ptr);
         return UMF_RESULT_ERROR_UNKNOWN;
     }
@@ -457,6 +466,7 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
               (void *)v->ipc_cache_value);
 
     assert(ref_value);
+    fprintf(stderr, "%p critnib_release %s:%i\n", ptr, __FILE__, __LINE__);
     critnib_release(hTracker->ipc_segments_map, ref_value);
 
     return UMF_RESULT_SUCCESS;