projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dot after enable-event message
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
destroy.c
diff --git
a/src/bin/lttng/commands/destroy.c
b/src/bin/lttng/commands/destroy.c
index 95343c9c9a883513dd2741e5a1cb68acb2e612a3..53fe3aca13b676c6f94e4b64c912191bfb5bfe15 100644
(file)
--- a/
src/bin/lttng/commands/destroy.c
+++ b/
src/bin/lttng/commands/destroy.c
@@
-29,6
+29,7
@@
#include <common/mi-lttng.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/mi-lttng.h>
#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/utils.h>
static char *opt_session_name;
static int opt_destroy_all;
static char *opt_session_name;
static int opt_destroy_all;
@@
-75,6
+76,7
@@
static void usage(FILE *ofp)
static int destroy_session(struct lttng_session *session)
{
int ret;
static int destroy_session(struct lttng_session *session)
{
int ret;
+ char *session_name = NULL;
ret = lttng_destroy_session(session->name);
if (ret < 0) {
ret = lttng_destroy_session(session->name);
if (ret < 0) {
@@
-90,7
+92,11
@@
static int destroy_session(struct lttng_session *session)
}
MSG("Session %s destroyed", session->name);
}
MSG("Session %s destroyed", session->name);
- config_destroy_default();
+
+ session_name = get_session_name_quiet();
+ if (session_name && !strncmp(session->name, session_name, NAME_MAX)) {
+ config_destroy_default();
+ }
if (lttng_opt_mi) {
ret = mi_lttng_session(writer, session, 0);
if (lttng_opt_mi) {
ret = mi_lttng_session(writer, session, 0);
@@
-102,6
+108,7
@@
static int destroy_session(struct lttng_session *session)
ret = CMD_SUCCESS;
error:
ret = CMD_SUCCESS;
error:
+ free(session_name);
return ret;
}
return ret;
}
@@
-213,7
+220,7
@@
int cmd_destroy(int argc, const char **argv)
} else {
opt_session_name = (char *) poptGetArg(pc);
} else {
opt_session_name = (char *) poptGetArg(pc);
- if (
opt_session_name == NULL
) {
+ if (
!opt_session_name
) {
/* No session name specified, lookup default */
session_name = get_session_name();
if (session_name == NULL) {
/* No session name specified, lookup default */
session_name = get_session_name();
if (session_name == NULL) {
This page took
0.034935 seconds
and
4
git commands to generate.