summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
77c54fe)
Rather than relying on having main.c and live.c threads both using the
same notification pipe from different stop_thread implementations,
centralize thread stop in one central function exposed to both main.c
and live.c
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-/*
- * 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);
CMM_STORE_SHARED(live_dispatch_thread_exit, 1);
futex_nto1_wake(&viewer_conn_queue.futex);
}
health_unregister(health_relayd);
DBG("Live viewer listener thread cleanup complete");
}
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");
}
health_unregister(health_relayd);
DBG("Live viewer dispatch thread dying");
}
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");
ERR("Health error occurred in %s", __func__);
}
health_unregister(health_relayd);
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;
}
rcu_unregister_thread();
return NULL;
return utils_create_pipe_cloexec(live_conn_pipe);
}
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;
int relayd_live_join(void)
{
int ret, retval = 0;
extern int thread_quit_pipe[2];
void lttng_relay_notify_ready(void);
extern int thread_quit_pipe[2];
void lttng_relay_notify_ready(void);
+int lttng_relay_stop_threads(void);
#endif /* LTTNG_RELAYD_H */
#endif /* LTTNG_RELAYD_H */
ret = lttng_write(wpipe, "!", 1);
if (ret < 1) {
PERROR("write poll pipe");
ret = lttng_write(wpipe, "!", 1);
if (ret < 1) {
PERROR("write poll pipe");
-static void notify_health_quit_pipe(int *pipe)
+static
+int notify_health_quit_pipe(int *pipe)
{
ssize_t ret;
ret = lttng_write(pipe[1], "4", 1);
if (ret < 1) {
PERROR("write relay health quit");
{
ssize_t ret;
ret = lttng_write(pipe[1], "4", 1);
if (ret < 1) {
PERROR("write relay health quit");
+ ret = 0;
+end:
+ return ret;
- * Stop all threads by closing the thread quit pipe.
+ * Stop all relayd and relayd-live threads.
-static
-void stop_threads(void)
+int lttng_relay_stop_threads(void)
/* Stopping all threads */
DBG("Terminating all threads");
/* Stopping all threads */
DBG("Terminating all threads");
- ret = notify_thread_pipe(thread_quit_pipe[1]);
- if (ret < 0) {
+ if (notify_thread_pipe(thread_quit_pipe[1])) {
ERR("write error on thread quit pipe");
ERR("write error on thread quit pipe");
- notify_health_quit_pipe(health_quit_pipe);
+ if (notify_health_quit_pipe(health_quit_pipe)) {
+ ERR("write error on health quit pipe");
+ }
/* Dispatch thread */
CMM_STORE_SHARED(dispatch_thread_exit, 1);
futex_nto1_wake(&relay_conn_queue.futex);
/* Dispatch thread */
CMM_STORE_SHARED(dispatch_thread_exit, 1);
futex_nto1_wake(&relay_conn_queue.futex);
- ret = relayd_live_stop();
- if (ret) {
+ if (relayd_live_stop()) {
ERR("Error stopping live threads");
ERR("Error stopping live threads");
return;
case SIGINT:
DBG("SIGINT caught");
return;
case SIGINT:
DBG("SIGINT caught");
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
+ }
break;
case SIGTERM:
DBG("SIGTERM caught");
break;
case SIGTERM:
DBG("SIGTERM caught");
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
+ }
break;
case SIGUSR1:
CMM_STORE_SHARED(recv_child_signal, 1);
break;
case SIGUSR1:
CMM_STORE_SHARED(recv_child_signal, 1);
}
health_unregister(health_relayd);
DBG("Relay listener thread cleanup complete");
}
health_unregister(health_relayd);
DBG("Relay listener thread cleanup complete");
+ lttng_relay_stop_threads();
}
health_unregister(health_relayd);
DBG("Dispatch thread dying");
}
health_unregister(health_relayd);
DBG("Dispatch thread dying");
+ lttng_relay_stop_threads();
}
health_unregister(health_relayd);
rcu_unregister_thread();
}
health_unregister(health_relayd);
rcu_unregister_thread();
+ lttng_relay_stop_threads();