X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=fa9d2ca74ce56957b4d7d1c151f9798edfeb8e75;hb=58eb9381cd933f0644e6a5b89750dbd6d9b14570;hp=bec13496ca26ab5944853bb0dacadebeb8b2436f;hpb=9d1bbf2176ae0e362428b920e34b05158027da26;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index bec13496c..fa9d2ca74 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -20,54 +20,40 @@
 #define LTTNG_RELAYD_H
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <urcu.h>
 #include <urcu/wfqueue.h>
 
+#include <common/hashtable/hashtable.h>
+
 /*
  * Queue used to enqueue relay requests
  */
-struct relay_cmd_queue {
+struct relay_conn_queue {
 	struct cds_wfq_queue queue;
 	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;
-	struct rcu_head rcu_node;
-	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;
-	struct rcu_head rcu_node;
-	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;
+
+void lttng_relay_notify_ready(void);
 
 #endif /* LTTNG_RELAYD_H */