Separate session info from channel info in notification thread

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread.c

diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c
index b580faa2682e1fa7a3a632fc095d93af3ef41b5d..62d47ee54182cfc3da2a27d3dbf4ba37638a67f4 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread.c
+++ b/src/bin/lttng-sessiond/notification-thread.c
@@ -54,17 +54,12 @@ void notification_thread_handle_destroy(
                goto end;
        }
 
                goto end;
        }
 

-       if (handle->cmd_queue.event_fd < 0) {
-               goto end;
-       }
-       ret = close(handle->cmd_queue.event_fd);
-       if (ret < 0) {
-               PERROR("close notification command queue event_fd");
-       }
-

        assert(cds_list_empty(&handle->cmd_queue.list));
        pthread_mutex_destroy(&handle->cmd_queue.lock);
 
        assert(cds_list_empty(&handle->cmd_queue.list));
        pthread_mutex_destroy(&handle->cmd_queue.lock);
 

+       if (handle->cmd_queue.event_pipe) {
+               lttng_pipe_destroy(handle->cmd_queue.event_pipe);
+       }

        if (handle->channel_monitoring_pipes.ust32_consumer >= 0) {
                ret = close(handle->channel_monitoring_pipes.ust32_consumer);
                if (ret) {
        if (handle->channel_monitoring_pipes.ust32_consumer >= 0) {
                ret = close(handle->channel_monitoring_pipes.ust32_consumer);
                if (ret) {


@@ -94,18 +89,22 @@ struct notification_thread_handle *notification_thread_handle_create(
 {
        int ret;
        struct notification_thread_handle *handle;
 {
        int ret;
        struct notification_thread_handle *handle;

+       struct lttng_pipe *event_pipe = NULL;

 
        handle = zmalloc(sizeof(*handle));
        if (!handle) {
                goto end;
        }
 
 
        handle = zmalloc(sizeof(*handle));
        if (!handle) {
                goto end;
        }
 

-       /* FIXME Replace eventfd by a pipe to support older kernels. */
-       handle->cmd_queue.event_fd = eventfd(0, EFD_CLOEXEC | EFD_SEMAPHORE);
-       if (handle->cmd_queue.event_fd < 0) {
-               PERROR("eventfd notification command queue");
+       event_pipe = lttng_pipe_open(FD_CLOEXEC);
+       if (!event_pipe) {
+               ERR("event_pipe creation");

                goto error;
        }
                goto error;
        }

+
+       handle->cmd_queue.event_pipe = event_pipe;
+       event_pipe = NULL;
+

        CDS_INIT_LIST_HEAD(&handle->cmd_queue.list);
        ret = pthread_mutex_init(&handle->cmd_queue.lock, NULL);
        if (ret) {
        CDS_INIT_LIST_HEAD(&handle->cmd_queue.list);
        ret = pthread_mutex_init(&handle->cmd_queue.lock, NULL);
        if (ret) {


@@ -145,6 +144,7 @@ struct notification_thread_handle *notification_thread_handle_create(
 end:
        return handle;
 error:
 end:
        return handle;
 error:

+       lttng_pipe_destroy(event_pipe);

        notification_thread_handle_destroy(handle);
        return NULL;
 }
        notification_thread_handle_destroy(handle);
        return NULL;
 }


@@ -236,7 +236,7 @@ int notification_channel_socket_create(void)
 
        if (getuid() == 0) {
                ret = chown(sock_path, 0,
 
        if (getuid() == 0) {
                ret = chown(sock_path, 0,

-                               utils_get_group_id(tracing_group_name));
+                               utils_get_group_id(config.tracing_group_name.value));

                if (ret) {
                        ERR("Failed to set the notification channel socket's group");
                        ret = -1;
                if (ret) {
                        ERR("Failed to set the notification channel socket's group");
                        ret = -1;


@@ -282,7 +282,7 @@ int init_poll_set(struct lttng_poll_event *poll_set,
                ERR("[notification-thread] Failed to add notification channel socket to pollset");
                goto error;
        }
                ERR("[notification-thread] Failed to add notification channel socket to pollset");
                goto error;
        }

-       ret = lttng_poll_add(poll_set, handle->cmd_queue.event_fd,
+       ret = lttng_poll_add(poll_set, lttng_pipe_get_readfd(handle->cmd_queue.event_pipe),

                        LPOLLIN | LPOLLERR);
        if (ret < 0) {
                ERR("[notification-thread] Failed to add notification command queue event fd to pollset");
                        LPOLLIN | LPOLLERR);
        if (ret < 0) {
                ERR("[notification-thread] Failed to add notification command queue event fd to pollset");


@@ -350,11 +350,13 @@ void fini_thread_state(struct notification_thread_state *state)
                assert(!ret);
        }
        if (state->channels_ht) {
                assert(!ret);
        }
        if (state->channels_ht) {

-               ret = cds_lfht_destroy(state->channels_ht,
-                               NULL);
+               ret = cds_lfht_destroy(state->channels_ht, NULL);
+               assert(!ret);
+       }
+       if (state->sessions_ht) {
+               ret = cds_lfht_destroy(state->sessions_ht, NULL);

                assert(!ret);
        }
                assert(!ret);
        }

-

        if (state->notification_channel_socket >= 0) {
                notification_channel_socket_destroy(
                                state->notification_channel_socket);
        if (state->notification_channel_socket >= 0) {
                notification_channel_socket_destroy(
                                state->notification_channel_socket);


@@ -420,7 +422,11 @@ int init_thread_state(struct notification_thread_handle *handle,
        if (!state->channels_ht) {
                goto error;
        }
        if (!state->channels_ht) {
                goto error;
        }

-
+       state->sessions_ht = cds_lfht_new(DEFAULT_HT_SIZE,
+                       1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
+       if (!state->sessions_ht) {
+               goto error;
+       }

        state->triggers_ht = cds_lfht_new(DEFAULT_HT_SIZE,
                        1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
        if (!state->triggers_ht) {
        state->triggers_ht = cds_lfht_new(DEFAULT_HT_SIZE,
                        1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
        if (!state->triggers_ht) {


@@ -544,7 +550,7 @@ void *thread_notification(void *data)
                                        ERR("[notification-thread] Unexpected poll events %u for notification socket %i", revents, fd);
                                        goto error;
                                }
                                        ERR("[notification-thread] Unexpected poll events %u for notification socket %i", revents, fd);
                                        goto error;
                                }

-                       } else if (fd == handle->cmd_queue.event_fd) {
+                       } else if (fd == lttng_pipe_get_readfd(handle->cmd_queue.event_pipe)) {

                                ret = handle_notification_thread_command(handle,
                                                &state);
                                if (ret < 0) {
                                ret = handle_notification_thread_command(handle,
                                                &state);
                                if (ret < 0) {