projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: stop sessiond threads on health thread error
[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 a1e94dcbd67dace86d17392513917d78e290b999..ea46ec72276117359b32fa499b584357b5aeb401 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-582,9
+582,6
@@
int lttng_relay_stop_threads(void)
static void sighandler(int sig)
{
switch (sig) {
static void sighandler(int sig)
{
switch (sig) {
- case SIGPIPE:
- DBG("SIGPIPE caught");
- return;
case SIGINT:
DBG("SIGINT caught");
if (lttng_relay_stop_threads()) {
case SIGINT:
DBG("SIGINT caught");
if (lttng_relay_stop_threads()) {
@@
-620,9
+617,10
@@
static int set_signal_handler(void)
return ret;
}
return ret;
}
- sa.sa_handler = sighandler;
sa.sa_mask = sigset;
sa.sa_flags = 0;
sa.sa_mask = sigset;
sa.sa_flags = 0;
+
+ sa.sa_handler = sighandler;
if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
@@
-633,12
+631,13
@@
static int set_signal_handler(void)
return ret;
}
return ret;
}
- if ((ret = sigaction(SIG
PIPE
, &sa, NULL)) < 0) {
+ if ((ret = sigaction(SIG
USR1
, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
PERROR("sigaction");
return ret;
}
- if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
+ sa.sa_handler = SIG_IGN;
+ if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
PERROR("sigaction");
return ret;
}
@@
-2778,7
+2777,6
@@
int main(int argc, char **argv)
}
}
}
}
-
/* Initialize thread health monitoring */
health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
if (!health_relayd) {
/* Initialize thread health monitoring */
health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
if (!health_relayd) {
@@
-2793,15
+2791,6
@@
int main(int argc, char **argv)
goto exit_init_data;
}
goto exit_init_data;
}
- /* Check if daemon is UID = 0 */
- if (!getuid()) {
- if (control_uri->port < 1024 || data_uri->port < 1024 || live_uri->port < 1024) {
- ERR("Need to be root to use ports < 1024");
- retval = -1;
- goto exit_init_data;
- }
- }
-
/* Setup the thread apps communication pipe. */
if (create_relay_conn_pipe()) {
retval = -1;
/* Setup the thread apps communication pipe. */
if (create_relay_conn_pipe()) {
retval = -1;
@@
-2811,12
+2800,6
@@
int main(int argc, char **argv)
/* Init relay command queue. */
cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail);
/* Init relay command queue. */
cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail);
- /* Set up max poll set size */
- if (lttng_poll_set_max_size()) {
- retval = -1;
- goto exit_init_data;
- }
-
/* Initialize communication library */
lttcomm_init();
lttcomm_inet_init();
/* Initialize communication library */
lttcomm_init();
lttcomm_inet_init();
@@
-2849,7
+2832,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage the client socket */
}
/* Create thread to manage the client socket */
- ret = pthread_create(&health_thread,
NULL
,
+ ret = pthread_create(&health_thread,
default_pthread_attr()
,
thread_manage_health, (void *) NULL);
if (ret) {
errno = ret;
thread_manage_health, (void *) NULL);
if (ret) {
errno = ret;
@@
-2859,7
+2842,7
@@
int main(int argc, char **argv)
}
/* Setup the dispatcher thread */
}
/* Setup the dispatcher thread */
- ret = pthread_create(&dispatcher_thread,
NULL
,
+ ret = pthread_create(&dispatcher_thread,
default_pthread_attr()
,
relay_thread_dispatcher, (void *) NULL);
if (ret) {
errno = ret;
relay_thread_dispatcher, (void *) NULL);
if (ret) {
errno = ret;
@@
-2869,7
+2852,7
@@
int main(int argc, char **argv)
}
/* Setup the worker thread */
}
/* Setup the worker thread */
- ret = pthread_create(&worker_thread,
NULL
,
+ ret = pthread_create(&worker_thread,
default_pthread_attr()
,
relay_thread_worker, NULL);
if (ret) {
errno = ret;
relay_thread_worker, NULL);
if (ret) {
errno = ret;
@@
-2879,7
+2862,7
@@
int main(int argc, char **argv)
}
/* Setup the listener thread */
}
/* Setup the listener thread */
- ret = pthread_create(&listener_thread,
NULL
,
+ ret = pthread_create(&listener_thread,
default_pthread_attr()
,
relay_thread_listener, (void *) NULL);
if (ret) {
errno = ret;
relay_thread_listener, (void *) NULL);
if (ret) {
errno = ret;
This page took
0.025466 seconds
and
4
git commands to generate.