summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9414318)
Signed-off-by: David Goulet <dgoulet@efficios.com>
/* Stopping all threads */
DBG("Terminating all live threads");
/* 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");
}
if (ret < 0) {
ERR("write error on thread 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;
}
if (ret < 0) {
goto error;
}
* Return 1 if it was triggered else 0;
*/
static
* 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)) {
pollfd = LTTNG_POLL_GETFD(&events, i);
/* Thread quit pipe has been closed. Killing thread. */
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;
if (ret) {
err = 0;
goto exit;
health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
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;
if (ret) {
err = 0;
goto exit;
extern const char * const config_section_name;
extern const char * const config_section_name;
+extern int thread_quit_pipe[2];
+
void lttng_relay_notify_ready(void);
#endif /* LTTNG_RELAYD_H */
void lttng_relay_notify_ready(void);
#endif /* LTTNG_RELAYD_H */