From bcf4a440f6c79c6546d9fe6a609c49fe6e8dc082 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 5 Feb 2014 12:18:04 -0500 Subject: [PATCH] Fix: merge issue with thread quit pipe Signed-off-by: David Goulet --- src/bin/lttng-relayd/live.c | 12 ++++++------ src/bin/lttng-relayd/lttng-relayd.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c index 887066f14..445f432e4 100644 --- a/src/bin/lttng-relayd/live.c +++ b/src/bin/lttng-relayd/live.c @@ -350,7 +350,7 @@ void stop_threads(void) /* Stopping all threads */ DBG("Terminating all live threads"); - ret = notify_thread_pipe(live_conn_pipe[1]); + ret = notify_thread_pipe(thread_quit_pipe[1]); if (ret < 0) { ERR("write error on thread quit pipe"); } @@ -379,7 +379,7 @@ int create_thread_poll_set(struct lttng_poll_event *events, int size) } /* Add quit pipe */ - ret = lttng_poll_add(events, live_conn_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR); if (ret < 0) { goto error; } @@ -396,9 +396,9 @@ error: * Return 1 if it was triggered else 0; */ static -int check_live_conn_pipe(int fd, uint32_t events) +int check_thread_quit_pipe(int fd, uint32_t events) { - if (fd == live_conn_pipe[0] && (events & LPOLLIN)) { + if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) { return 1; } @@ -515,7 +515,7 @@ restart: pollfd = LTTNG_POLL_GETFD(&events, i); /* Thread quit pipe has been closed. Killing thread. */ - ret = check_live_conn_pipe(pollfd, revents); + ret = check_thread_quit_pipe(pollfd, revents); if (ret) { err = 0; goto exit; @@ -1854,7 +1854,7 @@ restart: health_code_update(); /* Thread quit pipe has been closed. Killing thread. */ - ret = check_live_conn_pipe(pollfd, revents); + ret = check_thread_quit_pipe(pollfd, revents); if (ret) { err = 0; goto exit; diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h index fa9d2ca74..55ce25ea6 100644 --- a/src/bin/lttng-relayd/lttng-relayd.h +++ b/src/bin/lttng-relayd/lttng-relayd.h @@ -54,6 +54,8 @@ extern const char *tracing_group_name; extern const char * const config_section_name; +extern int thread_quit_pipe[2]; + void lttng_relay_notify_ready(void); #endif /* LTTNG_RELAYD_H */ -- 2.34.1