Add snapshot output init call that uses URIs

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index b14a398c343ba58d2cab3a50b726f2d33475b515..28364bbc75575508dc823c0ca6f819981bf66d0f 100644 (file)
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -34,24 +34,19 @@ 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);
 
-       DBG2("Snapshot output initializing with max size %" PRIu64 ", name %s "
-                       "ctrl URL %s, data URL %s", max_size, name, ctrl_url, data_url);
-
        output->max_size = max_size;
        if (snapshot) {
                output->id = get_next_output_id(snapshot);
@@ -74,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;
@@ -119,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;
 }