X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=898f77af98f1c463c3682757ef278acbd7da97d2;hb=6addfa379ee608b20cfe5e15d135bcb6a9724e90;hp=d2fc8ca691a15de1455dbb5cb3019f41cd756b09;hpb=e1986656f8267fb64f5ac67c0d464d157b8a050b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index d2fc8ca69..898f77af9 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
 #include <string.h>
@@ -24,6 +25,7 @@
 #include <common/defaults.h>
 
 #include "snapshot.h"
+#include "utils.h"
 
 /*
  * Return the atomically incremented value of next_output_id.
@@ -45,8 +47,11 @@ static int output_init(uint64_t max_size, const char *name,
 {
 	int ret = 0, i;
 
-	assert(output);
+	memset(output, 0, sizeof(struct snapshot_output));
 
+	/*
+	 * max_size of -1ULL means unset. Set to default (unlimited).
+	 */
 	if (max_size == (uint64_t) -1ULL) {
 		max_size = 0;
 	}
@@ -78,6 +83,7 @@ static int output_init(uint64_t max_size, const char *name,
 		ret = -ENOMEM;
 		goto error;
 	}
+	output->consumer->snapshot = 1;
 
 	/* No URL given. */
 	if (nb_uri == 0) {
@@ -217,11 +223,37 @@ void snapshot_output_destroy(struct snapshot_output *obj)
 
 	if (obj->consumer) {
 		consumer_output_send_destroy_relayd(obj->consumer);
-		consumer_destroy_output(obj->consumer);
+		consumer_output_put(obj->consumer);
 	}
 	free(obj);
 }
 
+/*
+ * RCU read side lock MUST be acquired before calling this since the returned
+ * pointer is in a RCU hash table.
+ *
+ * Return the reference on success or else NULL.
+ */
+struct snapshot_output *snapshot_find_output_by_name(const char *name,
+		struct snapshot *snapshot)
+{
+	struct lttng_ht_iter iter;
+	struct snapshot_output *output = NULL;
+
+	assert(snapshot);
+	assert(name);
+
+	cds_lfht_for_each_entry(snapshot->output_ht->ht, &iter.iter, output,
+		node.node) {
+		if (!strncmp(output->name, name, strlen(name))) {
+			return output;
+		}
+	}
+
+	/* Not found */
+	return NULL;
+}
+
 /*
  * RCU read side lock MUST be acquired before calling this since the returned
  * pointer is in a RCU hash table.
@@ -292,4 +324,5 @@ void snapshot_destroy(struct snapshot *obj)
 		snapshot_output_destroy(output);
 	}
 	rcu_read_unlock();
+	ht_cleanup_push(obj->output_ht);
 }