projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fix: lttng-destroy: string formating error when default session is unset"
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
destroy.cpp
diff --git
a/src/bin/lttng/commands/destroy.cpp
b/src/bin/lttng/commands/destroy.cpp
index 97bd1aa60efd325f2cd78d5287f9469433ef747a..5e19d4189025181682d2040d503290cc9d0172cf 100644
(file)
--- a/
src/bin/lttng/commands/destroy.cpp
+++ b/
src/bin/lttng/commands/destroy.cpp
@@
-74,7
+74,7
@@
cmd_error_code destroy_session(const lttng_session& session)
ret = lttng_stop_tracing_no_wait(session.name);
if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
ret = lttng_stop_tracing_no_wait(session.name);
if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
- LTTNG_THROW_CTL(
fmt
::format("Failed to stop session `{}`", session.name),
+ LTTNG_THROW_CTL(
lttng
::format("Failed to stop session `{}`", session.name),
static_cast<lttng_error_code>(-ret));
}
static_cast<lttng_error_code>(-ret));
}
@@
-110,7
+110,8
@@
cmd_error_code destroy_session(const lttng_session& session)
} while (ret != 0);
}
} while (ret != 0);
}
- std::unique_ptr<char, lttng::details::create_unique_class<char, lttng::free>>
+ std::unique_ptr<char,
+ lttng::memory::create_deleter_class<char, lttng::memory::free>::deleter>
stats_str;
if (!session_was_already_stopped) {
char *raw_stats_str = nullptr;
stats_str;
if (!session_was_already_stopped) {
char *raw_stats_str = nullptr;
@@
-134,7
+135,8
@@
cmd_error_code destroy_session(const lttng_session& session)
auto ctl_ret_code =
lttng_destroy_session_ext(session.name, &raw_destruction_handle);
if (ctl_ret_code != LTTNG_OK) {
auto ctl_ret_code =
lttng_destroy_session_ext(session.name, &raw_destruction_handle);
if (ctl_ret_code != LTTNG_OK) {
- LTTNG_THROW_CTL(fmt::format("Failed to destroy session `{}`", session.name),
+ LTTNG_THROW_CTL(lttng::format("Failed to destroy session `{}`",
+ session.name),
ctl_ret_code);
}
ctl_ret_code);
}
@@
-184,7
+186,8
@@
cmd_error_code destroy_session(const lttng_session& session)
}
if (ctl_ret_code != LTTNG_OK) {
}
if (ctl_ret_code != LTTNG_OK) {
- LTTNG_THROW_CTL(fmt::format("Failed to destroy session `{}`", session.name),
+ LTTNG_THROW_CTL(lttng::format("Failed to destroy session `{}`",
+ session.name),
ctl_ret_code);
}
ctl_ret_code);
}
@@
-240,7
+243,7
@@
cmd_error_code destroy_session(const lttng_session& session)
* destroy the file.
*/
const auto session_name =
* destroy the file.
*/
const auto session_name =
- lttng::make_unique_wrapper<char, lttng::free>(get_session_name_quiet());
+ lttng::make_unique_wrapper<char, lttng::
memory::
free>(get_session_name_quiet());
if (session_name && !strncmp(session.name, session_name.get(), NAME_MAX)) {
config_destroy_default();
}
if (session_name && !strncmp(session.name, session_name.get(), NAME_MAX)) {
config_destroy_default();
}
@@
-255,13
+258,13
@@
cmd_error_code destroy_session(const lttng_session& session)
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
-cmd_error_code destroy_sessions(const session_spec& spec)
+cmd_error_code destroy_sessions(const
lttng::cli::
session_spec& spec)
{
bool had_warning = false;
bool had_error = false;
bool listing_failed = false;
{
bool had_warning = false;
bool had_error = false;
bool listing_failed = false;
- const auto sessions = [&listing_failed, &spec]() -> session_list {
+ const auto sessions = [&listing_failed, &spec]() ->
lttng::cli::
session_list {
try {
return list_sessions(spec);
} catch (const lttng::ctl::error& ctl_exception) {
try {
return list_sessions(spec);
} catch (const lttng::ctl::error& ctl_exception) {
@@
-272,7
+275,8
@@
cmd_error_code destroy_sessions(const session_spec& spec)
}
}();
}
}();
- if (!listing_failed && sessions.size() == 0 && spec.type == session_spec::type::NAME) {
+ if (!listing_failed && sessions.size() == 0 &&
+ spec.type_ == lttng::cli::session_spec::type::NAME) {
ERR_FMT("Session `{}` not found", spec.value);
return CMD_ERROR;
}
ERR_FMT("Session `{}` not found", spec.value);
return CMD_ERROR;
}
@@
-289,7
+293,7
@@
cmd_error_code destroy_sessions(const session_spec& spec)
} catch (const lttng::ctl::error& ctl_exception) {
switch (ctl_exception.code()) {
case LTTNG_ERR_NO_SESSION:
} catch (const lttng::ctl::error& ctl_exception) {
switch (ctl_exception.code()) {
case LTTNG_ERR_NO_SESSION:
- if (spec.type
!=
session_spec::type::NAME) {
+ if (spec.type
_ != lttng::cli::
session_spec::type::NAME) {
/* Session destroyed during command, ignore and carry-on. */
sub_ret = CMD_SUCCESS;
break;
/* Session destroyed during command, ignore and carry-on. */
sub_ret = CMD_SUCCESS;
break;
@@
-335,11
+339,8
@@
int cmd_destroy(int argc, const char **argv)
bool success;
static poptContext pc;
const char *leftover = nullptr;
bool success;
static poptContext pc;
const char *leftover = nullptr;
- struct session_spec spec = {
- .type = session_spec::NAME,
- .value = nullptr,
- };
- session_list const sessions;
+ lttng::cli::session_spec spec(lttng::cli::session_spec::type::NAME);
+ lttng::cli::session_list const sessions;
pc = poptGetContext(nullptr, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
pc = poptGetContext(nullptr, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
@@
-358,10
+359,10
@@
int cmd_destroy(int argc, const char **argv)
list_cmd_options(stdout, long_options);
goto end;
case OPT_ALL:
list_cmd_options(stdout, long_options);
goto end;
case OPT_ALL:
- spec.type
= session_spec
::ALL;
+ spec.type
_ = lttng::cli::session_spec::type
::ALL;
break;
case OPT_ENABLE_GLOB:
break;
case OPT_ENABLE_GLOB:
- spec.type
= session_spec
::GLOB_PATTERN;
+ spec.type
_ = lttng::cli::session_spec::type
::GLOB_PATTERN;
break;
default:
command_ret = CMD_UNDEFINED;
break;
default:
command_ret = CMD_UNDEFINED;
This page took
0.069605 seconds
and
4
git commands to generate.