#include <limits.h>
#include <urcu.h>
#include <urcu/wfqueue.h>
+#include <urcu/list.h>
#include <common/hashtable/hashtable.h>
-#include <common/index/lttng-index.h>
+#include <common/index/ctf-index.h>
#include "ctf-trace.h"
+#include "session.h"
/*
* Queue used to enqueue relay requests
};
/*
- * 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;
- 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;
- /* Tell if this session is for a snapshot or not. */
- unsigned int snapshot:1;
-
- /*
- * Indicate version protocol for this session. This is especially useful
- * for the data thread that has no idea which version it operates on since
- * linking control/data sockets is non trivial.
- */
- uint64_t minor;
- uint64_t major;
+struct relay_stream_recv_handle {
+ uint64_t id; /* stream handle */
+ struct cds_list_head node;
};
/*
uint64_t oldest_tracefile_id;
uint64_t total_index_received;
- struct relay_viewer_stream *viewer_stream;
uint64_t last_net_seq_num;
/*
* update the oldest_tracefile_id.
*/
unsigned int tracefile_overwrite: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_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;
/*
- * Information telling us that the stream is closed in write, so
- * we don't expect new indexes and we can read up to EOF.
+ * Can this stream be used by a viewer or are we waiting for additional
+ * information.
*/
- unsigned int close_write_flag:1;
- /*
- * If the streaming side closes a FD in use in the viewer side,
- * it sets this flag to inform that it is a normal error.
- */
- unsigned int abort_flag:1;
+ unsigned int viewer_ready:1;
};
/*
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;
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 {
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 */