Fix: liblttng-ust process startup hang when sessiond is stopped

[lttng-ust.git] / liblttng-ust / lttng-ust-comm.c

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index d91f4bd255a993fc1f8699a3deed4f1cf8a6dba9..ae2e518965e94e37a9743e7c022023eb880e206a 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -178,10 +178,14 @@ static const char *str_timeout;
 static int got_timeout_env;
 
 extern void lttng_ring_buffer_client_overwrite_init(void);
+extern void lttng_ring_buffer_client_overwrite_rt_init(void);
 extern void lttng_ring_buffer_client_discard_init(void);
+extern void lttng_ring_buffer_client_discard_rt_init(void);
 extern void lttng_ring_buffer_metadata_client_init(void);
 extern void lttng_ring_buffer_client_overwrite_exit(void);
+extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
+extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
 /*
@@ -439,6 +443,7 @@ int handle_message(struct sock_info *sock_info,
                                        goto error;
                                }
                                ret = len;
+                               free(bytecode);
                                goto end;
                        } else {
                                DBG("incorrect filter data message size: %zd", len);
@@ -620,6 +625,25 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 {
        int ret;
 
+       if (sock_info->root_handle != -1) {
+               ret = lttng_ust_objd_unref(sock_info->root_handle, 1);
+               if (ret) {
+                       ERR("Error unref root handle");
+               }
+               sock_info->root_handle = -1;
+       }
+       sock_info->constructor_sem_posted = 0;
+
+       /*
+        * wait_shm_mmap, socket and notify socket are used by listener
+        * threads outside of the ust lock, so we cannot tear them down
+        * ourselves, because we cannot join on these threads. Leave
+        * responsibility of cleaning up these resources to the OS
+        * process exit.
+        */
+       if (exiting)
+               return;
+
        if (sock_info->socket != -1) {
                ret = ustcomm_close_unix_sock(sock_info->socket);
                if (ret) {
@@ -634,21 +658,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
                }
                sock_info->notify_socket = -1;
        }
-       if (sock_info->root_handle != -1) {
-               ret = lttng_ust_objd_unref(sock_info->root_handle, 1);
-               if (ret) {
-                       ERR("Error unref root handle");
-               }
-               sock_info->root_handle = -1;
-       }
-       sock_info->constructor_sem_posted = 0;
-       /*
-        * wait_shm_mmap is used by listener threads outside of the
-        * ust lock, so we cannot tear it down ourselves, because we
-        * cannot join on these threads. Leave this task to the OS
-        * process exit.
-        */
-       if (!exiting && sock_info->wait_shm_mmap) {
+       if (sock_info->wait_shm_mmap) {
                ret = munmap(sock_info->wait_shm_mmap, sysconf(_SC_PAGE_SIZE));
                if (ret) {
                        ERR("Error unmapping wait shm");
@@ -905,11 +915,6 @@ restart:
                has_waited = 1;
                prev_connect_failed = 0;
        }
-       ust_lock();
-
-       if (lttng_ust_comm_should_quit) {
-               goto quit;
-       }
 
        if (sock_info->socket != -1) {
                ret = ustcomm_close_unix_sock(sock_info->socket);
@@ -934,6 +939,13 @@ restart:
                if (ret < 0) {
                        DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
                        prev_connect_failed = 1;
+
+                       ust_lock();
+
+                       if (lttng_ust_comm_should_quit) {
+                               goto quit;
+                       }
+
                        /*
                         * If we cannot find the sessiond daemon, don't delay
                         * constructor execution.
@@ -971,6 +983,12 @@ restart:
                WARN("Unsuppoorted timeout value %ld", timeout);
        }
 
+       ust_lock();
+
+       if (lttng_ust_comm_should_quit) {
+               goto quit;
+       }
+
        /*
         * Create only one root handle per listener thread for the whole
         * process lifetime, so we ensure we get ID which is statically
@@ -1116,7 +1134,10 @@ void __attribute__((constructor)) lttng_ust_init(void)
        init_tracepoint();
        lttng_ring_buffer_metadata_client_init();
        lttng_ring_buffer_client_overwrite_init();
+       lttng_ring_buffer_client_overwrite_rt_init();
        lttng_ring_buffer_client_discard_init();
+       lttng_ring_buffer_client_discard_rt_init();
+       lttng_context_init();
 
        timeout_mode = get_constructor_timeout(&constructor_timeout);
 
@@ -1219,7 +1240,10 @@ void lttng_ust_cleanup(int exiting)
         */
        lttng_ust_abi_exit();
        lttng_ust_events_exit();
+       lttng_context_exit();
+       lttng_ring_buffer_client_discard_rt_exit();
        lttng_ring_buffer_client_discard_exit();
+       lttng_ring_buffer_client_overwrite_rt_exit();
        lttng_ring_buffer_client_overwrite_exit();
        lttng_ring_buffer_metadata_client_exit();
        exit_tracepoint();