lib: make packets and packet messages optional, disabled by default

[babeltrace.git] / src / lib / trace-ir / event.h

diff --git a/src/lib/trace-ir/event.h b/src/lib/trace-ir/event.h
index 308c451e65b550b4305ce72d5a34ff38c1224925..71318f95b626b3b8e11b8db83f3e603d2f00d9f9 100644 (file)
--- a/src/lib/trace-ir/event.h
+++ b/src/lib/trace-ir/event.h
@@ -25,12 +25,12 @@
  */
 
 /* Protection: this file uses BT_LIB_LOG*() macros directly */
-#ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
-# error Please include <lib/lib-logging.h> before including this file.
+#ifndef BT_LIB_LOG_SUPPORTED
+# error Please include "lib/logging.h" before including this file.
 #endif
 
 #include "lib/assert-pre.h"
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/stream.h>
@@ -56,9 +56,12 @@ struct bt_event {
        /* Owned by this */
        struct bt_event_class *class;
 
-       /* Owned by this */
+       /* Owned by this (can be `NULL`) */
        struct bt_packet *packet;
 
+       /* Owned by this */
+       struct bt_stream *stream;
+
        struct bt_field *common_context_field;
        struct bt_field *specific_context_field;
        struct bt_field *payload_field;
@@ -80,7 +83,7 @@ void _bt_event_set_is_frozen(const struct bt_event *event, bool is_frozen);
 # define bt_event_set_is_frozen(_event, _is_frozen)
 #endif
 
-BT_UNUSED
+__attribute__((unused))
 static inline
 void _bt_event_reset_dev_mode(struct bt_event *event)
 {
@@ -118,8 +121,13 @@ void bt_event_reset(struct bt_event *event)
        BT_ASSERT(event);
        BT_LIB_LOGD("Resetting event: %!+e", event);
        bt_event_set_is_frozen(event, false);
-       bt_object_put_no_null_check(&event->packet->base);
-       event->packet = NULL;
+       bt_object_put_no_null_check(&event->stream->base);
+       event->stream = NULL;
+
+       if (event->packet) {
+               bt_object_put_no_null_check(&event->packet->base);
+               event->packet = NULL;
+       }
 }
 
 static inline
@@ -170,35 +178,59 @@ void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
                event->class) == packet->stream->class,
                "Packet's stream class and event's stream class differ: "
                "%![event-]+e, %![packet-]+a", event, packet);
-
+       BT_ASSERT(event->stream->class->supports_packets);
        BT_ASSERT(!event->packet);
        event->packet = packet;
        bt_object_get_no_null_check_no_parent_check(&event->packet->base);
-       BT_LIB_LOGV("Set event's packet: %![event-]+e, %![packet-]+a",
+       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_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_EVENT_HOT(event);
+       BT_ASSERT_PRE(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(!event->stream);
+       event->stream = stream;
+       bt_object_get_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_packet *packet, struct bt_stream *stream)
 {
        struct bt_event *event = NULL;
 
        BT_ASSERT(event_class);
+       BT_ASSERT(stream);
        event = bt_object_pool_create_object(&event_class->event_pool);
-       if (unlikely(!event)) {
-               BT_LIB_LOGE("Cannot allocate one event from event class's 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 (likely(!event->class)) {
+       if (G_LIKELY(!event->class)) {
                event->class = event_class;
                bt_object_get_no_null_check(&event_class->base);
        }
 
-       BT_ASSERT(packet);
-       bt_event_set_packet(event, packet);
+       bt_event_set_stream(event, stream);
+
+       if (packet) {
+               BT_ASSERT(packet);
+               bt_event_set_packet(event, packet);
+       }
+
        goto end;
 
 end: