X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=51632bad4ed602bcbc52fc769cc346bb709c74b3;hp=7592d774177a43abb8782424084c711e371bcc5c;hb=cea28771668f6fd337d00466ea9f01c12cda7467;hpb=36b588eddce05ef840bd247f6a58316925b9a0a2

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 7592d7741..51632bad4 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -26,6 +26,7 @@
 
 #include "buffer-registry.h"
 #include "trace-ust.h"
+#include "utils.h"
 
 /*
  * Match function for the events hash table lookup.
@@ -228,7 +229,7 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 	return lus;
 
 error_consumer:
-	lttng_ht_destroy(lus->domain_global.channels);
+	ht_cleanup_push(lus->domain_global.channels);
 	free(lus);
 error:
 	return NULL;
@@ -384,8 +385,8 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 	lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
 	lum->attr.subbuf_size = default_get_metadata_subbuf_size();
 	lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
-	lum->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER;
-	lum->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER;
+	lum->attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+	lum->attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
 	lum->attr.output = LTTNG_UST_MMAP;
 
 	lum->handle = -1;
@@ -483,7 +484,7 @@ static void destroy_contexts(struct lttng_ht *ht)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(ht);
+	ht_cleanup_push(ht);
 }
 
 /*
@@ -530,7 +531,7 @@ static void destroy_events(struct lttng_ht *events)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(events);
+	ht_cleanup_push(events);
 }
 
 /*
@@ -604,7 +605,7 @@ static void destroy_channels(struct lttng_ht *channels)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(channels);
+	ht_cleanup_push(channels);
 }
 
 /*