X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fpacket.c;h=8f8625b6123b7f7b9ea8b2f46b62dd4200f80126;hb=26fc5aedf;hp=585ed48b15ccafc3d1eb0281b4f1b44e95006044;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 585ed48b..8f8625b6 100644
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PACKET"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/PACKET"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/packet-const.h>
@@ -39,6 +39,7 @@
 #include "stream-class.h"
 #include "stream.h"
 #include "trace.h"
+#include "lib/func-status.h"
 
 #define BT_ASSERT_PRE_PACKET_HOT(_packet) \
 	BT_ASSERT_PRE_HOT((_packet), "Packet", ": %!+a", (_packet))
@@ -181,7 +182,8 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
 	BT_LIB_LOGD("Creating packet object: %![stream-]+s", stream);
 	packet = g_new0(struct bt_packet, 1);
 	if (!packet) {
-		BT_LOGE_STR("Failed to allocate one packet object.");
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one packet object.");
 		goto error;
 	}
 
@@ -198,7 +200,8 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
 			&stream->class->packet_context_field_pool,
 			stream->class->packet_context_fc);
 		if (!packet->context_field) {
-			BT_LOGE_STR("Cannot create packet context field wrapper.");
+			BT_LIB_LOGE_APPEND_CAUSE(
+				"Cannot create packet context field wrapper.");
 			goto error;
 		}
 	}
@@ -219,14 +222,18 @@ struct bt_packet *bt_packet_create(const struct bt_stream *c_stream)
 	struct bt_stream *stream = (void *) c_stream;
 
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	BT_ASSERT_PRE(stream->class->supports_packets,
+		"Stream class does not support packets: %![sc-]+S",
+		stream->class);
 	packet = bt_object_pool_create_object(&stream->packet_pool);
-	if (unlikely(!packet)) {
-		BT_LIB_LOGE("Cannot allocate one packet from stream's packet pool: "
+	if (G_UNLIKELY(!packet)) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Cannot allocate one packet from stream's packet pool: "
 			"%![stream-]+s", stream);
 		goto end;
 	}
 
-	if (likely(!packet->stream)) {
+	if (G_LIKELY(!packet->stream)) {
 		packet->stream = stream;
 		bt_object_get_no_null_check_no_parent_check(
 			&packet->stream->base);
@@ -236,7 +243,8 @@ end:
 	return (void *) packet;
 }
 
-enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
+enum bt_packet_move_context_field_status bt_packet_move_context_field(
+		struct bt_packet *packet,
 		struct bt_packet_context_field *context_field)
 {
 	struct bt_stream_class *stream_class;
@@ -261,7 +269,7 @@ enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
 
 	/* Move new field */
 	packet->context_field = field_wrapper;
-	return BT_PACKET_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 void bt_packet_get_ref(const struct bt_packet *packet)