* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <common/common.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, err = -1;
+ ssize_t size_ret;
uint32_t revents, nb_fd;
struct lttng_poll_event events;
rcu_register_thread();
rcu_thread_online();
- health_register(health_sessiond, HEALTH_TYPE_APP_MANAGE_NOTIFY);
+ health_register(health_sessiond,
+ HEALTH_SESSIOND_TYPE_APP_MANAGE_NOTIFY);
+
+ if (testpoint(sessiond_thread_app_manage_notify)) {
+ goto error_testpoint;
+ }
health_code_update();
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) {
/*
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) {
goto error;
}
- do {
- /* 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)) {
+ /* Get socket from dispatch thread. */
+ size_ret = lttng_read(apps_cmd_notify_pipe[0],
+ &sock, sizeof(sock));
+ if (size_ret < sizeof(sock)) {
PERROR("read apps notify pipe");
goto error;
}
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");