common: introduce bt_g_array_index

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

diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index ac66803b5bb028c99923dd34b2c1bfcde34a3c27..1518214999b29f28e62cc8f0ff0ac770db91e32a 100644 (file)
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -45,7 +45,10 @@ struct bt_trace_class_destruction_listener_elem {
 };
 
 #define BT_ASSERT_PRE_DEV_TRACE_CLASS_HOT(_tc)                         \
-       BT_ASSERT_PRE_DEV_HOT((_tc), "Trace class", ": %!+T", (_tc))
+       BT_ASSERT_PRE_DEV_HOT("trace-class", (_tc), "Trace class",      \
+               ": %!+T", (_tc))
+
+#define DESTRUCTION_LISTENER_FUNC_NAME "bt_trace_destruction_listener_func"
 
 static
 void destroy_trace_class(struct bt_object *obj)
@@ -82,19 +85,24 @@ void destroy_trace_class(struct bt_object *obj)
                /* Call all the trace class destruction listeners */
                for (i = 0; i < tc->destruction_listeners->len; i++) {
                        struct bt_trace_class_destruction_listener_elem elem =
-                               g_array_index(tc->destruction_listeners,
+                               bt_g_array_index(tc->destruction_listeners,
                                                struct bt_trace_class_destruction_listener_elem, i);
 
                        if (elem.func) {
                                elem.func(tc, elem.data);
-                               BT_ASSERT_POST_NO_ERROR();
+                               BT_ASSERT_POST_NO_ERROR(
+                                       DESTRUCTION_LISTENER_FUNC_NAME);
                        }
 
                        /*
                         * The destruction listener should not have kept a
                         * reference to the trace class.
                         */
-                       BT_ASSERT_POST(tc->base.ref_count == 1, "Destruction listener kept a reference to the trace class being destroyed: %![tc-]+T", tc);
+                       BT_ASSERT_POST(DESTRUCTION_LISTENER_FUNC_NAME,
+                               "trace-class-reference-count-not-changed",
+                               tc->base.ref_count == 1,
+                               "Destruction listener kept a reference to the trace class being destroyed: %![tc-]+T",
+                               tc);
                }
                g_array_free(tc->destruction_listeners, TRUE);
                tc->destruction_listeners = NULL;
@@ -113,6 +121,7 @@ void destroy_trace_class(struct bt_object *obj)
        g_free(tc);
 }
 
+BT_EXPORT
 struct bt_trace_class *bt_trace_class_create(bt_self_component *self_comp)
 {
        struct bt_trace_class *tc = NULL;
@@ -159,6 +168,7 @@ end:
        return tc;
 }
 
