From 8de58945ad42801d8a4906f692a5e72e8f967f46 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 1 Mar 2024 10:58:31 -0500 Subject: [PATCH] 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 Reviewed-on: https://review.lttng.org/c/babeltrace/+/11965 Reviewed-by: Philippe Proulx Tested-by: jenkins --- src/plugins/utils/muxer/msg-iter.cpp | 2 +- src/plugins/utils/muxer/upstream-msg-iter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/utils/muxer/msg-iter.cpp b/src/plugins/utils/muxer/msg-iter.cpp index 3a3addc7..2121a0f2 100644 --- 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 { 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 be494992..28f5be47 100644 --- a/src/plugins/utils/muxer/upstream-msg-iter.cpp +++ b/src/plugins/utils/muxer/upstream-msg-iter.cpp @@ -66,13 +66,13 @@ bt2::OptionalBorrowedObject 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(); } -- 2.34.1