Cleanup: src.ctf.lttng-live: remove usage of `bt_object`

[babeltrace.git] / src / lib / object.h

diff --git a/src/lib/object.h b/src/lib/object.h
index 9d584c1bfd311bf2424fa5364fd1819a7ed1eea1..c7cbb123f82b673a17ee89c91bed7dbc7e1b65b9 100644 (file)
--- a/src/lib/object.h
+++ b/src/lib/object.h
@@ -28,18 +28,6 @@
 #include "common/assert.h"
 #include <stdbool.h>
 
-/*
- * Some parts of the Babeltrace project use this internal library header
- * for internal reference counting. Until we make this header generic
- * for the whole project, make it possible to disable logging in this
- * file by defining `BT_OBJECT_DONT_LOG` because it's possible that the
- * BT_LOGT() statements here won't find the log level
- * (`BT_LOG_OUTPUT_LEVEL`).
- */
-#if defined(BT_LOGT) && !defined(BT_OBJECT_DONT_LOG)
-# define _BT_OBJECT_LOGGING_ENABLED
-#endif
-
 struct bt_object;
 
 typedef void (*bt_object_release_func)(struct bt_object *);
@@ -138,7 +126,7 @@ void bt_object_set_parent(struct bt_object *child, struct bt_object *parent)
        BT_ASSERT_DBG(child);
        BT_ASSERT_DBG(child->is_shared);
 
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
        BT_LOGT("Setting object's parent: addr=%p, parent-addr=%p",
                child, parent);
 #endif
@@ -185,7 +173,7 @@ void bt_object_with_parent_release_func(struct bt_object *obj)
                 */
                struct bt_object *parent = obj->parent;
 
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
                BT_LOGT("Releasing parented object: addr=%p, ref-count=%llu, "
                        "parent-addr=%p, parent-ref-count=%llu",
                        obj, obj->ref_count,
@@ -275,7 +263,7 @@ void bt_object_get_ref_no_null_check_no_parent_check(const struct bt_object *c_o
        BT_ASSERT_DBG(obj);
        BT_ASSERT_DBG(obj->is_shared);
 
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
        BT_LOGT("Incrementing object's reference count: %llu -> %llu: "
                "addr=%p, cur-count=%llu, new-count=%llu",
                obj->ref_count, obj->ref_count + 1,
@@ -294,7 +282,7 @@ void bt_object_get_ref_no_null_check(const void *c_obj)
        BT_ASSERT_DBG(obj->is_shared);
 
        if (G_UNLIKELY(obj->parent && bt_object_get_ref_count(obj) == 0)) {
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
                BT_LOGT("Incrementing object's parent's reference count: "
                        "addr=%p, parent-addr=%p", obj, obj->parent);
 #endif
@@ -302,7 +290,7 @@ void bt_object_get_ref_no_null_check(const void *c_obj)
                bt_object_get_ref_no_null_check(obj->parent);
        }
 
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
        BT_LOGT("Incrementing object's reference count: %llu -> %llu: "
                "addr=%p, cur-count=%llu, new-count=%llu",
                obj->ref_count, obj->ref_count + 1,
@@ -321,7 +309,7 @@ void bt_object_put_ref_no_null_check(const void *c_obj)
        BT_ASSERT_DBG(obj->is_shared);
        BT_ASSERT_DBG(obj->ref_count > 0);
 
-#ifdef _BT_OBJECT_LOGGING_ENABLED
+#ifdef BT_LOGT
        BT_LOGT("Decrementing object's reference count: %llu -> %llu: "
                "addr=%p, cur-count=%llu, new-count=%llu",
                obj->ref_count, obj->ref_count - 1,