summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
fd20dac)
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.
Fixes #747
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
}
/* Set up max poll set size */
}
/* 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) {
if (*command_sock_path == '\0') {
switch (opt_type) {
cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);
/* Set up max poll set size */
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,
/* Setup the dispatcher thread */
ret = pthread_create(&live_dispatcher_thread, NULL,
cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail);
/* Set up max poll set size */
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();
/* Initialize communication library */
lttcomm_init();
goto exit_ht_cleanup_pipe;
}
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);
/* Create thread to clean up RCU hash tables */
ret = pthread_create(&ht_cleanup_thread, NULL,
thread_ht_cleanup, (void *) NULL);
*/
session_list_ptr = session_get_list();
*/
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. */
cmd_init();
/* Check for the application socket timeout env variable. */
retval = -1;
}
exit_ht_cleanup:
retval = -1;
}
exit_ht_cleanup:
utils_close_pipe(ht_cleanup_pipe);
exit_ht_cleanup_pipe:
utils_close_pipe(ht_cleanup_pipe);
exit_ht_cleanup_pipe: