lib: use BT_LIB_LOG*_APPEND_CAUSE() where appropriate

[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 6bce712996b1f27910ca779e0d4800a6505bf56c..63471f6040c1e17fc62c634db45048fa1ced2d69 100644 (file)
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -21,9 +21,11 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-PACKET"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/MSG-PACKET"
+#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;
        }
 
@@ -246,7 +248,7 @@ void bt_message_packet_beginning_recycle(struct bt_message *msg)
 {
        BT_ASSERT(msg);
 
-       if (unlikely(!msg->graph)) {
+       if (G_UNLIKELY(!msg->graph)) {
                bt_message_packet_destroy(msg);
                return;
        }
@@ -259,7 +261,7 @@ void bt_message_packet_end_recycle(struct bt_message *msg)
 {
        BT_ASSERT(msg);
 
-       if (unlikely(!msg->graph)) {
+       if (G_UNLIKELY(!msg->graph)) {
                bt_message_packet_destroy(msg);
                return;
        }