X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fctf-trace.h;h=9903d38e874a4e86760e25ee01a7f2605cc789b8;hp=489c5f1d58ba05dd7ada2f97076ffad6c0402e29;hb=ce4d40839ac3beef1a58730d3636a522497bc60f;hpb=58eb9381cd933f0644e6a5b89750dbd6d9b14570

diff --git a/src/bin/lttng-relayd/ctf-trace.h b/src/bin/lttng-relayd/ctf-trace.h
index 489c5f1d5..9903d38e8 100644
--- a/src/bin/lttng-relayd/ctf-trace.h
+++ b/src/bin/lttng-relayd/ctf-trace.h
@@ -1,6 +1,10 @@
+#ifndef _CTF_TRACE_H
+#define _CTF_TRACE_H
+
 /*
  * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
  *                      David Goulet <dgoulet@efficios.com>
+ *               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
@@ -16,49 +20,49 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _CTF_TRACE_H
-#define _CTF_TRACE_H
-
 #include <inttypes.h>
+#include <urcu/ref.h>
 
 #include <common/hashtable/hashtable.h>
 
 #include "session.h"
 #include "stream.h"
+#include "viewer-stream.h"
 
 struct ctf_trace {
-	int refcount;
-	unsigned int invalid_flag:1;
+	struct urcu_ref ref;		/* Every stream has a ref on the trace. */
+	struct relay_session *session;	/* Back ref to trace session */
+
+	/*
+	 * The ctf_trace lock nests inside the session lock.
+	 */
+	pthread_mutex_t lock;
 	uint64_t id;
-	uint64_t metadata_received;
-	uint64_t metadata_sent;
-	struct relay_stream *metadata_stream;
-	struct relay_viewer_stream *viewer_metadata_stream;
-	/* Node indexed by stream path name in the corresponding session. */
-	struct lttng_ht_node_str node;
+	struct relay_viewer_stream *viewer_metadata_stream;	/* RCU protected */
 
-	/* Relay stream associated with this ctf trace. */
+	/*
+	 * Relay streams associated with this ctf trace.
+	 * Updates are protected by the stream_list lock.
+	 * Traversals are protected by RCU.
+	 */
 	struct cds_list_head stream_list;
+	pthread_mutex_t stream_list_lock;
+
+	/*
+	 * Node within session trace hash table. Node is indexed by
+	 * stream path name.
+	 */
+	struct lttng_ht_node_str node;
+	struct rcu_head rcu_node;	/* For call_rcu teardown. */
 };
 
-static inline void ctf_trace_get_ref(struct ctf_trace *trace)
-{
-	uatomic_inc(&trace->refcount);
-}
+struct ctf_trace *ctf_trace_get_by_path_or_create(struct relay_session *session,
+		char *path_name);
+bool ctf_trace_get(struct ctf_trace *trace);
+void ctf_trace_put(struct ctf_trace *trace);
 
-static inline void ctf_trace_put_ref(struct ctf_trace *trace)
-{
-	uatomic_add(&trace->refcount, -1);
-}
+int ctf_trace_close(struct ctf_trace *trace);
 
-void ctf_trace_assign(struct relay_stream *stream);
-struct ctf_trace *ctf_trace_create(char *path_name);
-void ctf_trace_destroy(struct ctf_trace *obj);
-void ctf_trace_try_destroy(struct relay_session *session,
-		struct ctf_trace *ctf_trace);
-struct ctf_trace *ctf_trace_find_by_path(struct lttng_ht *ht,
-		char *path_name);
-void ctf_trace_add(struct lttng_ht *ht, struct ctf_trace *trace);
-void ctf_trace_delete(struct lttng_ht *ht, struct ctf_trace *trace);
+struct relay_viewer_stream *ctf_trace_get_viewer_metadata_stream(struct ctf_trace *trace);
 
 #endif /* _CTF_TRACE_H */