trace{-class}.c: BT_ASSERT_PRE() -> BT_ASSERT_POST() (ref. count check)

[babeltrace.git] / src / lib / trace-ir / trace.c

diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 6deecb1d80d4eef7f24ba673c00126b3f0eaefa7..184fc0705f2dd6ea125aad2e73fb23a5748a1cb5 100644 (file)
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.c
@@ -25,6 +25,7 @@
 #include "lib/logging.h"
 
 #include "lib/assert-pre.h"
+#include "lib/assert-post.h"
 #include <babeltrace2/trace-ir/trace.h>
 #include <babeltrace2/trace-ir/trace-const.h>
 #include <babeltrace2/trace-ir/event-class.h>
@@ -55,6 +56,7 @@
 #include "trace-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/value.h"
 #include "lib/func-status.h"
 
 struct bt_trace_destruction_listener_elem {
@@ -71,6 +73,7 @@ void destroy_trace(struct bt_object *obj)
        struct bt_trace *trace = (void *) obj;
 
        BT_LIB_LOGD("Destroying trace object: %!+t", trace);
+       BT_OBJECT_PUT_REF_AND_RESET(trace->user_attributes);
 
        /*
         * Call destruction listener functions so that everything else
@@ -106,7 +109,7 @@ void destroy_trace(struct bt_object *obj)
                         * The destruction listener should not have kept a
                         * reference to the trace.
                         */
-                       BT_ASSERT_PRE(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace);
+                       BT_ASSERT_POST(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace);
                }
                g_array_free(trace->destruction_listeners, TRUE);
                trace->destruction_listeners = NULL;
@@ -153,6 +156,13 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
        }
 
        bt_object_init_shared(&trace->base, destroy_trace);
+       trace->user_attributes = bt_value_map_create();
+       if (!trace->user_attributes) {
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to create a map value object.");
+               goto error;
+       }
+
        trace->streams = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_object_try_spec_release);
        if (!trace->streams) {
@@ -187,7 +197,7 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
        }
 
        trace->class = tc;
-       bt_object_get_no_null_check(trace->class);
+       bt_object_get_ref_no_null_check(trace->class);
        BT_LIB_LOGD("Created trace object: %!+t", trace);
        goto end;
 
@@ -239,7 +249,7 @@ bool trace_has_environment_entry(const struct bt_trace *trace, const char *name)
        BT_ASSERT(trace);
 
        return bt_attributes_borrow_field_value_by_name(
-               trace->environment, name) != NULL;
+               trace->environment, name);
 }
 
 static
@@ -305,7 +315,7 @@ bt_trace_set_environment_entry_integer(
        struct bt_value *value_obj;
        BT_ASSERT_PRE_NON_NULL(trace, "Trace");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
-       value_obj = bt_value_signed_integer_create_init(value);
+       value_obj = bt_value_integer_signed_create_init(value);
        if (!value_obj) {
                BT_LIB_LOGE_APPEND_CAUSE(
                        "Cannot create an integer value object.");
@@ -406,7 +416,7 @@ const struct bt_stream *bt_trace_borrow_stream_by_id_const(
 enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
                const struct bt_trace *c_trace,
                bt_trace_destruction_listener_func listener,
-               void *data, uint64_t *listener_id)
+               void *data, bt_listener_id *listener_id)
 {
        struct bt_trace *trace = (void *) c_trace;
        uint64_t i;
@@ -444,18 +454,17 @@ enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
        return BT_FUNC_STATUS_OK;
 }
 
-BT_ASSERT_PRE_FUNC
 static
 bool has_listener_id(const struct bt_trace *trace, uint64_t listener_id)
 {
        BT_ASSERT(listener_id < trace->destruction_listeners->len);
        return (&g_array_index(trace->destruction_listeners,
                        struct bt_trace_destruction_listener_elem,
-                       listener_id))->func != NULL;
+                       listener_id))->func;
 }
 
 enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
-               const struct bt_trace *c_trace, uint64_t listener_id)
+               const struct bt_trace *c_trace, bt_listener_id listener_id)
 {
        struct bt_trace *trace = (void *) c_trace;
        struct bt_trace_destruction_listener_elem *elem;
@@ -483,6 +492,9 @@ void _bt_trace_freeze(const struct bt_trace *trace)
        BT_ASSERT(trace);
        BT_LIB_LOGD("Freezing trace's class: %!+T", trace->class);
        bt_trace_class_freeze(trace->class);
+       BT_LIB_LOGD("Freezing trace's user attributes: %!+v",
+               trace->user_attributes);
+       bt_value_freeze(trace->user_attributes);
        BT_LIB_LOGD("Freezing trace: %!+t", trace);
        ((struct bt_trace *) trace)->frozen = true;
 }
@@ -536,6 +548,32 @@ const struct bt_trace_class *bt_trace_borrow_class_const(
        return bt_trace_borrow_class((void *) trace);
 }
 
+const struct bt_value *bt_trace_borrow_user_attributes_const(
+               const struct bt_trace *trace)
+{
+       BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
+       return trace->user_attributes;
+}
+
+struct bt_value *bt_trace_borrow_user_attributes(struct bt_trace *trace)
+{
+       return (void *) bt_trace_borrow_user_attributes_const((void *) trace);
+}
+
+void bt_trace_set_user_attributes(
+               struct bt_trace *trace,
+               const struct bt_value *user_attributes)
+{
+       BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+       BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
+       BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
+               "User attributes object is not a map value object.");
+       BT_ASSERT_PRE_DEV_TRACE_HOT(trace);
+       bt_object_put_ref_no_null_check(trace->user_attributes);
+       trace->user_attributes = (void *) user_attributes;
+       bt_object_get_ref_no_null_check(trace->user_attributes);
+}
+
 void bt_trace_get_ref(const struct bt_trace *trace)
 {
        bt_object_get_ref(trace);