Standardize `!ptr` i/o `ptr == NULL`, `ptr` i/o `ptr != NULL`

[babeltrace.git] / src / lib / graph / message / event.c

diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index 57f8c42999c74b2aeb5ee94f3529c082df24250e..4222a5a0a33d87b2ed646e433131fe3464fe4b4b 100644 (file)
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -26,6 +26,7 @@
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
+#include "lib/assert-post.h"
 #include "compat/compiler.h"
 #include "lib/object.h"
 #include <babeltrace2/trace-ir/event.h>
@@ -43,14 +44,13 @@
 
 #include "event.h"
 
-BT_ASSERT_PRE_FUNC
 static inline bool event_class_has_trace(struct bt_event_class *event_class)
 {
        struct bt_stream_class *stream_class;
 
        stream_class = bt_event_class_borrow_stream_class_inline(event_class);
        BT_ASSERT(stream_class);
-       return bt_stream_class_borrow_trace_class(stream_class) != NULL;
+       return bt_stream_class_borrow_trace_class(stream_class);
 }
 
 BT_HIDDEN
@@ -61,7 +61,8 @@ struct bt_message *bt_message_event_new(
 
        message = g_new0(struct bt_message_event, 1);
        if (!message) {
-               BT_LOGE_STR("Failed to allocate one event message.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one event message.");
                goto error;
        }
 
@@ -80,7 +81,8 @@ static inline
 struct bt_message *create_event_message(
                struct bt_self_message_iterator *self_msg_iter,
                const struct bt_event_class *c_event_class,
-               const struct bt_packet *c_packet, bool with_cs,
+               const struct bt_packet *c_packet,
+               const struct bt_stream *c_stream, bool with_cs,
                uint64_t raw_value)
 {
        struct bt_self_component_port_input_message_iterator *msg_iter =
@@ -89,11 +91,12 @@ struct bt_message *create_event_message(
        struct bt_event_class *event_class = (void *) c_event_class;
        struct bt_stream_class *stream_class;
        struct bt_packet *packet = (void *) c_packet;
+       struct bt_stream *stream = (void *) c_stream;
        struct bt_event *event;
 
+       BT_ASSERT(stream);
        BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
-       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
        BT_ASSERT_PRE(event_class_has_trace(event_class),
                "Event class is not part of a trace: %!+E", event_class);
        stream_class = bt_event_class_borrow_stream_class_inline(event_class);
@@ -107,9 +110,10 @@ struct bt_message *create_event_message(
                "cs-val=%" PRIu64,
                event_class, stream_class, with_cs, raw_value);
        BT_LIB_LOGD("Creating event message object: %![ec-]+E", event_class);
-       event = bt_event_create(event_class, packet);
+       event = bt_event_create(event_class, packet, stream);
        if (G_UNLIKELY(!event)) {
-               BT_LIB_LOGE("Cannot create event from event class: "
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot create event from event class: "
                        "%![ec-]+E", event_class);
                goto error;
        }
@@ -149,7 +153,12 @@ struct bt_message *create_event_message(
 
        BT_ASSERT(!message->event);
        message->event = event;
-       bt_packet_set_is_frozen(packet, true);
+
+       if (packet) {
+               bt_packet_set_is_frozen(packet, true);
+       }
+
+       bt_stream_freeze(stream);
        bt_event_class_freeze(event_class);
        BT_LIB_LOGD("Created event message object: "
                "%![msg-]+n, %![event-]+e", message, event);
@@ -164,21 +173,45 @@ end:
 }
 
 struct bt_message *bt_message_event_create(
+               struct bt_self_message_iterator *msg_iter,
+               const struct bt_event_class *event_class,
+               const struct bt_stream *stream)
+{
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       return create_event_message(msg_iter, event_class, NULL, stream, false, 0);
+}
+
+struct bt_message *bt_message_event_create_with_packet(
                struct bt_self_message_iterator *msg_iter,
                const struct bt_event_class *event_class,
                const struct bt_packet *packet)
 {
-       return create_event_message(msg_iter, event_class, packet, false, 0);
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       return create_event_message(msg_iter, event_class, packet,
+               packet->stream, false, 0);
 }
 
 struct bt_message *bt_message_event_create_with_default_clock_snapshot(
+               struct bt_self_message_iterator *msg_iter,
+               const struct bt_event_class *event_class,
+               const struct bt_stream *stream,
+               uint64_t raw_value)
+{
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       return create_event_message(msg_iter, event_class, NULL, stream,
+               true, raw_value);
+}
+
+struct bt_message *
+bt_message_event_create_with_packet_and_default_clock_snapshot(
                struct bt_self_message_iterator *msg_iter,
                const struct bt_event_class *event_class,
                const struct bt_packet *packet,
                uint64_t raw_value)
 {
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
        return create_event_message(msg_iter, event_class, packet,
-               true, raw_value);
+               packet->stream, true, raw_value);
 }
 
 BT_HIDDEN
@@ -237,8 +270,8 @@ struct bt_event *borrow_event(struct bt_message *message)
 {
        struct bt_message_event *event_message;
 
-       BT_ASSERT_PRE_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_EVENT);
        event_message = container_of(message,
                        struct bt_message_event, parent);
        return event_message->event;
@@ -263,12 +296,12 @@ bt_message_event_borrow_default_clock_snapshot_const(
        struct bt_message_event *event_msg = (void *) msg;
        struct bt_stream_class *stream_class;
 
-       BT_ASSERT_PRE_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_msg->event->class);
        BT_ASSERT(stream_class);
-       BT_ASSERT_PRE(stream_class->default_clock_class,
+       BT_ASSERT_PRE_DEV(stream_class->default_clock_class,
                "Message's stream's class has no default clock class: "
                "%![msg-]+n, %![sc-]+S", msg, stream_class);
        return event_msg->default_cs;
@@ -281,8 +314,8 @@ bt_message_event_borrow_stream_class_default_clock_class_const(
        struct bt_message_event *event_msg = (void *) msg;
        struct bt_stream_class *stream_class;
 
-       BT_ASSERT_PRE_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
+       BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_msg->event->class);
        BT_ASSERT(stream_class);