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

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

diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index 4a5a3e39b8dc42aa409bf662041e6136fcf685e7..b00f2dfc0b7026c540affb5787f21d7c79377387 100644 (file)
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -22,8 +22,10 @@
  */
 
 #define BT_LOG_TAG "LIB/MSG-PACKET"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
+#include "lib/assert-pre.h"
+#include "lib/assert-post.h"
 #include "compat/compiler.h"
 #include <babeltrace2/trace-ir/packet.h>
 #include "lib/trace-ir/packet.h"
@@ -37,7 +39,6 @@
 #include <babeltrace2/graph/message-packet-beginning.h>
 #include <babeltrace2/graph/message-packet-end.h>
 #include "common/assert.h"
-#include "lib/assert-pre.h"
 #include "lib/object.h"
 #include <inttypes.h>
 
@@ -51,7 +52,8 @@ struct bt_message *new_packet_message(struct bt_graph *graph,
 
        message = g_new0(struct bt_message_packet, 1);
        if (!message) {
-               BT_LOGE_STR("Failed to allocate one packet message.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one packet message.");
                goto error;
        }
 
@@ -97,6 +99,12 @@ struct bt_message *create_packet_message(
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
 
+       /*
+        * It's not possible to create a packet from a stream of which
+        * the class indicates that packets are not supported.
+        */
+       BT_ASSERT(stream_class->supports_packets);
+
        if (pool == &msg_iter->graph->packet_begin_msg_pool) {
                need_cs = stream_class->packets_have_beginning_default_clock_snapshot;
        } else {