Fix: lib: pass down API function name to some helpers

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

diff --git a/src/lib/trace-ir/stream.c b/src/lib/trace-ir/stream.c
index daabe96f22785318b9aa8396fd116a092325820f..fcfe3d4b7ec58bdac76c0e38da9a6dfb5136832f 100644 (file)
--- a/src/lib/trace-ir/stream.c
+++ b/src/lib/trace-ir/stream.c
@@ -8,7 +8,7 @@
 #define BT_LOG_TAG "LIB/STREAM"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/stream.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/trace.h>
@@ -27,8 +27,9 @@
 #include "lib/value.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_DEV_STREAM_HOT(_stream) \
-       BT_ASSERT_PRE_DEV_HOT((_stream), "Stream", ": %!+s", (_stream))
+#define BT_ASSERT_PRE_DEV_STREAM_HOT(_stream)                          \
+       BT_ASSERT_PRE_DEV_HOT("stream", (_stream), "Stream",            \
+               ": %!+s", (_stream))
 
 static
 void destroy_stream(struct bt_object *obj)
@@ -82,18 +83,21 @@ end:
 
 static
 struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class,
-               struct bt_trace *trace, uint64_t id)
+               struct bt_trace *trace, uint64_t id, const char *api_func)
 {
        int ret;
        struct bt_stream *stream;
 
        BT_ASSERT(stream_class);
        BT_ASSERT(trace);
-       BT_ASSERT_PRE(trace->class ==
-               bt_stream_class_borrow_trace_class_inline(stream_class),
+       BT_ASSERT_PRE_FROM_FUNC(api_func,
+               "trace-class-is-stream-class-trace-class",
+               trace->class ==
+                       bt_stream_class_borrow_trace_class_inline(stream_class),
                "Trace's class is different from stream class's parent trace class: "
                "%![sc-]+S, %![trace-]+t", stream_class, trace);
-       BT_ASSERT_PRE(stream_id_is_unique(trace, stream_class, id),
+       BT_ASSERT_PRE_FROM_FUNC(api_func, "stream-id-is-unique",
+               stream_id_is_unique(trace, stream_class, id),
                "Duplicate stream ID: %![trace-]+t, id=%" PRIu64, trace, id);
        BT_LIB_LOGD("Creating stream object: %![trace-]+t, id=%" PRIu64,
                trace, id);
@@ -151,30 +155,32 @@ struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class,
        uint64_t id;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_NON_NULL(trace, "Trace");
-       BT_ASSERT_PRE(stream_class->assigns_automatic_stream_id,
+       BT_ASSERT_PRE_SC_NON_NULL(stream_class);
+       BT_ASSERT_PRE_TRACE_NON_NULL(trace);
+       BT_ASSERT_PRE("stream-class-automatically-assigns-stream-ids",
+               stream_class->assigns_automatic_stream_id,
                "Stream class does not automatically assigns stream IDs: "
                "%![sc-]+S", stream_class);
        id = bt_trace_get_automatic_stream_id(trace, stream_class);
-       return create_stream_with_id(stream_class, trace, id);
+       return create_stream_with_id(stream_class, trace, id, __func__);
 }
 
 struct bt_stream *bt_stream_create_with_id(struct bt_stream_class *stream_class,
                struct bt_trace *trace, uint64_t id)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_NON_NULL(trace, "Trace");
-       BT_ASSERT_PRE(!stream_class->assigns_automatic_stream_id,
+       BT_ASSERT_PRE_SC_NON_NULL(stream_class);
+       BT_ASSERT_PRE_TRACE_NON_NULL(trace);
+       BT_ASSERT_PRE("stream-class-does-not-automatically-assigns-stream-ids",
+               !stream_class->assigns_automatic_stream_id,
                "Stream class automatically assigns stream IDs: "
                "%![sc-]+S", stream_class);
-       return create_stream_with_id(stream_class, trace, id);
+       return create_stream_with_id(stream_class, trace, id, __func__);
 }
 
 struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_DEV_STREAM_NON_NULL(stream);
        return stream->class;
 }
 
@@ -186,7 +192,7 @@ const struct bt_stream_class *bt_stream_borrow_class_const(
 
 struct bt_trace *bt_stream_borrow_trace(struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_DEV_STREAM_NON_NULL(stream);
        return bt_stream_borrow_trace_inline(stream);
 }
 
@@ -198,7 +204,7 @@ const struct bt_trace *bt_stream_borrow_trace_const(
 
 const char *bt_stream_get_name(const struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_DEV_STREAM_NON_NULL(stream);
        return stream->name.value;
 }
 
@@ -206,8 +212,8 @@ enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
                const char *name)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-       BT_ASSERT_PRE_NON_NULL(name, "Name");
+       BT_ASSERT_PRE_STREAM_NON_NULL(stream);
+       BT_ASSERT_PRE_NAME_NON_NULL(name);
        BT_ASSERT_PRE_DEV_STREAM_HOT(stream);
        g_string_assign(stream->name.str, name);
        stream->name.value = stream->name.str->str;
@@ -217,7 +223,7 @@ enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
 
 uint64_t bt_stream_get_id(const struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream class");
+       BT_ASSERT_PRE_DEV_SC_NON_NULL(stream);
        return stream->id;
 }
 
@@ -235,7 +241,7 @@ void _bt_stream_freeze(const struct bt_stream *stream)
 const struct bt_value *bt_stream_borrow_user_attributes_const(
                const struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_DEV_STREAM_NON_NULL(stream);
        return stream->user_attributes;
 }
 
@@ -247,10 +253,9 @@ struct bt_value *bt_stream_borrow_user_attributes(struct bt_stream *stream)
 void bt_stream_set_user_attributes(struct bt_stream *stream,
                const struct bt_value *user_attributes)
 {
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-       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_STREAM_NON_NULL(stream);
+       BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes);
+       BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes);
        BT_ASSERT_PRE_DEV_STREAM_HOT(stream);
        bt_object_put_ref_no_null_check(stream->user_attributes);
        stream->user_attributes = (void *) user_attributes;