Fix: code refactoring of viewer streams in relayd

[lttng-tools.git] / src / bin / lttng-relayd / lttng-relayd.h

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index e6ca5ebbb2b7dcbfb9f9bdb9a4d302d70c2e3475..6dfc803236885bb1848f5889b75bf3207b908732 100644 (file)
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -20,8 +20,16 @@
 #define LTTNG_RELAYD_H
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <urcu.h>
 #include <urcu/wfqueue.h>
+#include <urcu/list.h>
+
+#include <common/hashtable/hashtable.h>
+#include <common/index/ctf-index.h>
+
+#include "ctf-trace.h"
+#include "session.h"
 
 /*
  * Queue used to enqueue relay requests
@@ -32,24 +40,20 @@ struct relay_cmd_queue {
 };
 
 enum connection_type {
-       RELAY_DATA,
-       RELAY_CONTROL,
+       RELAY_DATA                  = 1,
+       RELAY_CONTROL               = 2,
+       RELAY_VIEWER_COMMAND        = 3,
+       RELAY_VIEWER_NOTIFICATION   = 4,
 };
 
 /*
- * Represents a session for the relay point of view
+ * When we receive a stream, it gets stored in a list (on a per connection
+ * basis) until we have all the streams of the same channel and the metadata
+ * associated with it, then it gets flagged with viewer_ready.
  */
-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;
-       /* protocol version to use for this session */
-       uint32_t major;
-       uint32_t minor;
+struct relay_stream_recv_handle {
+       uint64_t id;    /* stream handle */
+       struct cds_list_head node;
 };
 
 /*
@@ -62,12 +66,70 @@ struct relay_stream {
        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;
+       /* To inform the viewer up to where it can go back in time. */
+       uint64_t oldest_tracefile_id;
+
+       uint64_t total_index_received;
+       uint64_t last_net_seq_num;
+
+       /*
+        * This node is added to the *control* connection hash table and the
+        * pointer is copied in here so we can access it when deleting this object.
+        * When deleting this, the ctf trace ht MUST NOT be destroyed. This happens
+        * at connection deletion.
+        */
+       struct lttng_ht_node_str ctf_trace_node;
+       struct lttng_ht *ctf_traces_ht;
+
+       /*
+        * 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;
+       /*
+        * To protect the update of the close_write_flag and the checks of
+        * the tracefile_count_current.
+        * It is taken before checking whenever we need to know if the
+        * writer and reader are working in the same tracefile.
+        */
+       pthread_mutex_t viewer_stream_rotation_lock;
 
        /* 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;
+       unsigned int metadata_flag:1;
+       /*
+        * To detect when we start overwriting old data, it is used to
+        * update the oldest_tracefile_id.
+        */
+       unsigned int tracefile_overwrite:1;
+       /*
+        * Can this stream be used by a viewer or are we waiting for additional
+        * information.
+        */
+       unsigned int viewer_ready:1;
 };
 
 /*
@@ -81,7 +143,32 @@ struct relay_command {
        struct lttng_ht_node_ulong sock_n;
        struct rcu_head rcu_node;
        enum connection_type type;
+       /* protocol version to use for this session */
+       uint32_t major;
+       uint32_t minor;
+       struct lttng_ht *ctf_traces_ht; /* indexed by path name */
+       uint64_t session_id;
+       struct cds_list_head recv_head;
        unsigned int version_check_done:1;
 };
 
+struct relay_local_data {
+       struct lttng_ht *sessions_ht;
+};
+
+extern char *opt_output_path;
+
+extern struct lttng_ht *relay_streams_ht;
+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];
+
+struct relay_stream *relay_stream_find_by_id(uint64_t stream_id);
+void lttng_relay_notify_ready(void);
+
 #endif /* LTTNG_RELAYD_H */