Fix build with BUILT_IN_PLUGINS=1

[babeltrace.git] / lib / ref.c

diff --git a/lib/ref.c b/lib/ref.c
index d2ec688e7d3d1d3f31ebd4586bb28ffbceefaf73..02d2c4e9bf914fe3467600d81ea4d5abd13058d9 100644 (file)
--- a/lib/ref.c
+++ b/lib/ref.c
@@ -24,12 +24,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ref-internal.h>
-#include <babeltrace/object-internal.h>
-
 #define BT_LOG_TAG "REF"
 #include <babeltrace/lib-logging-internal.h>
 
+#include <babeltrace/ref-internal.h>
+#include <babeltrace/object-internal.h>
+
 void *bt_get(void *ptr)
 {
        struct bt_object *obj = ptr;
@@ -38,15 +38,22 @@ void *bt_get(void *ptr)
                goto end;
        }
 
+       if (unlikely(!obj->ref_count.release)) {
+               goto end;
+       }
+
        if (unlikely(obj->parent && bt_object_get_ref_count(obj) == 0)) {
                BT_LOGV("Incrementing object's parent's reference count: "
                        "addr=%p, parent-addr=%p", ptr, obj->parent);
                bt_get(obj->parent);
        }
+       BT_LOGV("Incrementing object's reference count: %lu -> %lu: "
+               "addr=%p, cur-count=%lu, new-count=%lu",
+               obj->ref_count.count, obj->ref_count.count + 1,
+               ptr,
+               obj->ref_count.count, obj->ref_count.count + 1);
        bt_ref_get(&obj->ref_count);
-       BT_LOGV("Incremented object's reference count: %lu -> %lu: "
-               "addr=%p, new-count=%lu", obj->ref_count.count - 1,
-               obj->ref_count.count, ptr, obj->ref_count.count);
+
 end:
        return obj;
 }
@@ -59,8 +66,19 @@ void bt_put(void *ptr)
                return;
        }
 
+       if (unlikely(!obj->ref_count.release)) {
+               return;
+       }
+
+       if (BT_LOG_ON_WARN && unlikely(bt_object_get_ref_count(obj) == 0)) {
+               BT_LOGW("Decrementing a reference count set to 0: addr=%p",
+                       ptr);
+       }
+
        BT_LOGV("Decrementing object's reference count: %lu -> %lu: "
-               "addr=%p, cur-count=%lu", obj->ref_count.count,
-               obj->ref_count.count - 1, ptr, obj->ref_count.count);
+               "addr=%p, cur-count=%lu, new-count=%lu",
+               obj->ref_count.count, obj->ref_count.count - 1,
+               ptr,
+               obj->ref_count.count, obj->ref_count.count - 1);
        bt_ref_put(&obj->ref_count);
 }