+BT_EXPORT
 enum bt_trace_class_add_listener_status bt_trace_class_add_destruction_listener(
                const struct bt_trace_class *_tc,
                bt_trace_class_destruction_listener_func listener,
@@ -178,7 +188,7 @@ enum bt_trace_class_add_listener_status bt_trace_class_add_destruction_listener(
        /* Find the next available spot */
        for (i = 0; i < tc->destruction_listeners->len; i++) {
                struct bt_trace_class_destruction_listener_elem elem =
-                       g_array_index(tc->destruction_listeners,
+                       bt_g_array_index(tc->destruction_listeners,
                                struct bt_trace_class_destruction_listener_elem, i);
 
                if (!elem.func) {
@@ -205,11 +215,12 @@ static
 bool has_listener_id(const struct bt_trace_class *tc, uint64_t listener_id)
 {
        BT_ASSERT(listener_id < tc->destruction_listeners->len);
-       return (&g_array_index(tc->destruction_listeners,
+       return (&bt_g_array_index(tc->destruction_listeners,
                        struct bt_trace_class_destruction_listener_elem,
                        listener_id))->func;
 }
 
+BT_EXPORT
 enum bt_trace_class_remove_listener_status bt_trace_class_remove_destruction_listener(
                const struct bt_trace_class *_tc, bt_listener_id listener_id)
 {
@@ -218,10 +229,11 @@ enum bt_trace_class_remove_listener_status bt_trace_class_remove_destruction_lis
 
        BT_ASSERT_PRE_NO_ERROR();
        BT_ASSERT_PRE_TC_NON_NULL(tc);
-       BT_ASSERT_PRE(has_listener_id(tc, listener_id),
+       BT_ASSERT_PRE("listener-id-exists",
+               has_listener_id(tc, listener_id),
                "Trace class has no such trace class destruction listener ID: "
                "%![tc-]+T, %" PRIu64, tc, listener_id);
-       elem = &g_array_index(tc->destruction_listeners,
+       elem = &bt_g_array_index(tc->destruction_listeners,
                        struct bt_trace_class_destruction_listener_elem,
                        listener_id);
        BT_ASSERT(elem->func);
@@ -234,12 +246,14 @@ enum bt_trace_class_remove_listener_status bt_trace_class_remove_destruction_lis
        return BT_FUNC_STATUS_OK;
 }
 
+BT_EXPORT
 uint64_t bt_trace_class_get_stream_class_count(const struct bt_trace_class *tc)
 {
        BT_ASSERT_PRE_DEV_TC_NON_NULL(tc);
        return (uint64_t) tc->stream_classes->len;
 }
 
+BT_EXPORT
 struct bt_stream_class *bt_trace_class_borrow_stream_class_by_index(
                struct bt_trace_class *tc, uint64_t index)
 {
@@ -248,6 +262,7 @@ struct bt_stream_class *bt_trace_class_borrow_stream_class_by_index(
        return g_ptr_array_index(tc->stream_classes, index);
 }
 
+BT_EXPORT
 const struct bt_stream_class *
 bt_trace_class_borrow_stream_class_by_index_const(
                const struct bt_trace_class *tc, uint64_t index)
@@ -256,6 +271,7 @@ bt_trace_class_borrow_stream_class_by_index_const(
                (void *) tc, index);
 }
 
+BT_EXPORT
 struct bt_stream_class *bt_trace_class_borrow_stream_class_by_id(
                struct bt_trace_class *tc, uint64_t id)
 {
@@ -278,6 +294,7 @@ end:
        return stream_class;
 }
 
+BT_EXPORT
 const struct bt_stream_class *
 bt_trace_class_borrow_stream_class_by_id_const(
                const struct bt_trace_class *tc, uint64_t id)
@@ -285,7 +302,6 @@ bt_trace_class_borrow_stream_class_by_id_const(
        return bt_trace_class_borrow_stream_class_by_id((void *) tc, id);
 }
 
-BT_HIDDEN
 void _bt_trace_class_freeze(const struct bt_trace_class *tc)
 {
        BT_ASSERT(tc);
@@ -293,12 +309,14 @@ void _bt_trace_class_freeze(const struct bt_trace_class *tc)
        ((struct bt_trace_class *) tc)->frozen = true;
 }
 
+BT_EXPORT
 bt_bool bt_trace_class_assigns_automatic_stream_class_id(const struct bt_trace_class *tc)
 {
        BT_ASSERT_PRE_DEV_TC_NON_NULL(tc);
        return (bt_bool) tc->assigns_automatic_stream_class_id;
 }
 
+BT_EXPORT
 void bt_trace_class_set_assigns_automatic_stream_class_id(struct bt_trace_class *tc,
                bt_bool value)
 {
@@ -309,6 +327,7 @@ void bt_trace_class_set_assigns_automatic_stream_class_id(struct bt_trace_class
                "assignment property: %!+T", tc);
 }
 
+BT_EXPORT
 const struct bt_value *bt_trace_class_borrow_user_attributes_const(
                const struct bt_trace_class *trace_class)
 {
@@ -316,6 +335,7 @@ const struct bt_value *bt_trace_class_borrow_user_attributes_const(
        return trace_class->user_attributes;
 }
 
+BT_EXPORT
 struct bt_value *bt_trace_class_borrow_user_attributes(
                struct bt_trace_class *trace_class)
 {
@@ -323,6 +343,7 @@ struct bt_value *bt_trace_class_borrow_user_attributes(
                (void *) trace_class);
 }
 
+BT_EXPORT
 void bt_trace_class_set_user_attributes(struct bt_trace_class *trace_class,
                const struct bt_value *user_attributes)
 {
@@ -335,11 +356,13 @@ void bt_trace_class_set_user_attributes(struct bt_trace_class *trace_class,
        bt_object_get_ref_no_null_check(trace_class->user_attributes);
 }
 
+BT_EXPORT
 void bt_trace_class_get_ref(const struct bt_trace_class *trace_class)
 {
        bt_object_get_ref(trace_class);
 }
 
+BT_EXPORT
 void bt_trace_class_put_ref(const struct bt_trace_class *trace_class)
 {
        bt_object_put_ref(trace_class);