Move bt_message_type_string to common

Move it to src/common/common.h, so that it can be used by plugins.
Rename it to bt_common_message_type_string.

Change-Id: Ica2fc901a35a142ac54a68b3a69a3470e92a327a
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/6694
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/common/common.h b/src/common/common.h
index 2cad30767a28fad9581130c6c53e8f6e40e3ba3f..46e6a1a1b293e330b18c3eaf22b336021310a1db 100644 (file)
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -895,6 +895,31 @@ const char *bt_common_component_class_type_string(
        bt_common_abort();
 }
 
+static inline
+const char *bt_common_message_type_string(enum bt_message_type type)
+{
+       switch (type) {
+       case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+               return "STREAM_BEGINNING";
+       case BT_MESSAGE_TYPE_STREAM_END:
+               return "STREAM_END";
+       case BT_MESSAGE_TYPE_EVENT:
+               return "EVENT";
+       case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+               return "PACKET_BEGINNING";
+       case BT_MESSAGE_TYPE_PACKET_END:
+               return "PACKET_END";
+       case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+               return "DISCARDED_EVENTS";
+       case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+               return "DISCARDED_PACKETS";
+       case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
+               return "MESSAGE_ITERATOR_INACTIVITY";
+       }
+
+       bt_common_abort();
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/lib/assert-cond.h b/src/lib/assert-cond.h
index e89ee9226bfa215d5c9673fbbe217156fad27ed8..2c89d8926734761e089057b16ac185fa7198dbf9 100644 (file)
--- a/src/lib/assert-cond.h
+++ b/src/lib/assert-cond.h
@@ -817,14 +817,14 @@
                _BT_ASSERT_PRE_MSG_HAS_TYPE_ID(_msg_id, _type_id),      \
                _BT_ASSERT_PRE_MSG_HAS_TYPE_COND((_msg), (_type)),      \
                _BT_ASSERT_PRE_MSG_HAS_TYPE_FMT,                        \
-               bt_message_type_string(_type), (_msg))
+               bt_common_message_type_string(_type), (_msg))
 
 #define BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(_msg_id, _msg, _type_id, _type) \
        BT_ASSERT_PRE_DEV(                                              \
                _BT_ASSERT_PRE_MSG_HAS_TYPE_ID(_msg_id, _type_id),      \
                _BT_ASSERT_PRE_MSG_HAS_TYPE_COND((_msg), (_type)),      \
                _BT_ASSERT_PRE_MSG_HAS_TYPE_FMT,                        \
-               bt_message_type_string(_type), (_msg))
+               bt_common_message_type_string(_type), (_msg))
 
 #define _BT_ASSERT_PRE_MSG_NAME        "Message"
 #define _BT_ASSERT_PRE_MSG_ID  "message"

diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c
index b20e1abf98331b2e39a2a29447b4d5f8213ac6b3..313348c9956aa2221f4bc7e64b41465dc2307482 100644 (file)
--- a/src/lib/graph/message/discarded-items.c
+++ b/src/lib/graph/message/discarded-items.c
@@ -94,7 +94,7 @@ struct bt_message *create_discarded_items_message(
                has_support,
                "Stream class does not support discarded events or packets: "
                "type=%s, %![stream-]+s, %![sc-]+S",
-               bt_message_type_string(type), stream, stream_class);
+               bt_common_message_type_string(type), stream, stream_class);
        BT_ASSERT_PRE_FROM_FUNC(api_func, "with-default-clock-snapshots",
                need_cs ? with_cs : true,
                "Unexpected stream class configuration when creating "
@@ -102,7 +102,7 @@ struct bt_message *create_discarded_items_message(
                "default clock snapshots are needed, but none was provided: "
                "type=%s, %![stream-]+s, %![sc-]+S, with-cs=%d, "
                "cs-begin-val=%" PRIu64 ", cs-end-val=%" PRIu64,
-               bt_message_type_string(type), stream, stream_class,
+               bt_common_message_type_string(type), stream, stream_class,
                with_cs, beginning_raw_value, end_raw_value);
        BT_ASSERT_PRE_FROM_FUNC(api_func, "without-default-clock-snapshots",
                !need_cs ? !with_cs : true,
@@ -111,12 +111,12 @@ struct bt_message *create_discarded_items_message(
                "no default clock snapshots are needed, but two were provided: "
                "type=%s, %![stream-]+s, %![sc-]+S, with-cs=%d, "
                "cs-begin-val=%" PRIu64 ", cs-end-val=%" PRIu64,
-               bt_message_type_string(type), stream, stream_class,
+               bt_common_message_type_string(type), stream, stream_class,
                with_cs, beginning_raw_value, end_raw_value);
        BT_LIB_LOGD("Creating discarded items message object: "
                "type=%s, %![stream-]+s, %![sc-]+S, with-cs=%d, "
                "cs-begin-val=%" PRIu64 ", cs-end-val=%" PRIu64,
-               bt_message_type_string(type), stream, stream_class,
+               bt_common_message_type_string(type), stream, stream_class,
                with_cs, beginning_raw_value, end_raw_value);
        message = g_new0(struct bt_message_discarded_items, 1);
        if (!message) {

diff --git a/src/lib/graph/message/message.h b/src/lib/graph/message/message.h
index 8e87a76522a266f6a3ec9f60a89b91e0b6fbaa28..791ac9aeb08815bda876ea0e8f319cb4157a93d5 100644 (file)
--- a/src/lib/graph/message/message.h
+++ b/src/lib/graph/message/message.h
@@ -95,29 +95,4 @@ void bt_message_unlink_graph(struct bt_message *msg);
 # define bt_message_freeze(_x)
 #endif /* BT_DEV_MODE */
 
-static inline
-const char *bt_message_type_string(enum bt_message_type type)
-{
-       switch (type) {
-       case BT_MESSAGE_TYPE_STREAM_BEGINNING:
-               return "STREAM_BEGINNING";
-       case BT_MESSAGE_TYPE_STREAM_END:
-               return "STREAM_END";
-       case BT_MESSAGE_TYPE_EVENT:
-               return "EVENT";
-       case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-               return "PACKET_BEGINNING";
-       case BT_MESSAGE_TYPE_PACKET_END:
-               return "PACKET_END";
-       case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
-               return "DISCARDED_EVENTS";
-       case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
-               return "DISCARDED_PACKETS";
-       case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
-               return "MESSAGE_ITERATOR_INACTIVITY";
-       }
-
-       bt_common_abort();
-}
-
 #endif /* BABELTRACE_GRAPH_MESSAGE_MESSAGE_INTERNAL_H */

diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c
index cd88d25baceb14f40a363f808896ac5cdc8a00fe..a3723e4ac8f485179284d0ed7c857d7604f66850 100644 (file)
--- a/src/lib/graph/message/stream.c
+++ b/src/lib/graph/message/stream.c
@@ -62,7 +62,7 @@ struct bt_message *create_stream_message(
        BT_ASSERT(stream_class);
        BT_LIB_LOGD("Creating stream message object: "
                "type=%s, %![stream-]+s, %![sc-]+S",
-               bt_message_type_string(type), stream, stream_class);
+               bt_common_message_type_string(type), stream, stream_class);
        message = g_new0(struct bt_message_stream, 1);
        if (!message) {
                BT_LIB_LOGE_APPEND_CAUSE(

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 8766e4463ef2058f2d30ee1339a7d3a5f9a672d6..df73244b22e969978054b679d7330c97357d1f6e 100644 (file)
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -932,7 +932,7 @@ static inline void format_message(char **buf_ch, bool extended,
        char tmp_prefix[TMP_PREFIX_LEN];
 
        BUF_APPEND(", %stype=%s",
-               PRFIELD(bt_message_type_string(msg->type)));
+               PRFIELD(bt_common_message_type_string(msg->type)));
 
        if (!extended) {
                return;