Force usage of assert() condition when NDEBUG is defined

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

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index d33a3cba8fac0d231aabd527400b83adc7645d6f..a767ccbdd90c4dc7a9d142a94136e65ec07ac180 100644 (file)
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -39,13 +39,13 @@ static void update_ust_app(int app_sock)
        struct ust_app *app;
 
        /* Consumer is in an ERROR state. Stop any application update. */
-       if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+       if (uatomic_read(&the_ust_consumerd_state) == CONSUMER_ERROR) {
                /* Stop the update process since the consumer is dead. */
                return;
        }
 
        rcu_read_lock();
-       assert(app_sock >= 0);
+       LTTNG_ASSERT(app_sock >= 0);
        app = ust_app_find_by_sock(app_sock);
        if (app == NULL) {
                /*
@@ -67,7 +67,8 @@ static void update_ust_app(int app_sock)
                        continue;
                }
                session_lock(sess);
-               if (!sess->active || !sess->ust_session) {
+               if (!sess->active || !sess->ust_session ||
+                               !sess->ust_session->active) {
                        goto unlock_session;
                }
 
@@ -93,7 +94,7 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
        struct lttng_poll_event events;
        struct ust_reg_wait_node *wait_node = NULL, *tmp_wait_node;
 
-       assert(wait_queue);
+       LTTNG_ASSERT(wait_queue);
 
        lttng_poll_init(&events);
 
@@ -109,7 +110,7 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 
        cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
                        &wait_queue->head, head) {
-               assert(wait_node->app);
+               LTTNG_ASSERT(wait_node->app);
                ret = lttng_poll_add(&events, wait_node->app->sock,
                                LPOLLHUP | LPOLLERR);
                if (ret < 0) {
@@ -235,7 +236,8 @@ static void *thread_dispatch_ust_registration(void *data)
 
        rcu_register_thread();
 
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
+       health_register(the_health_sessiond,
+                       HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
 
        if (testpoint(sessiond_thread_app_reg_dispatch)) {
                goto error_testpoint;
@@ -288,7 +290,7 @@ static void *thread_dispatch_ust_registration(void *data)
                                        ust_cmd->sock, ust_cmd->reg_msg.name,
                                        ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
 
-                       if (ust_cmd->reg_msg.type == USTCTL_SOCKET_CMD) {
+                       if (ust_cmd->reg_msg.type == LTTNG_UST_CTL_SOCKET_CMD) {
                                wait_node = zmalloc(sizeof(*wait_node));
                                if (!wait_node) {
                                        PERROR("zmalloc wait_node dispatch");
@@ -486,7 +488,7 @@ error_testpoint:
                health_error();
                ERR("Health error occurred in %s", __func__);
        }
-       health_unregister(health_sessiond);
+       health_unregister(the_health_sessiond);
        rcu_unregister_thread();
        return NULL;
 }