projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix code syntax
[lttng-tools.git]
/
lttng-sessiond
/
main.c
diff --git
a/lttng-sessiond/main.c
b/lttng-sessiond/main.c
index 227f0c2f7f41a0cac7325248d1f5072e6f07494d..27d4c04de9314d08dbdd530752b7dd457c1c684b 100644
(file)
--- a/
lttng-sessiond/main.c
+++ b/
lttng-sessiond/main.c
@@
-1580,7
+1580,7
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
}
}
DBG("Using 64-bit UST consumer at: %s", consumerd64_bin);
}
}
DBG("Using 64-bit UST consumer at: %s", consumerd64_bin);
- ret = execl(consumerd64_bin, verbosity, "-u",
+ ret = execl(consumerd64_bin,
"lttng-consumerd",
verbosity, "-u",
"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
NULL);
"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
NULL);
@@
-1624,7
+1624,7
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
}
}
DBG("Using 32-bit UST consumer at: %s", consumerd32_bin);
}
}
DBG("Using 32-bit UST consumer at: %s", consumerd32_bin);
- ret = execl(consumerd32_bin, verbosity, "-u",
+ ret = execl(consumerd32_bin,
"lttng-consumerd",
verbosity, "-u",
"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
NULL);
"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
NULL);
@@
-2772,8
+2772,11
@@
static int cmd_start_trace(struct ltt_session *session)
ksession = session->kernel_session;
usess = session->ust_session;
ksession = session->kernel_session;
usess = session->ust_session;
- if (session->enabled)
- return LTTCOMM_UST_START_FAIL;
+ if (session->enabled) {
+ ret = LTTCOMM_UST_START_FAIL;
+ goto error;
+ }
+
session->enabled = 1;
/* Kernel tracing */
session->enabled = 1;
/* Kernel tracing */
@@
-2861,8
+2864,11
@@
static int cmd_stop_trace(struct ltt_session *session)
ksession = session->kernel_session;
usess = session->ust_session;
ksession = session->kernel_session;
usess = session->ust_session;
- if (!session->enabled)
- return LTTCOMM_UST_START_FAIL;
+ if (!session->enabled) {
+ ret = LTTCOMM_UST_START_FAIL;
+ goto error;
+ }
+
session->enabled = 0;
/* Kernel tracer */
session->enabled = 0;
/* Kernel tracer */
This page took
0.040982 seconds
and
5
git commands to generate.