X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fctf-trace.h;h=3afc00fe8bec7262b1ac078a3639c1fb4e07369f;hp=d051f80837e4bcbbae88a7a12c12b6504968789a;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=7591bab11eceedc6a0d1e02fd6f85592267a63b5

diff --git a/src/bin/lttng-relayd/ctf-trace.h b/src/bin/lttng-relayd/ctf-trace.h
index d051f8083..3afc00fe8 100644
--- a/src/bin/lttng-relayd/ctf-trace.h
+++ b/src/bin/lttng-relayd/ctf-trace.h
@@ -2,22 +2,12 @@
 #define _CTF_TRACE_H
 
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <inttypes.h>
@@ -30,13 +20,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 +47,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);