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

Use them where possible, as a shortcut to
`.stream().cls().defaultClockClass()`.

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

diff --git a/src/plugins/utils/muxer/msg-iter.cpp b/src/plugins/utils/muxer/msg-iter.cpp
index 3a3addc79f90ef1d9b70dce24553a1f01ce86024..2121a0f222595687d4164226311163af024c3acd 100644 (file)
--- a/src/plugins/utils/muxer/msg-iter.cpp
+++ b/src/plugins/utils/muxer/msg-iter.cpp
@@ -401,7 +401,7 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg)
     /* 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();

diff --git a/src/plugins/utils/muxer/upstream-msg-iter.cpp b/src/plugins/utils/muxer/upstream-msg-iter.cpp
index be494992d14bf9e7c22dd6d5dbeb63d8dc7baba9..28f5be4741b92b5f04805d35787e94a248cfbd53 100644 (file)
--- a/src/plugins/utils/muxer/upstream-msg-iter.cpp
+++ b/src/plugins/utils/muxer/upstream-msg-iter.cpp
@@ -66,13 +66,13 @@ bt2::OptionalBorrowedObject<bt2::ConstClockSnapshot> msgCs(const bt2::ConstMessa
     case bt2::MessageType::MESSAGE_ITERATOR_INACTIVITY:
         return msg.asMessageIteratorInactivity().clockSnapshot();
     case bt2::MessageType::STREAM_BEGINNING:
-        if (msg.asStreamBeginning().stream().cls().defaultClockClass()) {
+        if (msg.asStreamBeginning().streamClassDefaultClockClass()) {
             return msg.asStreamBeginning().defaultClockSnapshot();
         }
 
         break;
     case bt2::MessageType::STREAM_END:
-        if (msg.asStreamEnd().stream().cls().defaultClockClass()) {
+        if (msg.asStreamEnd().streamClassDefaultClockClass()) {
             return msg.asStreamEnd().defaultClockSnapshot();
         }