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 the live_conn_pipe with the fd-tracker
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
live.c
diff --git
a/src/bin/lttng-relayd/live.c
b/src/bin/lttng-relayd/live.c
index d6719e724aa8b15b624aef06bc059ce254f1f5f7..55af822ce465bac38822394936483c53df69dbfd 100644
(file)
--- a/
src/bin/lttng-relayd/live.c
+++ b/
src/bin/lttng-relayd/live.c
@@
-53,6
+53,7
@@
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
+#include <common/fd-tracker/utils.h>
#include "cmd.h"
#include "live.h"
#include "cmd.h"
#include "live.h"
@@
-2084,7
+2085,7
@@
error_poll_create:
lttng_ht_destroy(viewer_connections_ht);
viewer_connections_ht_error:
/* Close relay conn pipes */
lttng_ht_destroy(viewer_connections_ht);
viewer_connections_ht_error:
/* Close relay conn pipes */
-
utils_close_pipe(
live_conn_pipe);
+
(void) fd_tracker_util_pipe_close(the_fd_tracker,
live_conn_pipe);
if (err) {
DBG("Viewer worker thread exited with error");
}
if (err) {
DBG("Viewer worker thread exited with error");
}
@@
-2108,7
+2109,8
@@
error_testpoint:
*/
static int create_conn_pipe(void)
{
*/
static int create_conn_pipe(void)
{
- return utils_create_pipe_cloexec(live_conn_pipe);
+ return fd_tracker_util_pipe_open_cloexec(the_fd_tracker,
+ "Live connection pipe", live_conn_pipe);
}
int relayd_live_join(void)
}
int relayd_live_join(void)
This page took
0.030145 seconds
and
5
git commands to generate.