X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=050f18e2bc38a5fb0e65f1044c687b516b0f240a;hp=08bd27286763835b499088896d4884301a35f26f;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hpb=5e97de0089e5a91e4dd8bae5aa7e1956597c508b diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c index 08bd27286..050f18e2b 100644 --- a/src/bin/lttng-sessiond/ht-cleanup.c +++ b/src/bin/lttng-sessiond/ht-cleanup.c @@ -1,22 +1,11 @@ /* - * Copyright (C) 2013 - Mathieu Desnoyers + * Copyright (C) 2013 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE -#include #include #include @@ -27,8 +16,9 @@ #include "health-sessiond.h" #include "testpoint.h" #include "utils.h" +#include "ht-cleanup.h" -int ht_cleanup_quit_pipe[2] = { -1, -1 }; +static int ht_cleanup_quit_pipe[2] = { -1, -1 }; /* * Check if the ht_cleanup thread quit pipe was triggered. @@ -79,9 +69,9 @@ static int set_pollset(struct lttng_poll_event *events, size_t size) goto error; } - ret = lttng_poll_add(events, ht_cleanup_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(events, the_ht_cleanup_pipe[0], LPOLLIN | LPOLLERR); if (ret < 0) { - DBG("[ht-thread] lttng_poll_add error %d.", ret); + DBG("lttng_poll_add error %d.", ret); goto error; } @@ -91,6 +81,12 @@ error: return ret; } +static void cleanup_ht_cleanup_thread(void *data) +{ + utils_close_pipe(ht_cleanup_quit_pipe); + utils_close_pipe(the_ht_cleanup_pipe); +} + static void *thread_ht_cleanup(void *data) { int ret, i, pollfd, err = -1; @@ -98,15 +94,15 @@ static void *thread_ht_cleanup(void *data) uint32_t revents, nb_fd; struct lttng_poll_event events; - DBG("[ht-thread] startup."); + DBG("startup."); rcu_register_thread(); rcu_thread_online(); - health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP); + health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP); if (testpoint(sessiond_thread_ht_cleanup)) { - DBG("[ht-thread] testpoint."); + DBG("testpoint."); goto error_testpoint; } @@ -114,17 +110,18 @@ static void *thread_ht_cleanup(void *data) ret = set_pollset(&events, 2); if (ret < 0) { - DBG("[ht-thread] sessiond_set_ht_cleanup_thread_pollset error %d.", ret); + DBG("sessiond_set_ht_cleanup_thread_pollset error %d.", ret); goto error_poll_create; } health_code_update(); while (1) { - DBG3("[ht-thread] Polling."); + restart: + DBG3("Polling."); health_poll_entry(); ret = lttng_poll_wait(&events, -1); - DBG3("[ht-thread] Returning from poll on %d fds.", + DBG3("Returning from poll on %d fds.", LTTNG_POLL_GETNB(&events)); health_poll_exit(); if (ret < 0) { @@ -147,19 +144,14 @@ static void *thread_ht_cleanup(void *data) revents = LTTNG_POLL_GETEV(&events, i); pollfd = LTTNG_POLL_GETFD(&events, i); - if (!revents) { - /* No activity for this FD (poll implementation). */ - continue; - } - - if (pollfd != ht_cleanup_pipe[0]) { + if (pollfd != the_ht_cleanup_pipe[0]) { continue; } if (revents & LPOLLIN) { /* Get socket from dispatch thread. */ - size_ret = lttng_read(ht_cleanup_pipe[0], &ht, - sizeof(ht)); + size_ret = lttng_read(the_ht_cleanup_pipe[0], + &ht, sizeof(ht)); if (size_ret < sizeof(ht)) { PERROR("ht cleanup notify pipe"); goto error; @@ -174,6 +166,13 @@ static void *thread_ht_cleanup(void *data) lttng_ht_destroy(ht); health_code_update(); + + /* + * Ensure that we never process the quit pipe + * event while there is still data available + * on the ht clean pipe. + */ + goto restart; } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { ERR("ht cleanup pipe error"); goto error; @@ -195,7 +194,7 @@ static void *thread_ht_cleanup(void *data) continue; } - if (pollfd == ht_cleanup_pipe[0]) { + if (pollfd == the_ht_cleanup_pipe[0]) { continue; } @@ -219,60 +218,50 @@ error_testpoint: health_error(); ERR("Health error occurred in %s", __func__); } - health_unregister(health_sessiond); + health_unregister(the_health_sessiond); rcu_thread_offline(); rcu_unregister_thread(); return NULL; } -int init_ht_cleanup_thread(pthread_t *thread) +static bool shutdown_ht_cleanup_thread(void *data) { int ret; - ret = init_pipe(ht_cleanup_pipe); - if (ret) { - goto error; - } - - init_pipe(ht_cleanup_quit_pipe); - if (ret) { - goto error_quit_pipe; - } - - ret = pthread_create(thread, NULL, thread_ht_cleanup, NULL); - if (ret) { - errno = ret; - PERROR("pthread_create ht_cleanup"); - goto error_thread; + ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]); + if (ret < 0) { + ERR("write error on ht_cleanup quit pipe"); + goto end; } - -error: - return ret; - -error_thread: - utils_close_pipe(ht_cleanup_quit_pipe); -error_quit_pipe: - utils_close_pipe(ht_cleanup_pipe); +end: return ret; } -int fini_ht_cleanup_thread(pthread_t *thread) +struct lttng_thread *launch_ht_cleanup_thread(void) { int ret; + struct lttng_thread *thread; - ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]); - if (ret < 0) { - ERR("write error on ht_cleanup quit pipe"); - goto end; + ret = init_pipe(the_ht_cleanup_pipe); + if (ret) { + goto error; } - ret = pthread_join(*thread, NULL); + ret = init_pipe(ht_cleanup_quit_pipe); if (ret) { - errno = ret; - PERROR("pthread_join ht cleanup thread"); + goto error; } - utils_close_pipe(ht_cleanup_pipe); - utils_close_pipe(ht_cleanup_quit_pipe); -end: - return ret; + + thread = lttng_thread_create("HT cleanup", + thread_ht_cleanup, + shutdown_ht_cleanup_thread, + cleanup_ht_cleanup_thread, + NULL); + if (!thread) { + goto error; + } + return thread; +error: + cleanup_ht_cleanup_thread(NULL); + return NULL; }