X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=527331298c0440ece041d2a73a5296352aa8304b;hb=b35308203f7844f48542978fd00aab21f2057c17;hp=3af7db9136f3b011eef851397a2747ac86878ce2;hpb=fb83fe64f250bec7416f18891a8264450c61ead3;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 3af7db913..527331298 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -60,6 +60,8 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_STREAMS_SENT,
 	LTTNG_CONSUMER_DISCARDED_EVENTS,
 	LTTNG_CONSUMER_LOST_PACKETS,
+	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
+	LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE,
 };
 
 /* State of each fd in consumer */
@@ -169,6 +171,10 @@ struct lttng_consumer_channel {
 	timer_t live_timer;
 	int live_timer_error;
 
+	/* For channel monitoring timer. */
+	int monitor_timer_enabled;
+	timer_t monitor_timer;
+
 	/* On-disk circular buffer */
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
@@ -249,6 +255,25 @@ struct lttng_consumer_stream {
 	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.
@@ -292,6 +317,11 @@ struct lttng_consumer_stream {
 
 	/* Identify if the stream is the metadata */
 	unsigned int metadata_flag;
+	/*
+	 * Last known metadata version, reset the metadata file in case
+	 * of change.
+	 */
+	uint64_t metadata_version;
 	/* Used when the stream is set for network streaming */
 	uint64_t relayd_stream_id;
 	/*
@@ -312,9 +342,9 @@ struct lttng_consumer_stream {
 	 * Lock to use the stream FDs since they are used between threads.
 	 *
 	 * This is nested INSIDE the consumer_data lock.
-	 * This is nested INSIDE the metadata cache lock.
 	 * This is nested INSIDE the channel lock.
 	 * This is nested INSIDE the channel timer lock.
+	 * This is nested OUTSIDE the metadata cache lock.
 	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
@@ -365,9 +395,9 @@ struct lttng_consumer_stream {
 	/* Copy of the sequence number of the last packet extracted. */
 	uint64_t last_sequence_number;
 	/*
-	 * FD of the index file for this stream.
+	 * Index file object of the index file for this stream.
 	 */
-	int index_fd;
+	struct lttng_index_file *index_file;
 
 	/*
 	 * Local pipe to extract data when using splice.
@@ -382,6 +412,11 @@ struct lttng_consumer_stream {
 
 	/* Indicate if the stream still has some data to be read. */
 	unsigned int has_data:1;
+	/*
+	 * Inform the consumer or relay to reset the metadata
+	 * file before writing in it (regeneration).
+	 */
+	unsigned int reset_metadata_flag:1;
 };
 
 /*
@@ -509,6 +544,11 @@ struct lttng_consumer_local_data {
 	int consumer_should_quit[2];
 	/* Metadata poll thread pipe. Transfer metadata stream to it */
 	struct lttng_pipe *consumer_metadata_pipe;
+	/*
+	 * Pipe used by the channel monitoring timers to provide state samples
+	 * to the session daemon (write-only).
+	 */
+	int channel_monitor_pipe;
 };
 
 /*
@@ -596,12 +636,6 @@ void lttng_consumer_should_exit(struct lttng_consumer_local_data *ctx);
  */
 void lttng_consumer_cleanup(void);
 
-/*
- * Flush pending writes to trace output disk file.
- */
-void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
-		off_t orig_offset);
-
 /*
  * Poll on the should_quit pipe and the command socket return -1 on error and
  * should exit, 0 if data is available on the command socket