X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=0a3ce47404cea9f6c1692209dc8ab4a325d204fc;hp=8bbc279c3a61f993f322988935b1847976e9ccf0;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=7717e3612c10d85507abc47fbde262d39edfb8b4

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index 8bbc279c3..0a3ce4740 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -19,53 +19,43 @@
 #ifndef LTTNG_RELAYD_H
 #define LTTNG_RELAYD_H
 
-#define _LGPL_SOURCE
+#include <limits.h>
 #include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>
+
+#include <common/hashtable/hashtable.h>
 
 /*
  * Queue used to enqueue relay requests
  */
-struct relay_cmd_queue {
-	struct cds_wfq_queue queue;
+struct relay_conn_queue {
+	struct cds_wfcq_head head;
+	struct cds_wfcq_tail tail;
 	int32_t futex;
 };
 
-enum connection_type {
-	RELAY_DATA,
-	RELAY_CONTROL,
+struct relay_local_data {
+	struct lttng_ht *sessions_ht;
 };
 
-/*
- * Represents a session for the relay point of view
- */
-struct relay_session {
-	uint64_t id;
-	struct lttcomm_sock *sock;
-	unsigned int version_check_done:1;
-};
+extern char *opt_output_path;
 
 /*
- * Represents a stream in the relay
+ * 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.
  */
-struct relay_stream {
-	uint64_t stream_handle;
-	uint64_t seq;
-	struct lttng_ht_node_ulong stream_n;
-	struct relay_session *session;
-	int fd;
-};
+extern struct lttng_ht *relay_streams_ht;
 
-/*
- * Internal structure to map a socket with the corresponding session.
- * A hashtable indexed on the socket FD is used for the lookups.
- */
-struct relay_command {
-	struct lttcomm_sock *sock;
-	struct relay_session *session;
-	struct cds_wfq_node node;
-	struct lttng_ht_node_ulong sock_n;
-	enum connection_type type;
-};
+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;
+
+extern int thread_quit_pipe[2];
+
+void lttng_relay_notify_ready(void);
 
 #endif /* LTTNG_RELAYD_H */