X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.c;h=00d61432e33aea82a3d77fe17a96bdf00fad2646;hp=af78dc00086fdd506e175de11239b0325f8a0a4f;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hpb=13dce3b738049495c54e14b7401c6f2aa421f5ed

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index af78dc000..00d61432e 100644
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -24,7 +24,7 @@
 #include <lttngerr.h>
 #include <lttng-share.h>
 
-#include "hashtable.h"
+#include "../common/hashtable.h"
 #include "trace-ust.h"
 
 /*
@@ -63,7 +63,7 @@ struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
 	struct cds_lfht_iter iter;
 
 	rcu_read_lock();
-	node = hashtable_lookup(ht, (void *) name, strlen(name), &iter);
+	node = hashtable_lookup(ht, (void *)name, strlen(name), &iter);
 	if (node == NULL) {
 		rcu_read_unlock();
 		goto error;
@@ -84,7 +84,7 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
+struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
 		struct lttng_domain *domain)
 {
 	int ret;
@@ -98,7 +98,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
 	}
 
 	/* Init data structure */
-	lus->uid = uid;
+	lus->id = session_id;
 	lus->start_trace = 0;
 
 	/* Alloc UST domain hash tables */
@@ -158,7 +158,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	}
 
 	/* Copy channel name */
-	strncpy(luc->name, chan->name, sizeof(&luc->name));
+	strncpy(luc->name, chan->name, sizeof(luc->name));
 	luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	/* Init node */
@@ -507,7 +507,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	rcu_read_lock();
 
-	DBG2("Trace UST destroy session %d", session->uid);
+	DBG2("Trace UST destroy session %d", session->id);
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);