X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=f0c1abfee492356fb7052643a99e0ccd870dcdd0;hp=e6ca5ebbb2b7dcbfb9f9bdb9a4d302d70c2e3475;hb=2a174661a1e0ab551b41ff1cae7191688525fc1f;hpb=d4519fa365bd3a9ce4ea1720805a29a000fa042c

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index e6ca5ebbb..f0c1abfee 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -20,8 +20,16 @@
 #define LTTNG_RELAYD_H
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <urcu.h>
 #include <urcu/wfqueue.h>
+#include <urcu/list.h>
+
+#include <common/hashtable/hashtable.h>
+#include <common/index/ctf-index.h>
+
+#include "ctf-trace.h"
+#include "session.h"
 
 /*
  * Queue used to enqueue relay requests
@@ -32,42 +40,10 @@ struct relay_cmd_queue {
 };
 
 enum connection_type {
-	RELAY_DATA,
-	RELAY_CONTROL,
-};
-
-/*
- * Represents a session for the relay point of view
- */
-struct relay_session {
-	/*
-	 * This session id is used to identify a set of stream to a tracing session
-	 * but also make sure we have a unique session id associated with a session
-	 * daemon which can provide multiple data source.
-	 */
-	uint64_t id;
-	struct lttcomm_sock *sock;
-	/* protocol version to use for this session */
-	uint32_t major;
-	uint32_t minor;
-};
-
-/*
- * Represents a stream in the relay
- */
-struct relay_stream {
-	uint64_t stream_handle;
-	uint64_t prev_seq;	/* previous data sequence number encountered */
-	struct lttng_ht_node_ulong stream_n;
-	struct relay_session *session;
-	struct rcu_head rcu_node;
-	int fd;
-
-	/* Information telling us when to close the stream  */
-	unsigned int close_flag:1;
-	uint64_t last_net_seq_num;
-	/* Indicate if the stream was initialized for a data pending command. */
-	unsigned int data_pending_check_done:1;
+	RELAY_DATA                  = 1,
+	RELAY_CONTROL               = 2,
+	RELAY_VIEWER_COMMAND        = 3,
+	RELAY_VIEWER_NOTIFICATION   = 4,
 };
 
 /*
@@ -81,7 +57,34 @@ struct relay_command {
 	struct lttng_ht_node_ulong sock_n;
 	struct rcu_head rcu_node;
 	enum connection_type type;
+	/* protocol version to use for this session */
+	uint32_t major;
+	uint32_t minor;
+	uint64_t session_id;
+	struct cds_list_head recv_head;
 	unsigned int version_check_done:1;
 };
 
+struct relay_local_data {
+	struct lttng_ht *sessions_ht;
+};
+
+extern char *opt_output_path;
+
+/*
+ * Contains stream indexed by ID. This is important since many commands lookup
+ * streams only by ID thus also keeping them in this hash table makes the
+ * search O(1) instead of iterating over the ctf_traces_ht of the session.
+ */
+extern struct lttng_ht *relay_streams_ht;
+
+extern struct lttng_ht *viewer_streams_ht;
+extern struct lttng_ht *indexes_ht;
+
+extern const char *tracing_group_name;
+
+extern const char * const config_section_name;
+
+void lttng_relay_notify_ready(void);
+
 #endif /* LTTNG_RELAYD_H */