Fix: missing test for lttng_ust_comm_should_quit in lttng-ust-comm.c

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 98483cb80d1c47010f54e9f94cc45f4ba3f6114d..5875693164229fe73d1db9f734c2c9a26356eb36 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -884,6 +884,10 @@ restart:
                case 0: /* orderly shutdown */
                        DBG("%s lttng-sessiond has performed an orderly shutdown", sock_info->name);
                        ust_lock();
+                       if (lttng_ust_comm_should_quit) {
+                               ust_unlock();
+                               goto quit;
+                       }
                        /*
                         * Either sessiond has shutdown or refused us by closing the socket.
                         * In either case, we don't want to delay construction execution,
@@ -921,6 +925,10 @@ restart:
        }
 end:
        ust_lock();
+       if (lttng_ust_comm_should_quit) {
+               ust_unlock();
+               goto quit;
+       }
        /* Cleanup socket handles before trying to reconnect */
        lttng_ust_objd_table_owner_cleanup(sock_info);
        ust_unlock();