X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=03b830de7d32cb62a7a388bde33e19c63ce6ccfe;hp=447806bf4428fd4d8de87b411818b00b5fd5c372;hb=1f4962443f25c371e4b54e97f9eb867d67cbf88e;hpb=366a9222abc182bf77de1b806256aa9a9dc8832a

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index 447806bf4..03b830de7 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -39,7 +39,8 @@ static inline unsigned long get_next_output_id(struct snapshot *snapshot)
  *
  * Return 0 on success or else a negative value.
  */
-static int output_init(uint64_t max_size, const char *name,
+static int output_init(const struct ltt_session *session,
+		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)
@@ -115,7 +116,8 @@ static int output_init(uint64_t max_size, const char *name,
 
 	for (i = 0; i < nb_uri; i ++) {
 		/* Network URIs */
-		ret = consumer_set_network_uri(output->consumer, &uris[i]);
+		ret = consumer_set_network_uri(session, output->consumer,
+				&uris[i]);
 		if (ret < 0) {
 			goto error;
 		}
@@ -132,13 +134,14 @@ end:
  *
  * Return 0 on success or else a negative value.
  */
-int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
+int snapshot_output_init_with_uri(const struct ltt_session *session,
+		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);
+	return output_init(session, max_size, name, uris, nb_uri, consumer,
+			output, snapshot);
 }
 
 /*
@@ -147,7 +150,8 @@ int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
  *
  * Return 0 on success or else a negative value.
  */
-int snapshot_output_init(uint64_t max_size, const char *name,
+int snapshot_output_init(const struct ltt_session *session,
+		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)
@@ -162,8 +166,8 @@ int snapshot_output_init(uint64_t max_size, const char *name,
 		goto error;
 	}
 
-	ret = output_init(max_size, name, uris, nb_uri, consumer, output,
-			snapshot);
+	ret = output_init(session, max_size, name, uris, nb_uri, consumer,
+			output, snapshot);
 
 error:
 	free(uris);
@@ -321,7 +325,9 @@ void snapshot_destroy(struct snapshot *obj)
 	struct lttng_ht_iter iter;
 	struct snapshot_output *output;
 
-	assert(obj);
+	if (!obj->output_ht) {
+		return;
+	}
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(obj->output_ht->ht, &iter.iter, output,