X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=79fdbf1c8b632bc9f049e27511f7b593314bd0f7;hb=6a00837f8cb0431a2ad90974d67fae138ea97dd5;hp=d3c561c9ec6932531fc3c46a1a464835dc45e12f;hpb=10a5031171c7bca5b4498c871b119e5a88b6a3fb;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index d3c561c9e..79fdbf1c8 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -408,6 +408,28 @@ error:
 	return output;
 }
 
+/*
+ * Iterate over the consumer output socket hash table and destroy them. The
+ * socket file descriptor are only closed if the consumer output was
+ * registered meaning it's an external consumer.
+ */
+void consumer_destroy_output_sockets(struct consumer_output *obj)
+{
+	struct lttng_ht_iter iter;
+	struct consumer_socket *socket;
+
+	if (!obj->socks) {
+		return;
+	}
+
+	rcu_read_lock();
+	cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
+		consumer_del_socket(socket, obj);
+		consumer_destroy_socket(socket);
+	}
+	rcu_read_unlock();
+}
+
 /*
  * Delete the consumer_output object from the list and free the ptr.
  *
@@ -419,17 +441,9 @@ void consumer_destroy_output(struct consumer_output *obj)
 		return;
 	}
 
-	if (obj->socks) {
-		struct lttng_ht_iter iter;
-		struct consumer_socket *socket;
-
-		rcu_read_lock();
-		cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
-			consumer_del_socket(socket, obj);
-			consumer_destroy_socket(socket);
-		}
-		rcu_read_unlock();
+	consumer_destroy_output_sockets(obj);
 
+	if (obj->socks) {
 		/* Finally destroy HT */
 		ht_cleanup_push(obj->socks);
 	}
@@ -1196,7 +1210,7 @@ end:
  */
 int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 		struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
-		const char *session_path, int wait)
+		const char *session_path, int wait, int max_stream_size)
 {
 	int ret;
 	struct lttcomm_consumer_msg msg;
@@ -1211,15 +1225,16 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_SNAPSHOT_CHANNEL;
 	msg.u.snapshot_channel.key = key;
-	msg.u.snapshot_channel.max_size = output->max_size;
+	msg.u.snapshot_channel.max_stream_size = max_stream_size;
 	msg.u.snapshot_channel.metadata = metadata;
 
 	if (output->consumer->type == CONSUMER_DST_NET) {
 		msg.u.snapshot_channel.relayd_id = output->consumer->net_seq_index;
 		msg.u.snapshot_channel.use_relayd = 1;
 		ret = snprintf(msg.u.snapshot_channel.pathname,
-				sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
-				output->consumer->subdir, output->name, output->datetime,
+				sizeof(msg.u.snapshot_channel.pathname),
+				"%s/%s-%s-%" PRIu64 "%s", output->consumer->subdir,
+				output->name, output->datetime, output->nb_snapshot,
 				session_path);
 		if (ret < 0) {
 			ret = -LTTNG_ERR_NOMEM;
@@ -1227,9 +1242,10 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 		}
 	} else {
 		ret = snprintf(msg.u.snapshot_channel.pathname,
-				sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
-				output->consumer->dst.trace_path, output->name,
-				output->datetime, session_path);
+				sizeof(msg.u.snapshot_channel.pathname),
+				"%s/%s-%s-%" PRIu64 "%s", output->consumer->dst.trace_path,
+				output->name, output->datetime, output->nb_snapshot,
+				session_path);
 		if (ret < 0) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto error;