Fix: support temporary snapshot max size and name

[lttng-tools.git] / src / bin / lttng-sessiond / snapshot.c

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index 77255fa2c597f0440e72e8585be486c64e6ef369..d2fc8ca691a15de1455dbb5cb3019f41cd756b09 100644 (file)
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -34,28 +34,30 @@ 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);
 
+       if (max_size == (uint64_t) -1ULL) {
+               max_size = 0;
+       }
        output->max_size = max_size;
+
        if (snapshot) {
                output->id = get_next_output_id(snapshot);
        }
        lttng_ht_node_init_ulong(&output->node, (unsigned long) output->id);
 
-       if (name) {
+       if (name && name[0] != '\0') {
                strncpy(output->name, name, sizeof(output->name));
        } else {
                /* Set default name. */
@@ -71,13 +73,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 +111,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 +249,6 @@ error:
        return output;
 }
 
-struct snapshot *snapshot_alloc(void)
-{
-       return zmalloc(sizeof(struct snapshot));
-}
-
 /*
  * Initialized a snapshot object that was already allocated.
  *