X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=cd3476675c4e465d8f46f2b5aef8ccc4e38a8e9b;hb=f21fa4fd488ef62230e01c9076f2aab06f2b6b7b;hp=7485e65b259d4b855c301405425225a462b5e0bf;hpb=84382d49b1e8a17037d0415d84f1c9e250163494;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 7485e65b2..cd3476675 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -58,6 +58,7 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_SNAPSHOT_CHANNEL,
 	LTTNG_CONSUMER_SNAPSHOT_METADATA,
 	LTTNG_CONSUMER_STREAMS_SENT,
+	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
 };
 
 /* State of each fd in consumer */
@@ -206,6 +207,11 @@ struct lttng_consumer_channel {
 
 	/* Timer value in usec for live streaming. */
 	unsigned int live_timer_interval;
+
+	int *stream_fds;
+	int nr_stream_fds;
+	char root_shm_path[PATH_MAX];
+	char shm_path[PATH_MAX];
 };
 
 /*
@@ -237,6 +243,40 @@ struct lttng_consumer_stream {
 	int shm_fd_is_copy;
 	int data_read;
 	int hangup_flush_done;
+
+	/*
+	 * Whether the stream is in a "complete" state (e.g. it does not have a
+	 * partially written sub-buffer.
+	 *
+	 * Initialized to "false" on stream creation (first packet is empty).
+	 *
+	 * The various transitions of the quiescent state are:
+	 *     - On "start" tracing: set to false, since the stream is not
+	 *       "complete".
+	 *     - On "stop" tracing: if !quiescent -> flush FINAL (update
+	 *       timestamp_end), and set to true; the stream has entered a
+	 *       complete/quiescent state.
+	 *     - On "destroy" or stream/application hang-up: if !quiescent ->
+	 *       flush FINAL, and set to true.
+	 *
+	 * NOTE: Update and read are protected by the stream lock.
+	 */
+	bool quiescent;
+
+	/*
+	 * metadata_timer_lock protects flags waiting_on_metadata and
+	 * missed_metadata_flush.
+	 */
+	pthread_mutex_t metadata_timer_lock;
+	/*
+	 * Flag set when awaiting metadata to be pushed. Used in the
+	 * timer thread to skip waiting on the stream (and stream lock) to
+	 * ensure we can proceed to flushing metadata in live mode.
+	 */
+	bool waiting_on_metadata;
+	/* Raised when a timer misses a metadata flush. */
+	bool missed_metadata_flush;
+
 	enum lttng_event_output output;
 	/* Maximum subbuffer size. */
 	unsigned long max_sb_size;
@@ -336,11 +376,19 @@ struct lttng_consumer_stream {
 	 */
 	int index_fd;
 
+	/*
+	 * Local pipe to extract data when using splice.
+	 */
+	int splice_pipe[2];
+
 	/*
 	 * Rendez-vous point between data and metadata stream in live mode.
 	 */
 	pthread_cond_t metadata_rdv;
 	pthread_mutex_t metadata_rdv_lock;
+
+	/* Indicate if the stream still has some data to be read. */
+	unsigned int has_data:1;
 };
 
 /*
@@ -448,11 +496,22 @@ struct lttng_consumer_local_data {
 	/* socket to exchange commands with sessiond */
 	char *consumer_command_sock_path;
 	/* communication with splice */
-	int consumer_thread_pipe[2];
 	int consumer_channel_pipe[2];
-	int consumer_splice_metadata_pipe[2];
 	/* Data stream poll thread pipe. To transfer data stream to the thread */
 	struct lttng_pipe *consumer_data_pipe;
+
+	/*
+	 * Data thread use that pipe to catch wakeup from read subbuffer that
+	 * detects that there is still data to be read for the stream encountered.
+	 * Before doing so, the stream is flagged to indicate that there is still
+	 * data to be read.
+	 *
+	 * Both pipes (read/write) are owned and used inside the data thread.
+	 */
+	struct lttng_pipe *consumer_wakeup_pipe;
+	/* Indicate if the wakeup thread has been notified. */
+	unsigned int has_wakeup:1;
+
 	/* to let the signal handler wake up the fd receiver thread */
 	int consumer_should_quit[2];
 	/* Metadata poll thread pipe. Transfer metadata stream to it */
@@ -580,7 +639,9 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		uint64_t tracefile_count,
 		uint64_t session_id_per_pid,
 		unsigned int monitor,
-		unsigned int live_timer_interval);
+		unsigned int live_timer_interval,
+		const char *root_shm_path,
+		const char *shm_path);
 void consumer_del_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
 void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
@@ -647,8 +708,9 @@ int consumer_send_status_channel(int sock,
 void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
 		uint64_t key);
 void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
-unsigned long consumer_get_consumed_maxsize(unsigned long consumed_pos,
-		unsigned long produced_pos, uint64_t max_stream_size);
+unsigned long consumer_get_consume_start_pos(unsigned long consumed_pos,
+		unsigned long produced_pos, uint64_t nb_packets_per_stream,
+		uint64_t max_sb_size);
 int consumer_add_data_stream(struct lttng_consumer_stream *stream);
 void consumer_del_stream_for_data(struct lttng_consumer_stream *stream);
 int consumer_add_metadata_stream(struct lttng_consumer_stream *stream);