projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd outputs traces of legacy sessionds to home dir
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
register.c
diff --git
a/src/bin/lttng-sessiond/register.c
b/src/bin/lttng-sessiond/register.c
index d0a1ff14a69dc3173d89fbcf866de09fdb339816..e809834faa4632b961d19053145b39b23c0f9e9a 100644
(file)
--- a/
src/bin/lttng-sessiond/register.c
+++ b/
src/bin/lttng-sessiond/register.c
@@
-239,11
+239,6
@@
static void *thread_application_registration(void *data)
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
/* Thread quit pipe has been closed. Killing thread. */
if (pollfd == quit_pipe_read_fd) {
err = 0;
/* Thread quit pipe has been closed. Killing thread. */
if (pollfd == quit_pipe_read_fd) {
err = 0;
@@
-400,13
+395,12
@@
struct lttng_thread *launch_application_registration_thread(
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;
@@
-428,5
+422,6
@@
struct lttng_thread *launch_application_registration_thread(
return thread;
error:
cleanup_application_registration_thread(notifiers);
return thread;
error:
cleanup_application_registration_thread(notifiers);
+error_alloc:
return NULL;
}
return NULL;
}
This page took
0.024672 seconds
and
4
git commands to generate.