X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=55ce25ea6ff162871f2deb711e04ab26b587f07b;hb=151b6b1ac2ac1a85b587e578e69b48f6e5feab6a;hp=dfbc63f399e16cb2e9503a6513f1a91707583ec7;hpb=b8aa16822f579a6e15b41d2761801a0a65d5f2a5;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index dfbc63f39..55ce25ea6 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -16,56 +16,46 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _LTT_RELAYD_H
-#define _LTT_RELAYD_H
+#ifndef LTTNG_RELAYD_H
+#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 {
-	int32_t futex;
+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;
-	struct lttng_ht_node_ulong stream_n;
-	int fd;
-	uint64_t seq;
-	struct relay_session *session;
-};
+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 cds_wfq_node node;
-	struct lttng_ht_node_ulong sock_n;
-	enum connection_type type;
-	struct relay_session *session;
-};
+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
+#endif /* LTTNG_RELAYD_H */