X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-thread.c;h=7fb18a782bd2969d3415a2774880c14a60bfaca4;hp=76d6ef99da84d31c77f89ef02de72d18931940f6;hb=40bbd087934edf0be7c21165786aad3fabb7e7b5;hpb=d0b96690836f4b876096f3dc14801f8e25281a77 diff --git a/src/bin/lttng-sessiond/ust-thread.c b/src/bin/lttng-sessiond/ust-thread.c index 76d6ef99d..7fb18a782 100644 --- a/src/bin/lttng-sessiond/ust-thread.c +++ b/src/bin/lttng-sessiond/ust-thread.c @@ -14,7 +14,8 @@ * this program; if not, write to the Free Software Foundation, Inc., 51 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE + +#define _LGPL_SOURCE #include #include @@ -23,13 +24,16 @@ #include "fd-limit.h" #include "lttng-sessiond.h" #include "ust-thread.h" +#include "health-sessiond.h" +#include "testpoint.h" /* * This thread manage application notify communication. */ void *ust_thread_manage_notify(void *data) { - int i, ret, pollfd; + int i, ret, pollfd, err = -1; + ssize_t size_ret; uint32_t revents, nb_fd; struct lttng_poll_event events; @@ -38,24 +42,39 @@ void *ust_thread_manage_notify(void *data) rcu_register_thread(); rcu_thread_online(); + health_register(health_sessiond, + HEALTH_SESSIOND_TYPE_APP_MANAGE_NOTIFY); + + if (testpoint(sessiond_thread_app_manage_notify)) { + goto error_testpoint; + } + + health_code_update(); + ret = sessiond_set_thread_pollset(&events, 2); if (ret < 0) { goto error_poll_create; } /* Add notify pipe to the pollset. */ - ret = lttng_poll_add(&events, apps_cmd_notify_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(&events, apps_cmd_notify_pipe[0], + LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP); if (ret < 0) { goto error; } + health_code_update(); + while (1) { - DBG3("[ust-thread] Manage notify polling on %d fds", - LTTNG_POLL_GETNB(&events)); + DBG3("[ust-thread] Manage notify polling"); /* Inifinite blocking call, waiting for transmission */ restart: + health_poll_entry(); ret = lttng_poll_wait(&events, -1); + DBG3("[ust-thread] Manage notify return from poll on %d fds", + LTTNG_POLL_GETNB(&events)); + health_poll_exit(); if (ret < 0) { /* * Restart interrupted system call. @@ -69,13 +88,21 @@ restart: nb_fd = ret; for (i = 0; i < nb_fd; i++) { + health_code_update(); + /* Fetch once the poll data */ revents = LTTNG_POLL_GETEV(&events, i); pollfd = LTTNG_POLL_GETFD(&events, i); + if (!revents) { + /* No activity for this FD (poll implementation). */ + continue; + } + /* Thread quit pipe has been closed. Killing thread. */ ret = sessiond_check_thread_quit_pipe(pollfd, revents); if (ret) { + err = 0; goto exit; } @@ -83,74 +110,69 @@ restart: if (pollfd == apps_cmd_notify_pipe[0]) { int sock; - if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { - ERR("Apps notify command pipe error"); - goto error; - } else if (!(revents & LPOLLIN)) { - /* No POLLIN and not a catched error, stop the thread. */ - ERR("Notify command pipe failed. revent: %u", revents); - goto error; - } - - do { + if (revents & LPOLLIN) { /* Get socket from dispatch thread. */ - ret = read(apps_cmd_notify_pipe[0], &sock, sizeof(sock)); - } while (ret < 0 && errno == EINTR); - if (ret < 0 || ret < sizeof(sock)) { - PERROR("read apps notify pipe"); - goto error; - } + size_ret = lttng_read(apps_cmd_notify_pipe[0], + &sock, sizeof(sock)); + if (size_ret < sizeof(sock)) { + PERROR("read apps notify pipe"); + goto error; + } + health_code_update(); - ret = lttng_poll_add(&events, sock, - LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP); - if (ret < 0) { - /* - * It's possible we've reached the max poll fd allowed. - * Let's close the socket but continue normal execution. - */ - ret = close(sock); - if (ret) { - PERROR("close notify socket %d", sock); + ret = lttng_poll_add(&events, sock, + LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP); + if (ret < 0) { + /* + * It's possible we've reached the max poll fd allowed. + * Let's close the socket but continue normal execution. + */ + ret = close(sock); + if (ret) { + PERROR("close notify socket %d", sock); + } + lttng_fd_put(LTTNG_FD_APPS, 1); + continue; } - lttng_fd_put(LTTNG_FD_APPS, 1); - continue; + DBG3("UST thread notify added sock %d to pollset", sock); + } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + ERR("Apps notify command pipe error"); + goto error; + } else { + ERR("Unexpected poll events %u for sock %d", revents, pollfd); + goto error; } - DBG3("UST thread notify added sock %d to pollset", sock); } else { /* * At this point, we know that a registered application * triggered the event. */ - if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { - /* Removing from the poll set */ - ret = lttng_poll_del(&events, pollfd); - if (ret < 0) { - goto error; - } - - ret = close(pollfd); - if (ret < 0) { - PERROR("close sock %d", pollfd); - } - lttng_fd_put(LTTNG_FD_APPS, 1); - } else if (revents & (LPOLLIN | LPOLLPRI)) { + if (revents & (LPOLLIN | LPOLLPRI)) { ret = ust_app_recv_notify(pollfd); if (ret < 0) { + /* Removing from the poll set */ ret = lttng_poll_del(&events, pollfd); if (ret < 0) { goto error; } - ret = close(pollfd); - if (ret < 0) { - PERROR("close sock %d", pollfd); - } - lttng_fd_put(LTTNG_FD_APPS, 1); + /* The socket is closed after a grace period here. */ + ust_app_notify_sock_unregister(pollfd); } + } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + /* Removing from the poll set */ + ret = lttng_poll_del(&events, pollfd); + if (ret < 0) { + goto error; + } + + /* The socket is closed after a grace period here. */ + ust_app_notify_sock_unregister(pollfd); } else { - ERR("Unknown poll events %u for sock %d", revents, pollfd); - continue; + ERR("Unexpected poll events %u for sock %d", revents, pollfd); + goto error; } + health_code_update(); } } } @@ -159,9 +181,15 @@ exit: error: lttng_poll_clean(&events); error_poll_create: +error_testpoint: utils_close_pipe(apps_cmd_notify_pipe); apps_cmd_notify_pipe[0] = apps_cmd_notify_pipe[1] = -1; DBG("Application notify communication apps thread cleanup complete"); + if (err) { + health_error(); + ERR("Health error occurred in %s", __func__); + } + health_unregister(health_sessiond); rcu_thread_offline(); rcu_unregister_thread(); return NULL;