Clean-up: sessiond: prepend `the_` to global variable names

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

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index 8de175d11d50383ee07994fc49feeb563f77683b..c670baf49d78b951888a7e220cf6bfb646f32840 100644 (file)
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -70,7 +70,7 @@ static int set_pollset(struct lttng_poll_event *events, size_t size)
                goto error;
        }
 
                goto error;
        }
 

-       ret = lttng_poll_add(events, ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
+       ret = lttng_poll_add(events, the_ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);

        if (ret < 0) {
                DBG("[ht-thread] lttng_poll_add error %d.", ret);
                goto error;
        if (ret < 0) {
                DBG("[ht-thread] lttng_poll_add error %d.", ret);
                goto error;


@@ -85,7 +85,7 @@ error:
 static void cleanup_ht_cleanup_thread(void *data)
 {
        utils_close_pipe(ht_cleanup_quit_pipe);
 static void cleanup_ht_cleanup_thread(void *data)
 {
        utils_close_pipe(ht_cleanup_quit_pipe);

-       utils_close_pipe(ht_cleanup_pipe);
+       utils_close_pipe(the_ht_cleanup_pipe);

 }
 
 static void *thread_ht_cleanup(void *data)
 }
 
 static void *thread_ht_cleanup(void *data)


@@ -100,7 +100,7 @@ static void *thread_ht_cleanup(void *data)
        rcu_register_thread();
        rcu_thread_online();
 
        rcu_register_thread();
        rcu_thread_online();
 

-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
+       health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);

 
        if (testpoint(sessiond_thread_ht_cleanup)) {
                DBG("[ht-thread] testpoint.");
 
        if (testpoint(sessiond_thread_ht_cleanup)) {
                DBG("[ht-thread] testpoint.");


@@ -145,14 +145,14 @@ static void *thread_ht_cleanup(void *data)
                        revents = LTTNG_POLL_GETEV(&events, i);
                        pollfd = LTTNG_POLL_GETFD(&events, i);
 
                        revents = LTTNG_POLL_GETEV(&events, i);
                        pollfd = LTTNG_POLL_GETFD(&events, i);
 

-                       if (pollfd != ht_cleanup_pipe[0]) {
+                       if (pollfd != the_ht_cleanup_pipe[0]) {

                                continue;
                        }
 
                        if (revents & LPOLLIN) {
                                /* Get socket from dispatch thread. */
                                continue;
                        }
 
                        if (revents & LPOLLIN) {
                                /* Get socket from dispatch thread. */

-                               size_ret = lttng_read(ht_cleanup_pipe[0], &ht,
-                                               sizeof(ht));
+                               size_ret = lttng_read(the_ht_cleanup_pipe[0],
+                                               &ht, sizeof(ht));

                                if (size_ret < sizeof(ht)) {
                                        PERROR("ht cleanup notify pipe");
                                        goto error;
                                if (size_ret < sizeof(ht)) {
                                        PERROR("ht cleanup notify pipe");
                                        goto error;


@@ -195,7 +195,7 @@ static void *thread_ht_cleanup(void *data)
                                continue;
                        }
 
                                continue;
                        }
 

-                       if (pollfd == ht_cleanup_pipe[0]) {
+                       if (pollfd == the_ht_cleanup_pipe[0]) {

                                continue;
                        }
 
                                continue;
                        }
 


@@ -219,7 +219,7 @@ error_testpoint:
                health_error();
                ERR("Health error occurred in %s", __func__);
        }
                health_error();
                ERR("Health error occurred in %s", __func__);
        }

-       health_unregister(health_sessiond);
+       health_unregister(the_health_sessiond);

        rcu_thread_offline();
        rcu_unregister_thread();
        return NULL;
        rcu_thread_offline();
        rcu_unregister_thread();
        return NULL;


@@ -243,7 +243,7 @@ struct lttng_thread *launch_ht_cleanup_thread(void)
        int ret;
        struct lttng_thread *thread;
 
        int ret;
        struct lttng_thread *thread;
 

-       ret = init_pipe(ht_cleanup_pipe);
+       ret = init_pipe(the_ht_cleanup_pipe);

        if (ret) {
                goto error;
        }
        if (ret) {
                goto error;
        }