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

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

diff --git a/src/lib/trace-ir/event.c b/src/lib/trace-ir/event.c
index 7f93d065eb0e1f8ea8e1ddaf2b203a766588a6db..15b40c8c3fb27d4e1ea4a52fc8c6589dfc8c2895 100644 (file)
--- a/src/lib/trace-ir/event.c
+++ b/src/lib/trace-ir/event.c
@@ -22,7 +22,7 @@
  */
 
 #define BT_LOG_TAG "LIB/EVENT"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/event-const.h>
@@ -72,8 +72,11 @@ void _bt_event_set_is_frozen(const struct bt_event *event, bool is_frozen)
        }
 
        ((struct bt_event *) event)->frozen = is_frozen;
-       BT_LOGD_STR("Setting event's packet's frozen state.");
-       bt_packet_set_is_frozen(event->packet, is_frozen);
+
+       if (event->packet) {
+               BT_LOGD_STR("Setting event's packet's frozen state.");
+               bt_packet_set_is_frozen(event->packet, is_frozen);
+       }
 }
 
 BT_HIDDEN
@@ -86,7 +89,7 @@ struct bt_event *bt_event_new(struct bt_event_class *event_class)
        BT_ASSERT(event_class);
        event = g_new0(struct bt_event, 1);
        if (!event) {
-               BT_LOGE_STR("Failed to allocate one event.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one event.");
                goto error;
        }
 
@@ -147,7 +150,7 @@ const struct bt_event_class *bt_event_borrow_class_const(
 struct bt_stream *bt_event_borrow_stream(struct bt_event *event)
 {
        BT_ASSERT_PRE_NON_NULL(event, "Event");
-       return event->packet ? event->packet->stream : NULL;
+       return event->stream;
 }
 
 const struct bt_stream *bt_event_borrow_stream_const(
@@ -223,6 +226,8 @@ void bt_event_destroy(struct bt_event *event)
        bt_object_put_ref(event->class);
        BT_LOGD_STR("Putting event's packet.");
        BT_OBJECT_PUT_REF_AND_RESET(event->packet);
+       BT_LOGD_STR("Putting event's stream.");
+       BT_OBJECT_PUT_REF_AND_RESET(event->stream);
        g_free(event);
 }