X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=e4e29e781e3ed8233cfdb6c82ddbe7ee32618038;hp=c60280e0fd9c717dc0bd0d1e975236ca0e73bed5;hb=7591bab11eceedc6a0d1e02fd6f85592267a63b5;hpb=1c20f0e29cbf8627bfb1ff444572d52d6655c4e2

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index c60280e0f..e4e29e781 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -1,6 +1,10 @@
+#ifndef LTTNG_RELAYD_H
+#define LTTNG_RELAYD_H
+
 /*
  * Copyright (C) 2012 - 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,
@@ -16,86 +20,37 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#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>
-#include <common/index/lttng-index.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,
-};
-
-/*
- * 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;
-};
-
 /*
- * 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).
  */
-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;
-	/* FD on which to write the index data. */
-	int index_fd;
+extern struct lttng_ht *sessions_ht;
+extern struct lttng_ht *relay_streams_ht;
+extern struct lttng_ht *viewer_streams_ht;
 
-	char *path_name;
-	char *channel_name;
-	/* on-disk circular buffer of tracefiles */
-	uint64_t tracefile_size;
-	uint64_t tracefile_size_current;
-	uint64_t tracefile_count;
-	uint64_t tracefile_count_current;
-
-	/* 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;
-};
+extern char *opt_output_path;
+extern const char *tracing_group_name;
+extern const char * const config_section_name;
 
-/*
- * 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;
-	unsigned int version_check_done:1;
-	/* protocol version to use for this session */
-	uint32_t major;
-	uint32_t minor;
-};
+extern int thread_quit_pipe[2];
 
-extern char *opt_output_path;
+void lttng_relay_notify_ready(void);
+int lttng_relay_stop_threads(void);
 
 #endif /* LTTNG_RELAYD_H */