projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: mismatch of ust_app_snapshot_record prototype
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
manage-apps.c
diff --git
a/src/bin/lttng-sessiond/manage-apps.c
b/src/bin/lttng-sessiond/manage-apps.c
index 6ef0351fe8088f16b2d35cb8f0c66dca2700ea3f..356c147aaf83bb5c2b29f9667e8a83021f76aec2 100644
(file)
--- a/
src/bin/lttng-sessiond/manage-apps.c
+++ b/
src/bin/lttng-sessiond/manage-apps.c
@@
-123,11
+123,6
@@
static void *thread_application_management(void *data)
health_code_update();
health_code_update();
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
if (pollfd == quit_pipe_read_fd) {
err = 0;
goto exit;
if (pollfd == quit_pipe_read_fd) {
err = 0;
goto exit;
@@
-226,13
+221,12
@@
bool launch_application_management_thread(int apps_cmd_pipe_read_fd)
struct thread_notifiers *notifiers = NULL;
struct lttng_thread *thread;
struct thread_notifiers *notifiers = NULL;
struct lttng_thread *thread;
- quit_pipe = lttng_pipe_open(FD_CLOEXEC);
- if (!quit_pipe) {
- goto error;
- }
-
notifiers = zmalloc(sizeof(*notifiers));
if (!notifiers) {
notifiers = zmalloc(sizeof(*notifiers));
if (!notifiers) {
+ goto error_alloc;
+ }
+ quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+ if (!quit_pipe) {
goto error;
}
notifiers->quit_pipe = quit_pipe;
goto error;
}
notifiers->quit_pipe = quit_pipe;
@@
-251,5
+245,6
@@
bool launch_application_management_thread(int apps_cmd_pipe_read_fd)
return true;
error:
cleanup_application_management_thread(notifiers);
return true;
error:
cleanup_application_management_thread(notifiers);
+error_alloc:
return false;
}
return false;
}
This page took
0.035215 seconds
and
4
git commands to generate.