X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread.c;h=c15e356ada4187f7e044897a3d0a23ae0d48791c;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=5801682962e9add2c57d83c30a8fad3a210201e6;hpb=38eb8a68a2817b040e31c577a9e3a81b52897816;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c index 580168296..c15e356ad 100644 --- a/src/bin/lttng-sessiond/notification-thread.c +++ b/src/bin/lttng-sessiond/notification-thread.c @@ -50,7 +50,7 @@ void notification_thread_handle_destroy( goto end; } - assert(cds_list_empty(&handle->cmd_queue.list)); + LTTNG_ASSERT(cds_list_empty(&handle->cmd_queue.list)); pthread_mutex_destroy(&handle->cmd_queue.lock); sem_destroy(&handle->ready); @@ -196,7 +196,7 @@ void notification_channel_socket_destroy(int fd) int ret; char *sock_path = get_notification_channel_sock_path(); - DBG("[notification-thread] Destroying notification channel socket"); + DBG("Destroying notification channel socket"); if (sock_path) { ret = unlink(sock_path); @@ -218,12 +218,12 @@ int notification_channel_socket_create(void) int fd = -1, ret; char *sock_path = get_notification_channel_sock_path(); - DBG("[notification-thread] Creating notification channel UNIX socket at %s", + DBG("Creating notification channel UNIX socket at %s", sock_path); ret = lttcomm_create_unix_sock(sock_path); if (ret < 0) { - ERR("[notification-thread] Failed to create notification socket"); + ERR("Failed to create notification socket"); goto error; } fd = ret; @@ -238,8 +238,8 @@ int notification_channel_socket_create(void) if (getuid() == 0) { gid_t gid; - ret = utils_get_group_id(config.tracing_group_name.value, true, - &gid); + ret = utils_get_group_id(the_config.tracing_group_name.value, + true, &gid); if (ret) { /* Default to root group. */ gid = 0; @@ -253,7 +253,7 @@ int notification_channel_socket_create(void) } } - DBG("[notification-thread] Notification channel UNIX socket created (fd = %i)", + DBG("Notification channel UNIX socket created (fd = %i)", fd); free(sock_path); return fd; @@ -288,27 +288,27 @@ int init_poll_set(struct lttng_poll_event *poll_set, ret = lttng_poll_add(poll_set, notification_channel_socket, LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP); if (ret < 0) { - ERR("[notification-thread] Failed to add notification channel socket to pollset"); + ERR("Failed to add notification channel socket to pollset"); goto error; } 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"); + ERR("Failed to add notification command queue event fd to pollset"); goto error; } ret = lttng_poll_add(poll_set, handle->channel_monitoring_pipes.ust32_consumer, LPOLLIN | LPOLLERR); if (ret < 0) { - ERR("[notification-thread] Failed to add ust-32 channel monitoring pipe fd to pollset"); + ERR("Failed to add ust-32 channel monitoring pipe fd to pollset"); goto error; } ret = lttng_poll_add(poll_set, handle->channel_monitoring_pipes.ust64_consumer, LPOLLIN | LPOLLERR); if (ret < 0) { - ERR("[notification-thread] Failed to add ust-64 channel monitoring pipe fd to pollset"); + ERR("Failed to add ust-64 channel monitoring pipe fd to pollset"); goto error; } if (handle->channel_monitoring_pipes.kernel_consumer < 0) { @@ -318,7 +318,7 @@ int init_poll_set(struct lttng_poll_event *poll_set, handle->channel_monitoring_pipes.kernel_consumer, LPOLLIN | LPOLLERR); if (ret < 0) { - ERR("[notification-thread] Failed to add kernel channel monitoring pipe fd to pollset"); + ERR("Failed to add kernel channel monitoring pipe fd to pollset"); goto error; } end: @@ -335,48 +335,48 @@ void fini_thread_state(struct notification_thread_state *state) if (state->client_socket_ht) { ret = handle_notification_thread_client_disconnect_all(state); - assert(!ret); + LTTNG_ASSERT(!ret); ret = cds_lfht_destroy(state->client_socket_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->client_id_ht) { ret = cds_lfht_destroy(state->client_id_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->triggers_ht) { ret = handle_notification_thread_trigger_unregister_all(state); - assert(!ret); + LTTNG_ASSERT(!ret); ret = cds_lfht_destroy(state->triggers_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->channel_triggers_ht) { ret = cds_lfht_destroy(state->channel_triggers_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->channel_state_ht) { ret = cds_lfht_destroy(state->channel_state_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->notification_trigger_clients_ht) { ret = cds_lfht_destroy(state->notification_trigger_clients_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->channels_ht) { ret = cds_lfht_destroy(state->channels_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->sessions_ht) { ret = cds_lfht_destroy(state->sessions_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->triggers_by_name_uid_ht) { ret = cds_lfht_destroy(state->triggers_by_name_uid_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->trigger_tokens_ht) { ret = cds_lfht_destroy(state->trigger_tokens_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } /* * Must be destroyed after all channels have been destroyed. @@ -384,14 +384,14 @@ void fini_thread_state(struct notification_thread_state *state) */ if (state->session_triggers_ht) { ret = cds_lfht_destroy(state->session_triggers_ht, NULL); - assert(!ret); + LTTNG_ASSERT(!ret); } if (state->notification_channel_socket >= 0) { notification_channel_socket_destroy( state->notification_channel_socket); } - assert(cds_list_empty(&state->tracer_event_sources_list)); + LTTNG_ASSERT(cds_list_empty(&state->tracer_event_sources_list)); if (state->executor) { action_executor_destroy(state->executor); @@ -437,10 +437,10 @@ int init_thread_state(struct notification_thread_handle *handle, goto end; } - DBG("[notification-thread] Listening on notification channel socket"); + DBG("Listening on notification channel socket"); ret = lttcomm_listen_unix_sock(state->notification_channel_socket); if (ret < 0) { - ERR("[notification-thread] Listen failed on notification channel socket"); + ERR("Listen failed on notification channel socket"); goto error; } @@ -544,7 +544,7 @@ int handle_channel_monitoring_pipe(int fd, uint32_t revents, if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { ret = lttng_poll_del(&state->events, fd); if (ret) { - ERR("[notification-thread] Failed to remove consumer monitoring pipe from poll set"); + ERR("Failed to remove consumer monitoring pipe from poll set"); } goto end; } @@ -552,7 +552,7 @@ int handle_channel_monitoring_pipe(int fd, uint32_t revents, ret = handle_notification_thread_channel_sample( state, fd, domain); if (ret) { - ERR("[notification-thread] Consumer sample handling error occurred"); + ERR("Consumer sample handling error occurred"); ret = -1; goto end; } @@ -568,10 +568,10 @@ static int handle_event_notification_pipe(int event_source_fd, int ret = 0; if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { - ret = handle_notification_thread_remove_tracer_event_source_no_result( + ret = handle_notification_thread_tracer_event_source_died( state, event_source_fd); if (ret) { - ERR("[notification-thread] Failed to remove event notification pipe from poll set: fd = %d", + ERR("Failed to remove event notification pipe from poll set: fd = %d", event_source_fd); } goto end; @@ -591,7 +591,7 @@ static int handle_event_notification_pipe(int event_source_fd, ret = handle_notification_thread_event_notification( state, event_source_fd, domain); if (ret) { - ERR("[notification-thread] Event notification handling error occurred for fd: %d", + ERR("Event notification handling error occurred for fd: %d", event_source_fd); ret = -1; goto end; @@ -610,7 +610,7 @@ static bool fd_is_event_notification_source(const struct notification_thread_sta { struct notification_event_tracer_event_source_element *source_element; - assert(domain); + LTTNG_ASSERT(domain); cds_list_for_each_entry(source_element, &state->tracer_event_sources_list, node) { @@ -637,14 +637,14 @@ void *thread_notification(void *data) struct notification_thread_state state; enum lttng_domain_type domain; - DBG("[notification-thread] Started notification thread"); + DBG("Started notification thread"); - health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION); + health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION); rcu_register_thread(); rcu_thread_online(); if (!handle) { - ERR("[notification-thread] Invalid thread context provided"); + ERR("Invalid thread context provided"); goto end; } @@ -663,9 +663,9 @@ void *thread_notification(void *data) int fd_count, i; health_poll_entry(); - DBG("[notification-thread] Entering poll wait"); + DBG("Entering poll wait"); ret = lttng_poll_wait(&state.events, -1); - DBG("[notification-thread] Poll wait returned (%i)", ret); + DBG("Poll wait returned (%i)", ret); health_poll_exit(); if (ret < 0) { /* @@ -674,7 +674,7 @@ void *thread_notification(void *data) if (errno == EINTR) { continue; } - ERR("[notification-thread] Error encountered during lttng_poll_wait (%i)", ret); + ERR("Error encountered during lttng_poll_wait (%i)", ret); goto error; } @@ -689,7 +689,7 @@ void *thread_notification(void *data) int fd = LTTNG_POLL_GETFD(&state.events, i); uint32_t revents = LTTNG_POLL_GETEV(&state.events, i); - DBG("[notification-thread] Handling fd (%i) activity (%u)", fd, revents); + DBG("Handling fd (%i) activity (%u)", fd, revents); if (fd == state.notification_channel_socket) { if (revents & LPOLLIN) { @@ -700,17 +700,17 @@ void *thread_notification(void *data) } } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { - ERR("[notification-thread] Notification socket poll error"); + ERR("Notification socket poll error"); goto error; } else { - ERR("[notification-thread] Unexpected poll events %u for notification socket %i", revents, fd); + ERR("Unexpected poll events %u for notification socket %i", revents, fd); goto error; } } else if (fd == lttng_pipe_get_readfd(handle->cmd_queue.event_pipe)) { ret = handle_notification_thread_command(handle, &state); if (ret < 0) { - DBG("[notification-thread] Error encountered while servicing command queue"); + DBG("Error encountered while servicing command queue"); goto error; } else if (ret > 0) { goto exit; @@ -778,7 +778,7 @@ error: end: rcu_thread_offline(); rcu_unregister_thread(); - health_unregister(health_sessiond); + health_unregister(the_health_sessiond); return NULL; }