From d2ba27dd1502473c84d22acfa14e5a5c33fd194b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 21 Feb 2024 16:26:20 -0500 Subject: [PATCH] cpp-common/bt2: add message creation methods to `UserMessageIterator` These are meant to be used by sub-classes of `UserMessageIterator`. Change-Id: I4dbbd4a121218f432b322e8909b19f4a367f650b Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11847 Reviewed-by: Philippe Proulx Tested-by: jenkins --- src/cpp-common/bt2/component-class-dev.hpp | 94 ++++++++++++++++++++ src/cpp-common/bt2/self-message-iterator.hpp | 8 +- 2 files changed, 98 insertions(+), 4 deletions(-) diff --git a/src/cpp-common/bt2/component-class-dev.hpp b/src/cpp-common/bt2/component-class-dev.hpp index e08314a0..37a655c8 100644 --- a/src/cpp-common/bt2/component-class-dev.hpp +++ b/src/cpp-common/bt2/component-class-dev.hpp @@ -599,6 +599,100 @@ protected: return _mSelfMsgIter.createMessageIterator(port); } + StreamBeginningMessage::Shared _createStreamBeginningMessage(const ConstStream stream) const + { + return _mSelfMsgIter.createStreamBeginningMessage(stream); + } + + StreamEndMessage::Shared _createStreamEndMessage(const ConstStream stream) const + { + return _mSelfMsgIter.createStreamEndMessage(stream); + } + + EventMessage::Shared _createEventMessage(const ConstEventClass eventCls, + const ConstStream stream) const + { + return _mSelfMsgIter.createEventMessage(eventCls, stream); + } + + EventMessage::Shared _createEventMessage(const ConstEventClass eventCls, + const ConstStream stream, + const std::uint64_t clockSnapshotValue) const + { + return _mSelfMsgIter.createEventMessage(eventCls, stream, clockSnapshotValue); + } + + EventMessage::Shared _createEventMessage(const ConstEventClass eventCls, + const ConstPacket packet) const + { + return _mSelfMsgIter.createEventMessage(eventCls, packet); + } + + EventMessage::Shared _createEventMessage(const ConstEventClass eventCls, + const ConstPacket packet, + const std::uint64_t clockSnapshotValue) const + { + return _mSelfMsgIter.createEventMessage(eventCls, packet, clockSnapshotValue); + } + + PacketBeginningMessage::Shared _createPacketBeginningMessage(const ConstPacket packet) const + { + return _mSelfMsgIter.createPacketBeginningMessage(packet); + } + + PacketBeginningMessage::Shared + _createPacketBeginningMessage(const ConstPacket packet, + const std::uint64_t clockSnapshotValue) const + { + return _mSelfMsgIter.createPacketBeginningMessage(packet, clockSnapshotValue); + } + + PacketEndMessage::Shared _createPacketEndMessage(const ConstPacket packet) const + { + return _mSelfMsgIter.createPacketEndMessage(packet); + } + + PacketEndMessage::Shared _createPacketEndMessage(const ConstPacket packet, + const std::uint64_t clockSnapshotValue) const + { + return _mSelfMsgIter.createPacketEndMessage(packet, clockSnapshotValue); + } + + DiscardedEventsMessage::Shared _createDiscardedEventsMessage(const ConstStream stream) + { + return _mSelfMsgIter.createDiscardedEventsMessage(stream); + } + + DiscardedEventsMessage::Shared + _createDiscardedEventsMessage(const ConstStream stream, + const std::uint64_t beginningClockSnapshotValue, + const std::uint64_t endClockSnapshotValue) + { + return _mSelfMsgIter.createDiscardedEventsMessage(stream, beginningClockSnapshotValue, + endClockSnapshotValue); + } + + DiscardedPacketsMessage::Shared _createDiscardedPacketsMessage(const ConstStream stream) + { + return _mSelfMsgIter.createDiscardedPacketsMessage(stream); + } + + DiscardedPacketsMessage::Shared + _createDiscardedPacketsMessage(const ConstStream stream, + const std::uint64_t beginningClockSnapshotValue, + const std::uint64_t endClockSnapshotValue) + { + return _mSelfMsgIter.createDiscardedPacketsMessage(stream, beginningClockSnapshotValue, + endClockSnapshotValue); + } + + MessageIteratorInactivityMessage::Shared + _createMessageIteratorInactivityMessage(const ConstClockClass clockClass, + const std::uint64_t clockSnapshotValue) + { + return _mSelfMsgIter.createMessageIteratorInactivityMessage(clockClass, clockSnapshotValue); + } + UserComponentT& _component() noexcept { return _mSelfMsgIter.component().template data(); diff --git a/src/cpp-common/bt2/self-message-iterator.hpp b/src/cpp-common/bt2/self-message-iterator.hpp index e52f08e6..12ad0783 100644 --- a/src/cpp-common/bt2/self-message-iterator.hpp +++ b/src/cpp-common/bt2/self-message-iterator.hpp @@ -216,7 +216,7 @@ public: bt2::DiscardedEventsMessage::Shared createDiscardedEventsMessage(const bt2::ConstStream stream, const std::uint64_t beginningClockSnapshotValue, - const std::uint64_t endClockSnapshotValue) + const std::uint64_t endClockSnapshotValue) const { const auto libObjPtr = bt_message_discarded_events_create_with_default_clock_snapshots( this->libObjPtr(), stream.libObjPtr(), beginningClockSnapshotValue, @@ -230,7 +230,7 @@ public: } bt2::DiscardedPacketsMessage::Shared - createDiscardedPacketsMessage(const bt2::ConstStream stream) + createDiscardedPacketsMessage(const bt2::ConstStream stream) const { const auto libObjPtr = bt_message_discarded_packets_create(this->libObjPtr(), stream.libObjPtr()); @@ -245,7 +245,7 @@ public: bt2::DiscardedPacketsMessage::Shared createDiscardedPacketsMessage(const bt2::ConstStream stream, const std::uint64_t beginningClockSnapshotValue, - const std::uint64_t endClockSnapshotValue) + const std::uint64_t endClockSnapshotValue) const { const auto libObjPtr = bt_message_discarded_packets_create_with_default_clock_snapshots( this->libObjPtr(), stream.libObjPtr(), beginningClockSnapshotValue, @@ -260,7 +260,7 @@ public: bt2::MessageIteratorInactivityMessage::Shared createMessageIteratorInactivityMessage(const bt2::ConstClockClass clockClass, - const std::uint64_t clockSnapshotValue) + const std::uint64_t clockSnapshotValue) const { const auto libObjPtr = bt_message_message_iterator_inactivity_create( this->libObjPtr(), clockClass.libObjPtr(), clockSnapshotValue); -- 2.34.1