[lttng-dev] [PATCH lttng-tools 4/6] Fix: call lttng_poll_set_max_size before start threads
Mathieu Desnoyers
mathieu.desnoyers at efficios.com
Mon Jan 5 16:43:06 EST 2015
This changes the location of lttng_poll_set_max_size() call within
sessiond main() to call it before creating the ht_cleanup thread. This
fix is only needed on top of the main refactoring patch.
This fix also adds checks for lttng_poll_set_max_size() error values.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
---
src/bin/lttng-consumerd/lttng-consumerd.c | 5 ++++-
src/bin/lttng-relayd/live.c | 5 ++++-
src/bin/lttng-relayd/main.c | 5 ++++-
src/bin/lttng-sessiond/main.c | 10 +++++++---
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index b43e8f1..7122d06 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -346,7 +346,10 @@ int main(int argc, char **argv)
}
/* Set up max poll set size */
- lttng_poll_set_max_size();
+ if (lttng_poll_set_max_size()) {
+ retval = -1;
+ goto exit_init_data;
+ }
if (*command_sock_path == '\0') {
switch (opt_type) {
diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 756efbe..3728005 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -2102,7 +2102,10 @@ int relayd_live_create(struct lttng_uri *uri,
cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);
/* Set up max poll set size */
- lttng_poll_set_max_size();
+ if (lttng_poll_set_max_size()) {
+ retval = -1;
+ goto exit_init_data;
+ }
/* Setup the dispatcher thread */
ret = pthread_create(&live_dispatcher_thread, NULL,
diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 94bb4cb..d09b0c6 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2850,7 +2850,10 @@ int main(int argc, char **argv)
cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail);
/* Set up max poll set size */
- lttng_poll_set_max_size();
+ if (lttng_poll_set_max_size()) {
+ retval = -1;
+ goto exit_init_data;
+ }
/* Initialize communication library */
lttcomm_init();
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 2649b55..6bc7b1e 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5205,6 +5205,12 @@ int main(int argc, char **argv)
goto exit_ht_cleanup_pipe;
}
+ /* Set up max poll set size */
+ if (lttng_poll_set_max_size()) {
+ retval = -1;
+ goto exit_set_max_size;
+ }
+
/* Create thread to clean up RCU hash tables */
ret = pthread_create(&ht_cleanup_thread, NULL,
thread_ht_cleanup, (void *) NULL);
@@ -5539,9 +5545,6 @@ int main(int argc, char **argv)
*/
session_list_ptr = session_get_list();
- /* Set up max poll set size */
- lttng_poll_set_max_size();
-
cmd_init();
/* Check for the application socket timeout env variable. */
@@ -5771,6 +5774,7 @@ exit_init_data:
retval = -1;
}
exit_ht_cleanup:
+exit_set_max_size:
utils_close_pipe(ht_cleanup_pipe);
exit_ht_cleanup_pipe:
--
2.1.1
More information about the lttng-dev
mailing list