relayd: track the health thread's poll fd with fd-tracker

[lttng-tools.git] / src / bin / lttng-relayd / ctf-trace.h

diff --git a/src/bin/lttng-relayd/ctf-trace.h b/src/bin/lttng-relayd/ctf-trace.h
index d051f80837e4bcbbae88a7a12c12b6504968789a..a448b19cefa0cbc923aeea3e8e94630fed11c1d6 100644 (file)
--- a/src/bin/lttng-relayd/ctf-trace.h
+++ b/src/bin/lttng-relayd/ctf-trace.h
@@ -30,13 +30,12 @@
 #include "viewer-stream.h"
 
 struct ctf_trace {
-       /*
-        * The ctf_trace reflock nests inside the stream reflock.
-        */
-       pthread_mutex_t reflock;        /* Protects refcounting */
        struct urcu_ref ref;            /* Every stream has a ref on the trace. */
        struct relay_session *session;  /* Back ref to trace session */
 
+       /* Trace sub-folder relative to the session output path. */
+       char *path;
+
        /*
         * The ctf_trace lock nests inside the session lock.
         */
@@ -58,10 +57,16 @@ struct ctf_trace {
         */
        struct lttng_ht_node_str node;
        struct rcu_head rcu_node;       /* For call_rcu teardown. */
+
+       /*
+        * True if the metadata stream of this trace was sent the viewer in the
+        * past.
+        */
+       bool metadata_stream_sent_to_viewer;
 };
 
 struct ctf_trace *ctf_trace_get_by_path_or_create(struct relay_session *session,
-               char *path_name);
+               const char *subpath);
 bool ctf_trace_get(struct ctf_trace *trace);
 void ctf_trace_put(struct ctf_trace *trace);