projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: relayd: centralize thread stopping function
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 35725b61e6bfe16a90a971a202cedf7d40698465..1ec1eeaa4b14be22fa0a8cde2d708279a50bcf4b 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-494,46
+494,55
@@
int notify_thread_pipe(int wpipe)
ret = lttng_write(wpipe, "!", 1);
if (ret < 1) {
PERROR("write poll pipe");
ret = lttng_write(wpipe, "!", 1);
if (ret < 1) {
PERROR("write poll pipe");
+ goto end;
}
}
-
+ ret = 0;
+end:
return ret;
}
return ret;
}
-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");
+ goto end;
}
}
+ 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)
{
{
- int ret;
+ int ret
val = 0
;
/* 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");
+ retval = -1;
}
}
- 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");
+ retval = -1;
}
}
+ return retval;
}
/*
}
/*
@@
-551,11
+560,15
@@
void sighandler(int sig)
return;
case SIGINT:
DBG("SIGINT caught");
return;
case SIGINT:
DBG("SIGINT caught");
- stop_threads();
+ if (lttng_relay_stop_threads()) {
+ ERR("Error stopping threads");
+ }
break;
case SIGTERM:
DBG("SIGTERM caught");
break;
case SIGTERM:
DBG("SIGTERM caught");
- stop_threads();
+ 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);
@@
-948,7
+961,7
@@
error_sock_control:
}
health_unregister(health_relayd);
DBG("Relay listener thread cleanup complete");
}
health_unregister(health_relayd);
DBG("Relay listener thread cleanup complete");
- stop_threads();
+
lttng_relay_
stop_threads();
return NULL;
}
return NULL;
}
@@
-1024,7
+1037,7
@@
error_testpoint:
}
health_unregister(health_relayd);
DBG("Dispatch thread dying");
}
health_unregister(health_relayd);
DBG("Dispatch thread dying");
- stop_threads();
+
lttng_relay_
stop_threads();
return NULL;
}
return NULL;
}
@@
-2711,7
+2724,7
@@
error_testpoint:
}
health_unregister(health_relayd);
rcu_unregister_thread();
}
health_unregister(health_relayd);
rcu_unregister_thread();
- stop_threads();
+
lttng_relay_
stop_threads();
return NULL;
}
return NULL;
}
This page took
0.024385 seconds
and
4
git commands to generate.