No DEBUG prints

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

src/critnib/critnib.c

@@ -290,10 +290,6 @@ static void free_leaf(struct critnib *__restrict c,
     }
 
     if (c->cb_free_leaf && k) {
-        if (k->ref_count > 0) {
-            fprintf(stderr, "free_leaf(): k->ref_count = %llu of k->key = %p\n",
-                    (unsigned long long)k->ref_count, (void *)k->key);
-        }
         assert(k->ref_count == 0); // TODO: check ref_count
         c->cb_free_leaf(c->leaf_allocator, (void *)k->value);
     }
@@ -434,23 +430,14 @@ void *critnib_remove(struct critnib *c, word key) {
     }
 
     word del;
-    int i = 0;
+    int i_del = 0;
     do {
         del = (utils_atomic_increment_u64(&c->remove_count) - 1) % DELETED_LIFE;
-        if (c->pending_del_leaves[del] &&
-            (c->pending_del_leaves[del]->ref_count > 0)) {
-            fprintf(stderr,
-                    "critnib_remove(): pending_del_leaves[%llu]->key = %p, "
-                    "ref_count=%llu \n",
-                    (unsigned long long)del,
-                    (void *)c->pending_del_leaves[del]->key,
-                    (unsigned long long)c->pending_del_leaves[del]->ref_count);
-            if (i++ == DELETED_LIFE) {
-                break;
-            }
+        k = c->pending_del_leaves[del];
+        if (i_del++ > DELETED_LIFE) {
+            break;
         }
-    } while (c->pending_del_leaves[del] &&
-             (c->pending_del_leaves[del]->ref_count > 0));
+    } while (k && (k->ref_count > 0));
 
     free_node(c, c->pending_del_nodes[del]);
     free_leaf(c, c->pending_del_leaves[del]);
@@ -520,9 +507,6 @@ void *critnib_remove(struct critnib *c, word key) {
         }
     }
 
-    fprintf(stderr, "critnib_remove(): k->ref_count = %llu of k->key = %p\n",
-            (unsigned long long)k->ref_count, (void *)k->key);
-
     c->pending_del_leaves[del] = k;
 
 not_found:
@@ -549,9 +533,6 @@ int critnib_release(struct critnib *c, void *ref) {
         if (value && c->cb_free_leaf) {
             c->cb_free_leaf(c->leaf_allocator, value);
         }
-
-        fprintf(stderr, "critnib_release(): k->ref_count = 0 of k->key = %p\n",
-                (void *)k->key);
     }
 
     return 0;
@@ -608,9 +589,6 @@ void *critnib_get(struct critnib *c, word key, void **ref) {
             return NULL;
         }
 
-        fprintf(stderr, "critnib_get(): k->ref_count = %llu of k->key = %p\n",
-                (unsigned long long)ref_count, (void *)k->key);
-
         *ref = k;
     }
 
@@ -754,10 +732,6 @@ void *critnib_find_le(struct critnib *c, word key, void **ref) {
             return NULL;
         }
 
-        fprintf(stderr,
-                "critnib_find_le(): k->ref_count = %llu of k->key = %p\n",
-                (unsigned long long)ref_count, (void *)k->key);
-
         *ref = k;
     }
 
@@ -907,9 +881,6 @@ int critnib_find(struct critnib *c, uintptr_t key, enum find_dir_t dir,
             return 0;
         }
 
-        fprintf(stderr, "critnib_find(): k->ref_count = %llu of k->key = %p\n",
-                (unsigned long long)ref_count, (void *)k->key);
-
         *ref = k;
 
         if (rkey) {

src/provider/provider_tracking.c

@@ -98,7 +98,6 @@ static tracker_alloc_info_t *get_most_nested_alloc_segment(
                 critnib_release(hTracker->alloc_segments_map[level], ref_value);
             }
             parent_value = NULL;
-            rvalue = NULL;
             parent_key = 0;
             rkey = 0;
             level = 0;
@@ -252,7 +251,6 @@ static umf_result_t umfMemoryTrackerAdd(umf_memory_tracker_handle_t hTracker,
                 critnib_release(hTracker->alloc_segments_map[level], ref_value);
             }
             parent_value = NULL;
-            rvalue = NULL;
             parent_key = 0;
             rkey = 0;
             level = 0;
@@ -472,7 +470,6 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
                 critnib_release(TRACKER->alloc_segments_map[level], ref_value);
             }
             top_most_value = NULL;
-            rvalue = NULL;
             top_most_key = 0;
             rkey = 0;
             level = 0;
@@ -546,17 +543,8 @@ umf_result_t umfMemoryTrackerGetIpcInfo(const void *ptr,
     int found = critnib_find(TRACKER->ipc_segments_map, (uintptr_t)ptr, FIND_LE,
                              (void *)&rkey, (void **)&rvalue, &ref_value);
 
-    if (found && !rvalue) {
-        found = 0;
-        if (ref_value) {
-            critnib_release(TRACKER->ipc_segments_map, ref_value);
-        }
-        rkey = 0;
-        rvalue = NULL;
-        ref_value = NULL;
-    }
-
-    if (!found || (uintptr_t)ptr >= rkey + rvalue->size) {
+    if (!found || (found && (rvalue == NULL)) ||
+        ((uintptr_t)ptr >= rkey + rvalue->size)) {
         LOG_DEBUG("pointer %p not found in the tracker, TRACKER=%p", ptr,
                   (void *)TRACKER);
         if (ref_value) {
@@ -569,8 +557,9 @@ umf_result_t umfMemoryTrackerGetIpcInfo(const void *ptr,
     pIpcInfo->baseSize = rvalue->size;
     pIpcInfo->provider = rvalue->provider;
 
-    assert(ref_value);
-    critnib_release(TRACKER->ipc_segments_map, ref_value);
+    if (ref_value) {
+        critnib_release(TRACKER->ipc_segments_map, ref_value);
+    }
 
     return UMF_RESULT_SUCCESS;
 }
@@ -914,11 +903,14 @@ static void check_if_tracker_is_empty(umf_memory_tracker_handle_t hTracker,
 
         while (1 == critnib_find(hTracker->alloc_segments_map[i], last_key,
                                  FIND_G, &rkey, (void **)&rvalue, &ref_value)) {
-            if (rvalue->pool == pool || pool == NULL) {
+            if ((rvalue && rvalue->pool == pool) || pool == NULL) {
                 n_items++;
             }
 
-            critnib_release(hTracker->alloc_segments_map[i], ref_value);
+            if (ref_value) {
+                critnib_release(hTracker->alloc_segments_map[i], ref_value);
+            }
+
             last_key = rkey;
         }
     }