* 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"
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);
return 0;
error:
+ free(_data);
return -1;
}
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);
if (ret) {
ERR("Session load failed: %s", error_get_str(ret));
}