X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=inline;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=dfbbcd777a264d0bcccc39253dbecc344f3f5abf;hb=14fb1ebe1000da2c3ccca45e7e97ad6637947cfe;hp=70b3a91a30edb48689a4b5c2f0f988783ff4317a;hpb=d28f6a948209434945e785f2ad3b89aaa67897e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 70b3a91a3..dfbbcd777 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -218,7 +218,15 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 	/* Init data structure */
 	lus->id = session_id;
-	lus->start_trace = 0;
+	lus->active = 0;
+
+	/* Set default metadata channel attribute. */
+	lus->metadata_attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+	lus->metadata_attr.subbuf_size = default_get_metadata_subbuf_size();
+	lus->metadata_attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
+	lus->metadata_attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+	lus->metadata_attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
+	lus->metadata_attr.output = LTTNG_UST_MMAP;
 
 	/*
 	 * Default buffer type. This can be changed through an enable channel
@@ -332,6 +340,7 @@ error:
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion)
 {
@@ -386,6 +395,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 	}
 
 	/* Same layout. */
+	lue->filter_expression = filter_expression;
 	lue->filter = (struct lttng_ust_filter_bytecode *) filter;
 	lue->exclusion = (struct lttng_event_exclusion *) exclusion;
 
@@ -503,7 +513,9 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 	assert(event);
 
 	DBG2("Trace destroy UST event %s", event->attr.name);
+	free(event->filter_expression);
 	free(event->filter);
+	free(event->exclusion);
 	free(event);
 }