return ret;
}
-/*
- * Write to writable pipe used to notify a thread.
- */
-static
-int notify_thread_pipe(int wpipe)
-{
- ssize_t ret;
-
- ret = lttng_write(wpipe, "!", 1);
- if (ret < 1) {
- PERROR("write poll pipe");
- }
-
- return (int) ret;
-}
-
-/*
- * Stop all threads by closing the thread quit pipe.
- */
-static
-int stop_threads(void)
+int relayd_live_stop(void)
{
- int ret, retval = 0;
-
- /* Stopping all threads */
- DBG("Terminating all live threads");
- ret = notify_thread_pipe(thread_quit_pipe[1]);
- if (ret < 0) {
- ERR("write error on thread quit pipe");
- retval = -1;
- }
-
- /* Dispatch thread */
+ /* Stop dispatch thread */
CMM_STORE_SHARED(live_dispatch_thread_exit, 1);
futex_nto1_wake(&viewer_conn_queue.futex);
- return retval;
+ return 0;
}
/*
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
if (ret) {
}
health_unregister(health_relayd);
DBG("Live viewer listener thread cleanup complete");
- if (stop_threads()) {
- ERR("Error stopping live threads");
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
}
return NULL;
}
}
health_unregister(health_relayd);
DBG("Live viewer dispatch thread dying");
- if (stop_threads()) {
- ERR("Error stopping live threads");
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
}
return NULL;
}
health_code_update();
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
if (ret) {
ERR("Health error occurred in %s", __func__);
}
health_unregister(health_relayd);
- if (stop_threads()) {
- ERR("Error stopping live threads");
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
}
rcu_unregister_thread();
return NULL;
return utils_create_pipe_cloexec(live_conn_pipe);
}
-int relayd_live_stop(void)
-{
- return stop_threads();
-}
-
int relayd_live_join(void)
{
int ret, retval = 0;
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,