X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=fc4723879f5fce3b10e98b9f31656882a38c52d4;hb=17977dd023f0ee2ac06aabe9cb848ec279eec746;hp=59764e105c36ef086c77dec6508312e7d8b54d58;hpb=93ec662e687dc15a3601704a1e0c96c51ad228c9;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 59764e105..fc4723879 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -60,6 +60,7 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_STREAMS_SENT,
 	LTTNG_CONSUMER_DISCARDED_EVENTS,
 	LTTNG_CONSUMER_LOST_PACKETS,
+	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
 };
 
 /* State of each fd in consumer */
@@ -217,6 +218,8 @@ struct lttng_consumer_channel {
 	uint64_t discarded_events;
 	/* Total number of missed packets due to overwriting (overwrite). */
 	uint64_t lost_packets;
+
+	bool streams_sent_to_relayd;
 };
 
 /*
@@ -249,6 +252,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.
@@ -317,9 +339,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;
@@ -370,9 +392,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.
@@ -401,7 +423,7 @@ struct consumer_relayd_sock_pair {
 	/* Network sequence number. */
 	uint64_t net_seq_idx;
 	/* Number of stream associated with this relayd */
-	unsigned int refcount;
+	int refcount;
 
 	/*
 	 * This flag indicates whether or not we should destroy this object. The
@@ -571,6 +593,12 @@ struct lttng_consumer_global_data {
 	struct lttng_ht *stream_per_chan_id_ht;
 };
 
+/*
+ * Set to nonzero when the consumer is exiting. Updated by signal
+ * handler and thread exit, read by threads.
+ */
+extern volatile int consumer_quit;
+
 /*
  * Init consumer data structures.
  */
@@ -606,12 +634,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