X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=2c927bbc2ca0b745890130ade943e15d818054e7;hb=2c8a890846cfc88874b25d5c3c12e0fd5ce3d1da;hp=4cc40a431ee7ba86b0a54913aa73b43bdc3216f4;hpb=9276e5c88e693249bd31197baecf58310df8167e;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 4cc40a431..2c927bbc2 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -2,6 +2,7 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *               2012 - David Goulet <dgoulet@efficios.com>
+ *               2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
@@ -62,10 +63,10 @@ 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_ROTATE_PENDING_RELAY,
+	LTTNG_CONSUMER_CHECK_ROTATION_PENDING_LOCAL,
+	LTTNG_CONSUMER_CHECK_ROTATION_PENDING_RELAY,
 	LTTNG_CONSUMER_MKDIR,
 };
 
@@ -232,13 +233,6 @@ struct lttng_consumer_channel {
 
 	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
@@ -417,8 +411,9 @@ struct lttng_consumer_stream {
 	/* Copy of the sequence number of the last packet extracted. */
 	uint64_t last_sequence_number;
 	/*
-	 * Session's current trace archive id at the time of the creation of
-	 * this stream.
+	 * A stream is created with a trace_archive_id matching the session's
+	 * current trace archive id at the time of the creation of the stream.
+	 * It is incremented when the rotate_position is reached.
 	 */
 	uint64_t trace_archive_id;
 	/*
@@ -602,11 +597,6 @@ 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;
 };
 
 /*
@@ -674,6 +664,24 @@ extern int consumer_quit;
 /* Flag used to temporarily pause data consumption from testpoints. */
 extern int data_consumption_paused;
 
+/* Return a human-readable consumer type string that is suitable for logging. */
+static inline
+const char *lttng_consumer_type_str(enum lttng_consumer_type type)
+{
+	switch (type) {
+	case LTTNG_CONSUMER_UNKNOWN:
+		return "unknown";
+	case LTTNG_CONSUMER_KERNEL:
+		return "kernel";
+	case LTTNG_CONSUMER32_UST:
+		return "32-bit user space";
+	case LTTNG_CONSUMER64_UST:
+		return "64-bit user space";
+	default:
+		abort();
+	}
+}
+
 /*
  * Init consumer data structures.
  */
@@ -836,7 +844,9 @@ 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);
-int lttng_consumer_rotate_pending_relay( uint64_t session_id,
+int lttng_consumer_check_rotation_pending_local(uint64_t session_id,
+		uint64_t chunk_id);
+int lttng_consumer_check_rotation_pending_relay(uint64_t session_id,
 		uint64_t relayd_id, uint64_t chunk_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,