Fix: skip uid registry when metadata key is 0

[lttng-tools.git] / src / bin / lttng-sessiond / load-session-thread.c

diff --git a/src/bin/lttng-sessiond/load-session-thread.c b/src/bin/lttng-sessiond/load-session-thread.c
index 845948e7cd559363395efd82e05c283145b7e21c..a6c393c9f994a912230d46f5c7f926ee84d040f6 100644 (file)
--- a/src/bin/lttng-sessiond/load-session-thread.c
+++ b/src/bin/lttng-sessiond/load-session-thread.c
@@ -15,9 +15,9 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <common/error.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
 
 #include "load-session-thread.h"
 #include "lttng-sessiond.h"
@@ -51,7 +51,7 @@ void load_session_destroy_data(struct load_session_thread_data *data)
 int load_session_init_data(struct load_session_thread_data **data)
 {
        int ret;
-       struct load_session_thread_data *_data;
+       struct load_session_thread_data *_data = NULL;
 
        assert(data);
 
@@ -75,6 +75,7 @@ int load_session_init_data(struct load_session_thread_data **data)
        return 0;
 
 error:
+       free(_data);
        return -1;
 }
 
@@ -95,12 +96,13 @@ void *thread_load_session(void *data)
                goto end;
        }
 
-       ret = config_load_session(info->path, NULL, 0);
+       /* Override existing session and autoload also. */
+       ret = config_load_session(info->path, NULL, 1, 1, NULL);
        if (ret) {
                ERR("Session load failed: %s", error_get_str(ret));
        }
 
 end:
-       sessiond_notify_ready();
+       sessiond_signal_parents();
        return NULL;
 }