projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement $PATH binary searching function for userspace-probe
[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 38fa1f616104175c2f31fd56807764a3a36b3b37..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.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _
GNU
_SOURCE
+#define _
LGPL
_SOURCE
#include <common/error.h>
#include <common/error.h>
-#include <common/config/config.h>
+#include <common/config/
session-
config.h>
#include "load-session-thread.h"
#include "lttng-sessiond.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;
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);
assert(data);
@@
-75,6
+75,7
@@
int load_session_init_data(struct load_session_thread_data **data)
return 0;
error:
return 0;
error:
+ free(_data);
return -1;
}
return -1;
}
@@
-96,12
+97,12
@@
void *thread_load_session(void *data)
}
/* Override existing session and autoload also. */
}
/* 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:
if (ret) {
ERR("Session load failed: %s", error_get_str(ret));
}
end:
- sessiond_
notify_ready
();
+ sessiond_
signal_parents
();
return NULL;
}
return NULL;
}
This page took
0.024945 seconds
and
4
git commands to generate.