projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: track worker thread's epoll fd using the fd-tracker
[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 07e7a012245d5fa0d36fd919f40d00c380070be1..c1681aafc0567ba10a372e496ef242223765eba0 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-63,6
+63,8
@@
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
+#include <common/fd-tracker/fd-tracker.h>
+#include <common/fd-tracker/utils.h>
#include "backward-compatibility-group-by.h"
#include "cmd.h"
#include "backward-compatibility-group-by.h"
#include "cmd.h"
@@
-179,6
+181,9
@@
struct health_app *health_relayd;
struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
+/* Global fd tracker. */
+struct fd_tracker *the_fd_tracker;
+
static struct option long_options[] = {
{ "control-port", 1, 0, 'C', },
{ "data-port", 1, 0, 'D', },
static struct option long_options[] = {
{ "control-port", 1, 0, 'C', },
{ "data-port", 1, 0, 'D', },
@@
-631,13
+636,9
@@
exit:
static void print_global_objects(void)
{
static void print_global_objects(void)
{
- rcu_register_thread();
-
print_viewer_streams();
print_relay_streams();
print_sessions();
print_viewer_streams();
print_relay_streams();
print_sessions();
-
- rcu_unregister_thread();
}
/*
}
/*
@@
-663,13
+664,21
@@
static void relayd_cleanup(void)
health_app_destroy(health_relayd);
}
/* Close thread quit pipes */
health_app_destroy(health_relayd);
}
/* Close thread quit pipes */
- utils_close_pipe(health_quit_pipe);
- utils_close_pipe(thread_quit_pipe);
-
+ if (health_quit_pipe[0] != -1) {
+ (void) fd_tracker_util_pipe_close(
+ the_fd_tracker, health_quit_pipe);
+ }
+ if (thread_quit_pipe[0] != -1) {
+ (void) fd_tracker_util_pipe_close(
+ the_fd_tracker, thread_quit_pipe);
+ }
if (sessiond_trace_chunk_registry) {
sessiond_trace_chunk_registry_destroy(
sessiond_trace_chunk_registry);
}
if (sessiond_trace_chunk_registry) {
sessiond_trace_chunk_registry_destroy(
sessiond_trace_chunk_registry);
}
+ if (the_fd_tracker) {
+ fd_tracker_destroy(the_fd_tracker);
+ }
uri_free(control_uri);
uri_free(data_uri);
uri_free(control_uri);
uri_free(data_uri);
@@
-678,6
+687,7
@@
static void relayd_cleanup(void)
if (tracing_group_name_override) {
free((void *) tracing_group_name);
}
if (tracing_group_name_override) {
free((void *) tracing_group_name);
}
+ fd_tracker_log(the_fd_tracker);
}
/*
}
/*
@@
-831,17
+841,26
@@
void lttng_relay_notify_ready(void)
*/
static int init_thread_quit_pipe(void)
{
*/
static int init_thread_quit_pipe(void)
{
- int ret;
-
- ret = utils_create_pipe_cloexec(thread_quit_pipe);
+ return fd_tracker_util_pipe_open_cloexec(
+ the_fd_tracker, "Quit pipe", thread_quit_pipe);
+}
- return ret;
+/*
+ * Init health quit pipe.
+ *
+ * Return -1 on error or 0 if all pipes are created.
+ */
+static int init_health_quit_pipe(void)
+{
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Health quit pipe", health_quit_pipe);
}
/*
* 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;
@@
-850,10
+869,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);
@@
-867,6
+884,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.
*
@@
-3669,7
+3694,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;
}
@@
-3938,12
+3963,13
@@
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:
/* Close relay conn pipes */
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
/* Close relay conn pipes */
- utils_close_pipe(relay_conn_pipe);
+ (void) fd_tracker_util_pipe_close(the_fd_tracker,
+ relay_conn_pipe);
if (err) {
DBG("Thread exited with error");
}
if (err) {
DBG("Thread exited with error");
}
@@
-3965,11
+3991,8
@@
error_testpoint:
*/
static int create_relay_conn_pipe(void)
{
*/
static int create_relay_conn_pipe(void)
{
- int ret;
-
- ret = utils_create_pipe_cloexec(relay_conn_pipe);
-
- return ret;
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Relayd connection pipe", relay_conn_pipe);
}
/*
}
/*
@@
-3977,6
+4000,7
@@
static int create_relay_conn_pipe(void)
*/
int main(int argc, char **argv)
{
*/
int main(int argc, char **argv)
{
+ bool thread_is_rcu_registered = false;
int ret = 0, retval = 0;
void *status;
int ret = 0, retval = 0;
void *status;
@@
-4037,23
+4061,12
@@
int main(int argc, char **argv)
/* Daemonize */
if (opt_daemon || opt_background) {
/* Daemonize */
if (opt_daemon || opt_background) {
- int i;
-
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
!opt_background);
if (ret < 0) {
retval = -1;
goto exit_options;
}
ret = lttng_daemonize(&child_ppid, &recv_child_signal,
!opt_background);
if (ret < 0) {
retval = -1;
goto exit_options;
}
-
- /*
- * We are in the child. Make sure all other file
- * descriptors are closed, in case we are called with
- * more opened file descriptors than the standard ones.
- */
- for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
- (void) close(i);
- }
}
if (opt_working_directory) {
}
if (opt_working_directory) {
@@
-4071,6
+4084,21
@@
int main(int argc, char **argv)
goto exit_options;
}
goto exit_options;
}
+ /*
+ * The RCU thread registration (and use, through the fd-tracker's
+ * creation) is done after the daemonization to allow us to not
+ * deal with liburcu's fork() management as the call RCU needs to
+ * be restored.
+ */
+ rcu_register_thread();
+ thread_is_rcu_registered = true;
+
+ the_fd_tracker = fd_tracker_create(lttng_opt_fd_cap);
+ if (!the_fd_tracker) {
+ retval = -1;
+ goto exit_options;
+ }
+
/* Initialize thread health monitoring */
health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
if (!health_relayd) {
/* Initialize thread health monitoring */
health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
if (!health_relayd) {
@@
-4119,7
+4147,7
@@
int main(int argc, char **argv)
goto exit_options;
}
goto exit_options;
}
- ret =
utils_create_pipe(health_quit_pipe
);
+ ret =
init_health_quit_pipe(
);
if (ret) {
retval = -1;
goto exit_options;
if (ret) {
retval = -1;
goto exit_options;
@@
-4225,6
+4253,10
@@
exit_options:
/* Ensure all prior call_rcu are done. */
rcu_barrier();
/* Ensure all prior call_rcu are done. */
rcu_barrier();
+ if (thread_is_rcu_registered) {
+ rcu_unregister_thread();
+ }
+
if (!retval) {
exit(EXIT_SUCCESS);
} else {
if (!retval) {
exit(EXIT_SUCCESS);
} else {
This page took
0.027225 seconds
and
4
git commands to generate.