projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: relayd: track worker thread's epoll fd using the fd-tracker
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 3111c4e005a049d46fdc8466e0e09c1fc60bfdf4..e1b75192caadce765ed5d108660fde62e97182c3 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-59,6
+59,7
@@
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
+#include <common/fd-tracker/utils.h>
#include <urcu/rculist.h>
#include "version.h"
#include <urcu/rculist.h>
#include "version.h"
@@
-801,7
+802,8
@@
static int init_health_quit_pipe(void)
/*
* Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
*/
/*
* Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
*/
-static int create_thread_poll_set(struct lttng_poll_event *events, int size)
+static int create_named_thread_poll_set(struct lttng_poll_event *events,
+ int size, const char *name)
{
int ret;
{
int ret;
@@
-810,10
+812,8
@@
static int create_thread_poll_set(struct lttng_poll_event *events, int size)
goto error;
}
goto error;
}
- ret = lttng_poll_create(events, size, LTTNG_CLOEXEC);
- if (ret < 0) {
- goto error;
- }
+ ret = fd_tracker_util_poll_create(the_fd_tracker,
+ name, events, 1, LTTNG_CLOEXEC);
/* Add quit pipe */
ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
/* Add quit pipe */
ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
@@
-827,6
+827,14
@@
error:
return ret;
}
return ret;
}
+/*
+ * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set.
+ */
+static int create_thread_poll_set(struct lttng_poll_event *events, int size)
+{
+ return create_named_thread_poll_set(events, size, "Unknown epoll");
+}
+
/*
* Check if the thread quit pipe was triggered.
*
/*
* Check if the thread quit pipe was triggered.
*
@@
-2944,7
+2952,7
@@
static void *relay_thread_worker(void *data)
goto relay_connections_ht_error;
}
goto relay_connections_ht_error;
}
- ret = create_
thread_poll_set(&events, 2
);
+ ret = create_
named_thread_poll_set(&events, 2, "Worker thread epoll"
);
if (ret < 0) {
goto error_poll_create;
}
if (ret < 0) {
goto error_poll_create;
}
@@
-3216,7
+3224,7
@@
error:
}
rcu_read_unlock();
}
rcu_read_unlock();
-
lttng_poll_clean(
&events);
+
(void) fd_tracker_util_poll_clean(the_fd_tracker,
&events);
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
This page took
0.028647 seconds
and
5
git commands to generate.