flt.utils.muxer: use `streamClassDefaultClockClass()` methods

[babeltrace.git] / src / plugins / utils / muxer / msg-iter.cpp

diff --git a/src/plugins/utils/muxer/msg-iter.cpp b/src/plugins/utils/muxer/msg-iter.cpp
index 526be00726fd42edc72ddca20b4d0ea029c45608..2121a0f222595687d4164226311163af024c3acd 100644 (file)
--- a/src/plugins/utils/muxer/msg-iter.cpp
+++ b/src/plugins/utils/muxer/msg-iter.cpp
@@ -12,6 +12,7 @@
 
 #include "common/common.h"
 #include "cpp-common/bt2c/call.hpp"
+#include "cpp-common/bt2c/fmt.hpp"
 #include "cpp-common/bt2s/make-unique.hpp"
 #include "cpp-common/vendor/fmt/format.h"
 
@@ -239,11 +240,6 @@ void MsgIter::_seekBeginning()
 
 namespace {
 
-const char *msgTypeStr(const bt2::ConstMessage msg) noexcept
-{
-    return bt_common_message_type_string(static_cast<bt_message_type>(msg.type()));
-}
-
 std::string optLogStr(const char * const str) noexcept
 {
     return str ? fmt::format("\"{}\"", str) : "(none)";
@@ -400,12 +396,12 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg)
         return;
     }
 
-    BT_CPPLOGD("Validating the clock class of a message: msg-type={}", msgTypeStr(msg));
+    BT_CPPLOGD("Validating the clock class of a message: msg-type={}", msg.type());
 
     /* Get the clock class, if any, of `msg` */
     const auto clkCls = bt2c::call([msg]() -> bt2::OptionalBorrowedObject<bt2::ConstClockClass> {
         if (msg.isStreamBeginning()) {
-            return msg.asStreamBeginning().stream().cls().defaultClockClass();
+            return msg.asStreamBeginning().streamClassDefaultClockClass();
         } else {
             BT_ASSERT(msg.isMessageIteratorInactivity());
             return msg.asMessageIteratorInactivity().clockSnapshot().clockClass();
@@ -440,8 +436,8 @@ bool MsgIter::_HeapComparator::operator()(
         BT_CPPLOGT("Comparing two messages: "
                    "port-name-a={}, msg-a-type={}, msg-a-ts={}, "
                    "port-name-b={}, msg-b-type={}, msg-b-ts={}",
-                   upstreamMsgIterA->portName(), msgTypeStr(msgA), optMsgTsStr(msgTsA),
-                   upstreamMsgIterB->portName(), msgTypeStr(msgB), optMsgTsStr(msgTsB));
+                   upstreamMsgIterA->portName(), msgA.type(), optMsgTsStr(msgTsA),
+                   upstreamMsgIterB->portName(), msgB.type(), optMsgTsStr(msgTsB));
     }
 
     /*