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 the health quit pipe with 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 f1f03d1bd36c90c7feefb9f417d5748f8cd10c4f..80d2fb1892658d9e4c46c1bce9631aa357dedbc3 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-64,6
+64,7
@@
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
#include <common/fd-tracker/fd-tracker.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"
@@
-663,9
+664,14
@@
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);
@@
-835,11
+841,19
@@
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);
}
/*
}
/*
@@
-3947,7
+3961,8
@@
error_poll_create:
lttng_ht_destroy(relay_connections_ht);
relay_connections_ht_error:
/* Close relay conn pipes */
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");
}
@@
-3969,11
+3984,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);
}
/*
}
/*
@@
-4042,23
+4054,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) {
@@
-4139,7
+4140,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;
This page took
0.024664 seconds
and
4
git commands to generate.