X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=fb535fba6004d10491c04d0cb10ba95d3c4ec7ae;hp=f5fbf326219efada17fe347b9fa3ffa6cfd46fe6;hb=b99a8d4211e26a847ca8916884354f159c999ad2;hpb=a1ae2ea59428174575b7328b1062a6248d636b72

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index f5fbf3262..fb535fba6 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -62,6 +62,9 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_LOST_PACKETS,
 	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
 	LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE,
+	LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE,
+	LTTNG_CONSUMER_ROTATE_CHANNEL,
+	LTTNG_CONSUMER_ROTATE_RENAME,
 	LTTNG_CONSUMER_MKDIR,
 };
 
@@ -227,6 +230,20 @@ struct lttng_consumer_channel {
 	uint64_t lost_packets;
 
 	bool streams_sent_to_relayd;
+
+	/*
+	 * Account how many streams are waiting for their rotation to be
+	 * complete. When this number reaches 0, we inform the session
+	 * daemon that this channel has finished its rotation.
+	 */
+	uint64_t nr_stream_rotate_pending;
+
+	/*
+	 * The chunk id where we currently write the data. This value is sent
+	 * to the relay when we add a stream and when a stream rotates. This
+	 * allows to keep track of where each stream on the relay is writing.
+	 */
+	uint64_t current_chunk_id;
 };
 
 /*
@@ -414,6 +431,31 @@ struct lttng_consumer_stream {
 	pthread_cond_t metadata_rdv;
 	pthread_mutex_t metadata_rdv_lock;
 
+	/*
+	 * rotate_position represents the position in the ring-buffer that has to
+	 * be flushed to disk to complete the ongoing rotation. When that position
+	 * is reached, this tracefile can be closed and a new one is created in
+	 * channel_read_only_attributes.path.
+	 */
+	unsigned long rotate_position;
+
+	/*
+	 * Read-only copies of channel values. We cannot safely access the
+	 * channel from a stream, so we need to have a local copy of these
+	 * fields in the stream object. These fields should be removed from
+	 * the stream objects when we introduce refcounting.
+	 */
+	struct {
+		char path[LTTNG_PATH_MAX];
+		uint64_t tracefile_size;
+	} channel_read_only_attributes;
+
+	/*
+	 * Flag to inform the data or metadata thread that a stream is
+	 * ready to be rotated.
+	 */
+	bool rotate_ready;
+
 	/* Indicate if the stream still has some data to be read. */
 	unsigned int has_data:1;
 	/*
@@ -553,6 +595,11 @@ struct lttng_consumer_local_data {
 	 * to the session daemon (write-only).
 	 */
 	int channel_monitor_pipe;
+	/*
+	 * Pipe used to inform the session daemon that a stream has finished
+	 * its rotation (write-only).
+	 */
+	int channel_rotate_pipe;
 };
 
 /*
@@ -661,6 +708,14 @@ void lttng_consumer_cleanup(void);
  */
 int lttng_consumer_poll_socket(struct pollfd *kconsumer_sockpoll);
 
+/*
+ * Copy the fields from the channel that need to be accessed (read-only)
+ * directly from the stream.
+ */
+void consumer_stream_update_channel_attributes(
+		struct lttng_consumer_stream *stream,
+		struct lttng_consumer_channel *channel);
+
 struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 		uint64_t stream_key,
 		enum lttng_consumer_stream_state state,
@@ -724,9 +779,12 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 		struct lttng_consumer_stream *stream, unsigned long len,
 		unsigned long padding,
 		struct ctf_packet_index *index);
+int lttng_consumer_sample_snapshot_positions(struct lttng_consumer_stream *stream);
 int lttng_consumer_take_snapshot(struct lttng_consumer_stream *stream);
 int lttng_consumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
 		unsigned long *pos);
+int lttng_consumer_get_consumed_snapshot(struct lttng_consumer_stream *stream,
+		unsigned long *pos);
 int lttng_ustconsumer_get_wakeup_fd(struct lttng_consumer_stream *stream);
 int lttng_ustconsumer_close_wakeup_fd(struct lttng_consumer_stream *stream);
 void *consumer_thread_metadata_poll(void *data);
@@ -760,6 +818,17 @@ void consumer_del_stream_for_data(struct lttng_consumer_stream *stream);
 void consumer_add_metadata_stream(struct lttng_consumer_stream *stream);
 void consumer_del_stream_for_metadata(struct lttng_consumer_stream *stream);
 int consumer_create_index_file(struct lttng_consumer_stream *stream);
+int lttng_consumer_rotate_channel(uint64_t key, const char *path,
+		uint64_t relayd_id, uint32_t metadata,
+		uint64_t new_chunk_id, struct lttng_consumer_local_data *ctx);
+int lttng_consumer_stream_is_rotate_ready(struct lttng_consumer_stream *stream);
+int lttng_consumer_rotate_stream(struct lttng_consumer_local_data *ctx,
+		struct lttng_consumer_stream *stream, bool *rotated);
+int lttng_consumer_rotate_ready_streams(uint64_t key,
+		struct lttng_consumer_local_data *ctx);
+int lttng_consumer_rotate_rename(const char *current_path, const char *new_path,
+		uid_t uid, gid_t gid, uint64_t relayd_id);
+void lttng_consumer_reset_stream_rotate_state(struct lttng_consumer_stream *stream);
 int lttng_consumer_mkdir(const char *path, uid_t uid, gid_t gid,
 		uint64_t relayd_id);