projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: leak of sessiond configuration on launch of run-as worker
[lttng-tools.git]
/
src
/
bin
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index fef03c6f64c44060637934ceb5e873198ed70b80..ddd07a14279eb3e88bc93b5497e8989a08cb2b3a 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-252,7
+252,7
@@
static int parse_args(int argc, char **argv)
lttng_opt_quiet = 1;
break;
case 'v':
lttng_opt_quiet = 1;
break;
case 'v':
- lttng_opt_verbose =
1
;
+ lttng_opt_verbose =
3
;
break;
case 'V':
fprintf(stdout, "%s\n", VERSION);
break;
case 'V':
fprintf(stdout, "%s\n", VERSION);
@@
-411,7
+411,7
@@
int main(int argc, char **argv)
set_ulimit();
}
set_ulimit();
}
- if (run_as_create_worker(argv[0]) < 0) {
+ if (run_as_create_worker(argv[0]
, NULL, NULL
) < 0) {
goto exit_init_data;
}
goto exit_init_data;
}
@@
-576,14
+576,6
@@
int main(int argc, char **argv)
PERROR("pthread_join sessiond_thread");
retval = -1;
}
PERROR("pthread_join sessiond_thread");
retval = -1;
}
-
- ret = consumer_timer_thread_get_channel_monitor_pipe();
- if (ret >= 0) {
- ret = close(ret);
- if (ret) {
- PERROR("close channel monitor pipe");
- }
- }
exit_sessiond_thread:
ret = pthread_join(data_thread, &status);
exit_sessiond_thread:
ret = pthread_join(data_thread, &status);
@@
-650,6
+642,13
@@
exit_init_data:
PERROR("pthread_join metadata_timer_thread");
retval = -1;
}
PERROR("pthread_join metadata_timer_thread");
retval = -1;
}
+ ret = consumer_timer_thread_get_channel_monitor_pipe();
+ if (ret >= 0) {
+ ret = close(ret);
+ if (ret) {
+ PERROR("close channel monitor pipe");
+ }
+ }
metadata_timer_thread_online = false;
}
tmp_ctx = ctx;
metadata_timer_thread_online = false;
}
tmp_ctx = ctx;
This page took
0.025499 seconds
and
5
git commands to generate.