projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Insert V4L2 instrumentation module on session start
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 2f90b3b30fcd132ce4e9c6597b33dffbed1b03d2..052e32e0c32ec2fb8bfe2a17e71afa0487ebf868 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-2233,9
+2233,12
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
*/
if (opt_verbose_consumer) {
verbosity = "--verbose";
*/
if (opt_verbose_consumer) {
verbosity = "--verbose";
- } else {
+ } else
if (lttng_opt_quiet)
{
verbosity = "--quiet";
verbosity = "--quiet";
+ } else {
+ verbosity = "";
}
}
+
switch (consumer_data->type) {
case LTTNG_CONSUMER_KERNEL:
/*
switch (consumer_data->type) {
case LTTNG_CONSUMER_KERNEL:
/*
@@
-3161,7
+3164,9
@@
skip_domain:
struct lttng_event *events;
ssize_t nb_events;
struct lttng_event *events;
ssize_t nb_events;
+ session_lock_list();
nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events);
nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events);
+ session_unlock_list();
if (nb_events < 0) {
/* Return value is a negative lttng_error_code. */
ret = -nb_events;
if (nb_events < 0) {
/* Return value is a negative lttng_error_code. */
ret = -nb_events;
@@
-3192,8
+3197,10
@@
skip_domain:
struct lttng_event_field *fields;
ssize_t nb_fields;
struct lttng_event_field *fields;
ssize_t nb_fields;
+ session_lock_list();
nb_fields = cmd_list_tracepoint_fields(cmd_ctx->lsm->domain.type,
&fields);
nb_fields = cmd_list_tracepoint_fields(cmd_ctx->lsm->domain.type,
&fields);
+ session_unlock_list();
if (nb_fields < 0) {
/* Return value is a negative lttng_error_code. */
ret = -nb_fields;
if (nb_fields < 0) {
/* Return value is a negative lttng_error_code. */
ret = -nb_fields;
This page took
0.023882 seconds
and
4
git commands to generate.