X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=4c7dac8b72111f33904e7fef69a53e77578171cb;hp=864a4b0d1bb0dcd25c2e2de54b16999f8d3d22cc;hb=178191b3899f114001f000c2e7f46909969f9c6f;hpb=09a90bcd757486eebb38d6d6023c603d9af72b4e

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 864a4b0d1..4c7dac8b7 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -274,12 +274,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 
 	/* Init node */
 	lttng_ht_node_init_str(&lue->node, lue->attr.name);
-	/* Alloc context hash tables */
-	lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
-	if (lue->ctx == NULL) {
-		ERR("Unable to create context hash table for event %s", ev->name);
-		goto error_free_event;
-	}
 
 	DBG2("Trace UST event %s, loglevel (%d,%d) created",
 		lue->attr.name, lue->attr.loglevel_type,
@@ -311,7 +305,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
 	/* Set default attributes */
 	lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	lum->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+	lum->attr.subbuf_size = default_get_metadata_subbuf_size();
 	lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
 	lum->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 	lum->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
@@ -415,7 +409,6 @@ static void destroy_contexts(struct lttng_ht *ht)
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 	DBG2("Trace destroy UST event %s", event->attr.name);
-	destroy_contexts(event->ctx);
 	free(event->filter);
 	free(event);
 }