Fix: change health poll update to entry/exit calls

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 859223a11216b1d342b0899ebdd4e66bc657d657..74f448a88d8c65f223b60b423eb177c322618db4 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -746,9 +746,9 @@ static void *thread_manage_kernel(void *data)
 
                /* Poll infinite value of time */
        restart:
 
                /* Poll infinite value of time */
        restart:

-               health_poll_update();
+               health_poll_entry();

                ret = lttng_poll_wait(&events, -1);
                ret = lttng_poll_wait(&events, -1);

-               health_poll_update();
+               health_poll_exit();

                if (ret < 0) {
                        /*
                         * Restart interrupted system call.
                if (ret < 0) {
                        /*
                         * Restart interrupted system call.


@@ -909,14 +909,14 @@ static void *thread_manage_consumer(void *data)
 
        /* Inifinite blocking call, waiting for transmission */
 restart:
 
        /* Inifinite blocking call, waiting for transmission */
 restart:

-       health_poll_update();
+       health_poll_entry();

 
        if (testpoint(thread_manage_consumer)) {
                goto error;
        }
 
        ret = lttng_poll_wait(&events, -1);
 
        if (testpoint(thread_manage_consumer)) {
                goto error;
        }
 
        ret = lttng_poll_wait(&events, -1);

-       health_poll_update();
+       health_poll_exit();

        if (ret < 0) {
                /*
                 * Restart interrupted system call.
        if (ret < 0) {
                /*
                 * Restart interrupted system call.


@@ -1008,9 +1008,9 @@ restart:
 
        /* Inifinite blocking call, waiting for transmission */
 restart_poll:
 
        /* Inifinite blocking call, waiting for transmission */
 restart_poll:

-       health_poll_update();
+       health_poll_entry();

        ret = lttng_poll_wait(&events, -1);
        ret = lttng_poll_wait(&events, -1);

-       health_poll_update();
+       health_poll_exit();

        if (ret < 0) {
                /*
                 * Restart interrupted system call.
        if (ret < 0) {
                /*
                 * Restart interrupted system call.


@@ -1150,9 +1150,9 @@ static void *thread_manage_apps(void *data)
 
                /* Inifinite blocking call, waiting for transmission */
        restart:
 
                /* Inifinite blocking call, waiting for transmission */
        restart:

-               health_poll_update();
+               health_poll_entry();

                ret = lttng_poll_wait(&events, -1);
                ret = lttng_poll_wait(&events, -1);

-               health_poll_update();
+               health_poll_exit();

                if (ret < 0) {
                        /*
                         * Restart interrupted system call.
                if (ret < 0) {
                        /*
                         * Restart interrupted system call.


@@ -1430,9 +1430,9 @@ static void *thread_registration_apps(void *data)
 
                /* Inifinite blocking call, waiting for transmission */
        restart:
 
                /* Inifinite blocking call, waiting for transmission */
        restart:

-               health_poll_update();
+               health_poll_entry();

                ret = lttng_poll_wait(&events, -1);
                ret = lttng_poll_wait(&events, -1);

-               health_poll_update();
+               health_poll_exit();

                if (ret < 0) {
                        /*
                         * Restart interrupted system call.
                if (ret < 0) {
                        /*
                         * Restart interrupted system call.


@@ -3208,9 +3208,9 @@ static void *thread_manage_clients(void *data)
 
                /* Inifinite blocking call, waiting for transmission */
        restart:
 
                /* Inifinite blocking call, waiting for transmission */
        restart:

-               health_poll_update();
+               health_poll_entry();

                ret = lttng_poll_wait(&events, -1);
                ret = lttng_poll_wait(&events, -1);

-               health_poll_update();
+               health_poll_exit();

                if (ret < 0) {
                        /*
                         * Restart interrupted system call.
                if (ret < 0) {
                        /*
                         * Restart interrupted system call.