Don't use `bt2::` when already inside the `bt2` namespace.
Change-Id: I63444e141ae13b6e508d4508488fb562ae9403d7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12047
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
- void next(bt2::ConstMessageArray& messages)
+ void next(ConstMessageArray& messages)
{
/* Any saved error? Now is the time to throw */
if (G_UNLIKELY(_mExcToThrowType != _ExcToThrowType::NONE)) {
{
/* Any saved error? Now is the time to throw */
if (G_UNLIKELY(_mExcToThrowType != _ExcToThrowType::NONE)) {
/* Throw the corresponding exception */
if (_mExcToThrowType == _ExcToThrowType::ERROR) {
/* Throw the corresponding exception */
if (_mExcToThrowType == _ExcToThrowType::ERROR) {
} else {
BT_ASSERT(_mExcToThrowType == _ExcToThrowType::MEM_ERROR);
} else {
BT_ASSERT(_mExcToThrowType == _ExcToThrowType::MEM_ERROR);
- throw bt2::MemoryError {};
/* We're done: everything below is exception handling */
return;
/* We're done: everything below is exception handling */
return;
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
if (messages.isEmpty()) {
throw;
}
if (messages.isEmpty()) {
throw;
}
}
_mExcToThrowType = _ExcToThrowType::MEM_ERROR;
}
_mExcToThrowType = _ExcToThrowType::MEM_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
if (messages.isEmpty()) {
throw;
}
if (messages.isEmpty()) {
throw;
}
static UserMsgIterT&
userMsgIterFromLibSelfMsgIterPtr(bt_self_message_iterator * const libSelfMsgIterPtr) noexcept
{
static UserMsgIterT&
userMsgIterFromLibSelfMsgIterPtr(bt_self_message_iterator * const libSelfMsgIterPtr) noexcept
{
- return bt2::wrap(libSelfMsgIterPtr).data<UserMsgIterT>();
+ return wrap(libSelfMsgIterPtr).data<UserMsgIterT>();
}
static bt_message_iterator_class_initialize_method_status
}
static bt_message_iterator_class_initialize_method_status
bt_self_message_iterator_configuration * const libSelfMsgIterConfigPtr,
bt_self_component_port_output * const libSelfCompPortPtr) noexcept
{
bt_self_message_iterator_configuration * const libSelfMsgIterConfigPtr,
bt_self_component_port_output * const libSelfCompPortPtr) noexcept
{
- const auto selfMsgIter = bt2::wrap(libSelfMsgIterPtr);
+ const auto selfMsgIter = wrap(libSelfMsgIterPtr);
- const auto msgIter = new UserMsgIterT {selfMsgIter, bt2::wrap(libSelfMsgIterConfigPtr),
- bt2::wrap(libSelfCompPortPtr)};
+ const auto msgIter = new UserMsgIterT {selfMsgIter, wrap(libSelfMsgIterConfigPtr),
+ wrap(libSelfCompPortPtr)};
selfMsgIter.data(*msgIter);
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
selfMsgIter.data(*msgIter);
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
const uint64_t capacity, uint64_t * const count) noexcept
{
try {
const uint64_t capacity, uint64_t * const count) noexcept
{
try {
- auto msgArray = bt2::ConstMessageArray::wrapEmpty(libMsgsPtr, capacity);
+ auto msgArray = ConstMessageArray::wrapEmpty(libMsgsPtr, capacity);
auto& msgIter = userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr);
msgIter.next(msgArray);
auto& msgIter = userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr);
msgIter.next(msgArray);
} else {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END;
}
} else {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END;
}
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_MEMORY_ERROR;
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
try {
*canSeek = static_cast<bt_bool>(
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).canSeekBeginning());
try {
*canSeek = static_cast<bt_bool>(
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).canSeekBeginning());
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_MEMORY_ERROR;
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
{
try {
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).seekBeginning();
{
try {
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).seekBeginning();
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_MEMORY_ERROR;
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
try {
*canSeek = static_cast<bt_bool>(userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr)
.canSeekNsFromOrigin(nsFromOrigin));
try {
*canSeek = static_cast<bt_bool>(userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr)
.canSeekNsFromOrigin(nsFromOrigin));
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_MEMORY_ERROR;
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
{
try {
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).seekNsFromOrigin(nsFromOrigin);
{
try {
userMsgIterFromLibSelfMsgIterPtr(libSelfMsgIterPtr).seekNsFromOrigin(nsFromOrigin);
- } catch (const bt2::TryAgain&) {
+ } catch (const TryAgain&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_MEMORY_ERROR;
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_MEMORY_ERROR;
- } catch (const bt2::Error&) {
+ } catch (const Error&) {
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
return BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_ERROR;
} catch (...) {
BT_LOG_WRITE_CUR_LVL(
- bt2::LoggingLevel loggingLevel() const noexcept
+ LoggingLevel loggingLevel() const noexcept
- return static_cast<bt2::LoggingLevel>(bt_query_executor_get_logging_level(
+ return static_cast<LoggingLevel>(bt_query_executor_get_logging_level(
bt_private_query_executor_as_query_executor_const(this->libObjPtr())));
}
bt_private_query_executor_as_query_executor_const(this->libObjPtr())));
}
- bt2::TraceClass::Shared createTraceClass() const
+ TraceClass::Shared createTraceClass() const
{
const auto libObjPtr = bt_trace_class_create(this->libObjPtr());
{
const auto libObjPtr = bt_trace_class_create(this->libObjPtr());
- return bt2::TraceClass::Shared::createWithoutRef(libObjPtr);
+ return TraceClass::Shared::createWithoutRef(libObjPtr);
- bt2::ClockClass::Shared createClockClass() const
+ ClockClass::Shared createClockClass() const
{
const auto libObjPtr = bt_clock_class_create(this->libObjPtr());
{
const auto libObjPtr = bt_clock_class_create(this->libObjPtr());
- return bt2::ClockClass::Shared::createWithoutRef(libObjPtr);
+ return ClockClass::Shared::createWithoutRef(libObjPtr);
- bt2::StreamBeginningMessage::Shared
- createStreamBeginningMessage(const bt2::ConstStream stream) const
+ StreamBeginningMessage::Shared createStreamBeginningMessage(const ConstStream stream) const
{
const auto libObjPtr =
bt_message_stream_beginning_create(this->libObjPtr(), stream.libObjPtr());
{
const auto libObjPtr =
bt_message_stream_beginning_create(this->libObjPtr(), stream.libObjPtr());
- return bt2::StreamBeginningMessage::Shared::createWithoutRef(libObjPtr);
+ return StreamBeginningMessage::Shared::createWithoutRef(libObjPtr);
- bt2::StreamEndMessage::Shared createStreamEndMessage(const bt2::ConstStream stream) const
+ StreamEndMessage::Shared createStreamEndMessage(const ConstStream stream) const
{
const auto libObjPtr = bt_message_stream_end_create(this->libObjPtr(), stream.libObjPtr());
{
const auto libObjPtr = bt_message_stream_end_create(this->libObjPtr(), stream.libObjPtr());
- return bt2::StreamEndMessage::Shared::createWithoutRef(libObjPtr);
+ return StreamEndMessage::Shared::createWithoutRef(libObjPtr);
- bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
- const bt2::ConstStream stream) const
+ EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+ const ConstStream stream) const
{
const auto libObjPtr =
bt_message_event_create(this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr());
{
const auto libObjPtr =
bt_message_event_create(this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr());
- return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+ return EventMessage::Shared::createWithoutRef(libObjPtr);
- bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
- const bt2::ConstStream stream,
- const std::uint64_t clockSnapshotValue) const
+ EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+ const ConstStream stream,
+ const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_event_create_with_default_clock_snapshot(
this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr(), clockSnapshotValue);
{
const auto libObjPtr = bt_message_event_create_with_default_clock_snapshot(
this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr(), clockSnapshotValue);
- return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+ return EventMessage::Shared::createWithoutRef(libObjPtr);
- bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
- const bt2::ConstPacket packet) const
+ EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+ const ConstPacket packet) const
{
const auto libObjPtr = bt_message_event_create_with_packet(
this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr());
{
const auto libObjPtr = bt_message_event_create_with_packet(
this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr());
- return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+ return EventMessage::Shared::createWithoutRef(libObjPtr);
- bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
- const bt2::ConstPacket packet,
- const std::uint64_t clockSnapshotValue) const
+ EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+ const ConstPacket packet,
+ const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_event_create_with_packet_and_default_clock_snapshot(
this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
{
const auto libObjPtr = bt_message_event_create_with_packet_and_default_clock_snapshot(
this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
- return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+ return EventMessage::Shared::createWithoutRef(libObjPtr);
- bt2::PacketBeginningMessage::Shared
- createPacketBeginningMessage(const bt2::ConstPacket packet) const
+ PacketBeginningMessage::Shared createPacketBeginningMessage(const ConstPacket packet) const
{
const auto libObjPtr =
bt_message_packet_beginning_create(this->libObjPtr(), packet.libObjPtr());
{
const auto libObjPtr =
bt_message_packet_beginning_create(this->libObjPtr(), packet.libObjPtr());
- return bt2::PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
+ return PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
- bt2::PacketBeginningMessage::Shared
- createPacketBeginningMessage(const bt2::ConstPacket packet,
+ PacketBeginningMessage::Shared
+ createPacketBeginningMessage(const ConstPacket packet,
const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_packet_beginning_create_with_default_clock_snapshot(
const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_packet_beginning_create_with_default_clock_snapshot(
- return bt2::PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
+ return PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
- bt2::PacketEndMessage::Shared createPacketEndMessage(const bt2::ConstPacket packet) const
+ PacketEndMessage::Shared createPacketEndMessage(const ConstPacket packet) const
{
const auto libObjPtr = bt_message_packet_end_create(this->libObjPtr(), packet.libObjPtr());
{
const auto libObjPtr = bt_message_packet_end_create(this->libObjPtr(), packet.libObjPtr());
- return bt2::PacketEndMessage::Shared::createWithoutRef(libObjPtr);
+ return PacketEndMessage::Shared::createWithoutRef(libObjPtr);
- bt2::PacketEndMessage::Shared
- createPacketEndMessage(const bt2::ConstPacket packet,
- const std::uint64_t clockSnapshotValue) const
+ PacketEndMessage::Shared createPacketEndMessage(const ConstPacket packet,
+ const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_packet_end_create_with_default_clock_snapshot(
this->libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
{
const auto libObjPtr = bt_message_packet_end_create_with_default_clock_snapshot(
this->libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
- return bt2::PacketEndMessage::Shared::createWithoutRef(libObjPtr);
+ return PacketEndMessage::Shared::createWithoutRef(libObjPtr);
- bt2::DiscardedEventsMessage::Shared createDiscardedEventsMessage(const bt2::ConstStream stream)
+ DiscardedEventsMessage::Shared createDiscardedEventsMessage(const ConstStream stream)
{
const auto libObjPtr =
bt_message_discarded_events_create(this->libObjPtr(), stream.libObjPtr());
{
const auto libObjPtr =
bt_message_discarded_events_create(this->libObjPtr(), stream.libObjPtr());
- return bt2::DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
+ return DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
- bt2::DiscardedEventsMessage::Shared
- createDiscardedEventsMessage(const bt2::ConstStream stream,
+ DiscardedEventsMessage::Shared
+ createDiscardedEventsMessage(const ConstStream stream,
const std::uint64_t beginningClockSnapshotValue,
const std::uint64_t endClockSnapshotValue) const
{
const std::uint64_t beginningClockSnapshotValue,
const std::uint64_t endClockSnapshotValue) const
{
- return bt2::DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
+ return DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
- bt2::DiscardedPacketsMessage::Shared
- createDiscardedPacketsMessage(const bt2::ConstStream stream) const
+ DiscardedPacketsMessage::Shared createDiscardedPacketsMessage(const ConstStream stream) const
{
const auto libObjPtr =
bt_message_discarded_packets_create(this->libObjPtr(), stream.libObjPtr());
{
const auto libObjPtr =
bt_message_discarded_packets_create(this->libObjPtr(), stream.libObjPtr());
- return bt2::DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
+ return DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
- bt2::DiscardedPacketsMessage::Shared
- createDiscardedPacketsMessage(const bt2::ConstStream stream,
+ DiscardedPacketsMessage::Shared
+ createDiscardedPacketsMessage(const ConstStream stream,
const std::uint64_t beginningClockSnapshotValue,
const std::uint64_t endClockSnapshotValue) const
{
const std::uint64_t beginningClockSnapshotValue,
const std::uint64_t endClockSnapshotValue) const
{
- return bt2::DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
+ return DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
- bt2::MessageIteratorInactivityMessage::Shared
- createMessageIteratorInactivityMessage(const bt2::ConstClockClass clockClass,
+ MessageIteratorInactivityMessage::Shared
+ createMessageIteratorInactivityMessage(const ConstClockClass clockClass,
const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_message_iterator_inactivity_create(
const std::uint64_t clockSnapshotValue) const
{
const auto libObjPtr = bt_message_message_iterator_inactivity_create(
- return bt2::MessageIteratorInactivityMessage::Shared::createWithoutRef(libObjPtr);
+ return MessageIteratorInactivityMessage::Shared::createWithoutRef(libObjPtr);