X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-channel.cpp;h=f4c8f226e09f104b33b7142a16d1b59fe8878425;hb=HEAD;hp=3cf58e0889082acce22b8d3f09ba00b807b215f3;hpb=cd9adb8b829564212158943a0d279bb35322ab30;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp index 3cf58e088..f4c8f226e 100644 --- a/src/bin/lttng-sessiond/ust-registry-channel.cpp +++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp @@ -388,14 +388,14 @@ void lsu::registry_channel::add_event(int session_objd, * external party, don't assert and simply validate values. */ if (session_objd < 0) { - LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format( + LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format( "Invalid session object descriptor provided by application: session descriptor = {}, app = {}", session_objd, app)); } if (channel_objd < 0) { - LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format( + LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format( "Invalid channel object descriptor provided by application: channel descriptor = {}, app = {}", channel_objd, app)); @@ -403,7 +403,7 @@ void lsu::registry_channel::add_event(int session_objd, /* Check if we've reached the maximum possible id. */ if (is_max_event_id(_next_event_id)) { - LTTNG_THROW_ERROR(fmt::format( + LTTNG_THROW_ERROR(lttng::format( "Failed to allocate new event id (id would overflow): app = {}", app)); } @@ -418,7 +418,7 @@ void lsu::registry_channel::add_event(int session_objd, loglevel_value, std::move(model_emf_uri))); - DBG3("%s", fmt::format("UST registry creating event: event = {}", *event).c_str()); + DBG3("%s", lttng::format("UST registry creating event: event = {}", *event).c_str()); /* * This is an add unique with a custom match function for event. The node @@ -439,7 +439,7 @@ void lsu::registry_channel::add_event(int session_objd, nptr, <tng::sessiond::ust::registry_event::_node); event_id = existing_event->id; } else { - LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format( + LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format( "UST registry create event add unique failed for event: event = {}", *event)); } @@ -447,7 +447,7 @@ void lsu::registry_channel::add_event(int session_objd, const auto& event_ref = *event; /* Ownership transferred to _events hash table. */ - event.release(); + (void) event.release(); /* Request next event id if the node was successfully added. */ event_id = event_ref.id;