X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fload-session-thread.c;h=a6c393c9f994a912230d46f5c7f926ee84d040f6;hb=d9f0c7c7ce520c309f8e7148ecaff9aacbe52b55;hp=38fa1f616104175c2f31fd56807764a3a36b3b37;hpb=ab38c13fcac04787654a446443d562770af9d602;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/load-session-thread.c b/src/bin/lttng-sessiond/load-session-thread.c
index 38fa1f616..a6c393c9f 100644
--- 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;
 }
 
@@ -96,12 +97,12 @@ void *thread_load_session(void *data)
 	}
 
 	/* Override existing session and autoload also. */
-	ret = config_load_session(info->path, NULL, 1, 1);
+	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;
 }