lib: move code only used by create_event() to `message/event.c`

Those functions, bt_event_set_packet() and bt_event_set_stream(), used
to exist in the Babeltrace 1 to 2 transition. But now it seems like
they're internal and only used by the also internal create_event().

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Id9087e802af3aca76de6dd89abf73b3d75c848ea
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3429

diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index e194fce0b1822b7c35140a46607707f4665169d8..64b01758a08ad21a1f59df9e765cfefbd9022120 100644 (file)
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -59,6 +59,50 @@ end:
        return (void *) message;
 }
 
+static
+struct bt_event *create_event(struct bt_event_class *event_class,
+               struct bt_packet *packet, struct bt_stream *stream)
+{
+       struct bt_event *event = NULL;
+
+       BT_ASSERT_DBG(event_class);
+       BT_ASSERT_DBG(stream);
+       event = bt_object_pool_create_object(&event_class->event_pool);
+       if (G_UNLIKELY(!event)) {
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot allocate one event from event class's event pool: "
+                       "%![ec-]+E", event_class);
+               goto end;
+       }
+
+       if (G_LIKELY(!event->class)) {
+               event->class = event_class;
+               bt_object_get_ref_no_null_check(&event_class->base);
+       }
+
+       BT_ASSERT_DBG(!event->stream);
+       event->stream = stream;
+       bt_object_get_ref_no_null_check_no_parent_check(&event->stream->base);
+       BT_LIB_LOGD("Set event's stream: %![event-]+e, %![stream-]+s",
+               event, stream);
+
+       if (packet) {
+               BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(
+                       event_class) == packet->stream->class,
+                       "Packet's stream class and event class's stream class differ: "
+                       "%![ec-]+E, %![packet-]+a", event, packet);
+               BT_ASSERT_DBG(event->stream->class->supports_packets);
+               BT_ASSERT_DBG(!event->packet);
+               event->packet = packet;
+               bt_object_get_ref_no_null_check_no_parent_check(&event->packet->base);
+               BT_LIB_LOGD("Set event's packet: %![event-]+e, %![packet-]+a",
+                       event, packet);
+       }
+
+end:
+       return event;
+}
+
 static inline
 struct bt_message *create_event_message(
                struct bt_self_message_iterator *self_msg_iter,
@@ -81,6 +125,10 @@ struct bt_message *create_event_message(
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE(event_class_has_trace(event_class),
                "Event class is not part of a trace: %!+E", event_class);
+       BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(event_class) ==
+               stream->class,
+               "Stream's class and event's stream class differ: "
+               "%![ec-]+E, %![stream-]+s", event_class, stream);
        stream_class = bt_event_class_borrow_stream_class_inline(event_class);
        BT_ASSERT_DBG(stream_class);
        BT_ASSERT_PRE((with_cs && stream_class->default_clock_class) ||
@@ -92,7 +140,7 @@ 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, stream);
+       event = create_event(event_class, packet, stream);
        if (G_UNLIKELY(!event)) {
                BT_LIB_LOGE_APPEND_CAUSE(
                        "Cannot create event from event class: "

diff --git a/src/lib/trace-ir/event.h b/src/lib/trace-ir/event.h
index 2899f271d93cc9652d119088db8f90ce2da1a0a6..6ef182917c114ce66964fe27be5db82256dde67a 100644 (file)
--- a/src/lib/trace-ir/event.h
+++ b/src/lib/trace-ir/event.h
@@ -153,73 +153,4 @@ void bt_event_recycle(struct bt_event *event)
        bt_object_put_ref_no_null_check(&event_class->base);
 }
 
-static inline
-void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
-{
-       BT_ASSERT_PRE_DEV_NON_NULL(event, "Event");
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
-       BT_ASSERT_PRE_DEV_EVENT_HOT(event);
-       BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(
-               event->class) == packet->stream->class,
-               "Packet's stream class and event's stream class differ: "
-               "%![event-]+e, %![packet-]+a", event, packet);
-       BT_ASSERT_DBG(event->stream->class->supports_packets);
-       BT_ASSERT_DBG(!event->packet);
-       event->packet = packet;
-       bt_object_get_ref_no_null_check_no_parent_check(&event->packet->base);
-       BT_LIB_LOGD("Set event's packet: %![event-]+e, %![packet-]+a",
-               event, packet);
-}
-
-static inline
-void bt_event_set_stream(struct bt_event *event, struct bt_stream *stream)
-{
-       BT_ASSERT_PRE_DEV_NON_NULL(event, "Event");
-       BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
-       BT_ASSERT_PRE_DEV_EVENT_HOT(event);
-       BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(
-               event->class) == stream->class,
-               "Stream's class and event's stream class differ: "
-               "%![event-]+e, %![stream-]+s", event, stream);
-       BT_ASSERT_DBG(!event->stream);
-       event->stream = stream;
-       bt_object_get_ref_no_null_check_no_parent_check(&event->stream->base);
-       BT_LIB_LOGD("Set event's stream: %![event-]+e, %![stream-]+s",
-               event, stream);
-}
-
-static inline
-struct bt_event *bt_event_create(struct bt_event_class *event_class,
-               struct bt_packet *packet, struct bt_stream *stream)
-{
-       struct bt_event *event = NULL;
-
-       BT_ASSERT_DBG(event_class);
-       BT_ASSERT_DBG(stream);
-       event = bt_object_pool_create_object(&event_class->event_pool);
-       if (G_UNLIKELY(!event)) {
-               BT_LIB_LOGE_APPEND_CAUSE(
-                       "Cannot allocate one event from event class's event pool: "
-                       "%![ec-]+E", event_class);
-               goto end;
-       }
-
-       if (G_LIKELY(!event->class)) {
-               event->class = event_class;
-               bt_object_get_ref_no_null_check(&event_class->base);
-       }
-
-       bt_event_set_stream(event, stream);
-
-       if (packet) {
-               BT_ASSERT_DBG(packet);
-               bt_event_set_packet(event, packet);
-       }
-
-       goto end;
-
-end:
-       return event;
-}
-
 #endif /* BABELTRACE_TRACE_IR_EVENT_INTERNAL_H */