X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=638ecbbea2b6d0f8863e27a52c4dad45b846d1e6;hp=dfbc63f399e16cb2e9503a6513f1a91707583ec7;hb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883;hpb=b8aa16822f579a6e15b41d2761801a0a65d5f2a5

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index dfbc63f39..638ecbbea 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -16,33 +16,52 @@
  * 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>
+#include <common/index/lttng-index.h>
+
+#include "ctf-trace.h"
+
 /*
  * Queue used to enqueue relay requests
  */
 struct relay_cmd_queue {
-	int32_t futex;
 	struct cds_wfq_queue queue;
+	int32_t futex;
 };
 
 enum connection_type {
 	RELAY_DATA,
 	RELAY_CONTROL,
+	RELAY_VIEWER_COMMAND,
+	RELAY_VIEWER_NOTIFICATION,
 };
 
 /*
  * 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;
-	unsigned int version_check_done:1;
+	char session_name[NAME_MAX];
+	char hostname[HOST_NAME_MAX];
+	uint32_t live_timer;
+	struct lttng_ht_node_ulong session_n;
+	struct rcu_head rcu_node;
+	uint32_t viewer_attached;
+	uint32_t stream_count;
 };
 
 /*
@@ -50,10 +69,75 @@ struct relay_session {
  */
 struct relay_stream {
 	uint64_t stream_handle;
+	uint64_t prev_seq;	/* previous data sequence number encountered */
 	struct lttng_ht_node_ulong stream_n;
-	int fd;
-	uint64_t seq;
 	struct relay_session *session;
+	struct rcu_head rcu_node;
+	int fd;
+	/* FD on which to write the index data. */
+	int index_fd;
+	/* FD on which to read the index data for the viewer. */
+	int read_index_fd;
+
+	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;
+
+	uint64_t total_index_received;
+	struct relay_viewer_stream *viewer_stream;
+	uint64_t last_net_seq_num;
+	struct lttng_ht_node_str ctf_trace_node;
+
+	/*
+	 * To protect from concurrent read/update between the
+	 * streaming-side and the viewer-side.
+	 * This lock must be held, we reading/updating the
+	 * ctf_trace pointer.
+	 */
+	pthread_mutex_t lock;
+
+	struct ctf_trace *ctf_trace;
+	/*
+	 * If the stream is inactive, this field is updated with the live beacon
+	 * timestamp end, when it is active, this field == -1ULL.
+	 */
+	uint64_t beacon_ts_end;
+
+	/* Information telling us when to close the stream  */
+	unsigned int close_flag:1;
+	/* Indicate if the stream was initialized for a data pending command. */
+	unsigned int data_pending_check_done:1;
+	unsigned int metadata_flag:1;
+};
+
+/*
+ * Shadow copy of the relay_stream structure for the viewer side.  The only
+ * fields updated by the writer (streaming side) after allocation are :
+ * total_index_received and close_flag. Everything else is updated by the
+ * reader (viewer side).
+ */
+struct relay_viewer_stream {
+	uint64_t stream_handle;
+	uint64_t session_id;
+	int read_fd;
+	int index_read_fd;
+	char *path_name;
+	char *channel_name;
+	uint64_t last_sent_index;
+	uint64_t total_index_received;
+	uint64_t tracefile_size;
+	uint64_t tracefile_size_current;
+	uint64_t tracefile_count;
+	uint64_t tracefile_count_current;
+	struct lttng_ht_node_u64 stream_n;
+	struct rcu_head rcu_node;
+	struct ctf_trace *ctf_trace;
+	/* Information telling us if the stream is a metadata stream. */
+	unsigned int metadata_flag:1;
 };
 
 /*
@@ -62,10 +146,27 @@ struct relay_stream {
  */
 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;
-	struct relay_session *session;
+	unsigned int version_check_done:1;
+	/* protocol version to use for this session */
+	uint32_t major;
+	uint32_t minor;
+	struct lttng_ht *ctf_traces_ht;	/* indexed by path name */
+};
+
+struct relay_local_data {
+	struct lttng_ht *sessions_ht;
+	struct lttng_ht *viewer_streams_ht;
 };
 
-#endif
+extern char *opt_output_path;
+
+extern struct lttng_ht *relay_streams_ht;
+
+struct relay_stream *relay_stream_find_by_id(uint64_t stream_id);
+
+#endif /* LTTNG_RELAYD_H */