X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=65fe84b7d37617a17d3d4a68130d2138158f1a8d;hp=8fb685c8d2ab62d4123997fef2be46510e448ebf;hb=d9bf3ca437aa801c9364ca06b1083f83c6f8ef30;hpb=0a9c649428b2ea8d4e743aebc12585eeb58fcf64

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 8fb685c8d..65fe84b7d 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -20,12 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
 
 #include "buffer-registry.h"
 #include "trace-ust.h"
+#include "utils.h"
 
 /*
  * Match function for the events hash table lookup.
@@ -180,7 +182,7 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
+struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 {
 	struct ltt_ust_session *lus;
 
@@ -228,7 +230,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;
@@ -483,7 +485,7 @@ static void destroy_contexts(struct lttng_ht *ht)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(ht);
+	ht_cleanup_push(ht);
 }
 
 /*
@@ -530,7 +532,7 @@ static void destroy_events(struct lttng_ht *events)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(events);
+	ht_cleanup_push(events);
 }
 
 /*
@@ -570,6 +572,23 @@ void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 	call_rcu(&channel->node.head, destroy_channel_rcu);
 }
 
+/*
+ * Remove an UST channel from a channel HT.
+ */
+void trace_ust_delete_channel(struct lttng_ht *ht,
+		struct ltt_ust_channel *channel)
+{
+	int ret;
+	struct lttng_ht_iter iter;
+
+	assert(ht);
+	assert(channel);
+
+	iter.iter.node = &channel->node.node;
+	ret = lttng_ht_del(ht, &iter);
+	assert(!ret);
+}
+
 /*
  * Cleanup ust metadata structure.
  */
@@ -604,7 +623,7 @@ static void destroy_channels(struct lttng_ht *channels)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(channels);
+	ht_cleanup_push(channels);
 }
 
 /*
@@ -628,7 +647,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	assert(session);
 
-	DBG2("Trace UST destroy session %u", session->id);
+	DBG2("Trace UST destroy session %" PRIu64, session->id);
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);