X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=28364bbc75575508dc823c0ca6f819981bf66d0f;hb=5288612f2dc35805e861d0648bf75304c91bfeee;hp=ba7cdff2c3a52b3415e464ca8605b71099f7aaaf;hpb=ee91bab210156bd9a4ec23eac93aa563556f2803;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index ba7cdff2c..28364bbc7 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -34,18 +34,16 @@ static inline unsigned long get_next_output_id(struct snapshot *snapshot)
 }
 
 /*
- * Initialize a snapshot output object using the given parameters. The name
- * value and url can be NULL.
+ * Initialized snapshot output with the given values.
  *
  * Return 0 on success or else a negative value.
  */
-int snapshot_output_init(uint64_t max_size, const char *name,
-		const char *ctrl_url, const char *data_url,
+static int output_init(uint64_t max_size, const char *name,
+		struct lttng_uri *uris, size_t nb_uri,
 		struct consumer_output *consumer, struct snapshot_output *output,
 		struct snapshot *snapshot)
 {
-	int ret = 0, nb_uri, i;
-	struct lttng_uri *uris = NULL;
+	int ret = 0, i;
 
 	assert(output);
 
@@ -71,13 +69,6 @@ int snapshot_output_init(uint64_t max_size, const char *name,
 		goto end;
 	}
 
-	/* Create an array of URIs from URLs. */
-	nb_uri = uri_parse_str_urls(ctrl_url, data_url, &uris);
-	if (nb_uri < 0) {
-		ret = nb_uri;
-		goto error;
-	}
-
 	output->consumer = consumer_copy_output(consumer);
 	if (!output->consumer) {
 		ret = -ENOMEM;
@@ -116,6 +107,49 @@ int snapshot_output_init(uint64_t max_size, const char *name,
 
 error:
 end:
+	return ret;
+}
+
+/*
+ * Initialize a snapshot output object using the given parameters and URI(s).
+ * The name value and uris can be NULL.
+ *
+ * Return 0 on success or else a negative value.
+ */
+int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
+		struct lttng_uri *uris, size_t nb_uri,
+		struct consumer_output *consumer, struct snapshot_output *output,
+		struct snapshot *snapshot)
+{
+	return output_init(max_size, name, uris, nb_uri, consumer, output,
+			snapshot);
+}
+
+/*
+ * Initialize a snapshot output object using the given parameters. The name
+ * value and url can be NULL.
+ *
+ * Return 0 on success or else a negative value.
+ */
+int snapshot_output_init(uint64_t max_size, const char *name,
+		const char *ctrl_url, const char *data_url,
+		struct consumer_output *consumer, struct snapshot_output *output,
+		struct snapshot *snapshot)
+{
+	int ret = 0, nb_uri;
+	struct lttng_uri *uris = NULL;
+
+	/* Create an array of URIs from URLs. */
+	nb_uri = uri_parse_str_urls(ctrl_url, data_url, &uris);
+	if (nb_uri < 0) {
+		ret = nb_uri;
+		goto error;
+	}
+
+	ret = output_init(max_size, name, uris, nb_uri, consumer, output,
+			snapshot);
+
+error:
 	free(uris);
 	return ret;
 }
@@ -211,11 +245,6 @@ error:
 	return output;
 }
 
-struct snapshot *snapshot_alloc(void)
-{
-	return zmalloc(sizeof(struct snapshot));
-}
-
 /*
  * Initialized a snapshot object that was already allocated.
  *