X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fchannel.c;h=3870af4beb5ae407fd1d2ee527f41cd54cf2df03;hp=b61e1fb6792b8d1eaa5c1ac79a8f5ce94a7a6420;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hpb=9674ce7a9c5218066b395d1f6d1f19f277849f95

diff --git a/ltt-sessiond/channel.c b/ltt-sessiond/channel.c
index b61e1fb67..3870af4be 100644
--- a/ltt-sessiond/channel.c
+++ b/ltt-sessiond/channel.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "channel.h"
+#include "hashtable.h"
 #include "kernel-ctl.h"
 #include "ust-ctl.h"
 #include "utils.h"
@@ -87,11 +88,12 @@ error_alloc:
 int channel_ust_copy(struct ltt_ust_channel *dst,
 		struct ltt_ust_channel *src)
 {
-	struct ltt_ust_event *uevent, *new_uevent;
+	//struct ltt_ust_event *uevent, *new_uevent;
 
 	memcpy(dst, src, sizeof(struct ltt_ust_channel));
-	CDS_INIT_LIST_HEAD(&dst->events.head);
+	dst->events = hashtable_new_str(0);
 
+	/*
 	cds_list_for_each_entry(uevent, &src->events.head, list) {
 		new_uevent = malloc(sizeof(struct ltt_ust_event));
 		if (new_uevent == NULL) {
@@ -103,11 +105,12 @@ int channel_ust_copy(struct ltt_ust_channel *dst,
 		cds_list_add(&new_uevent->list, &dst->events.head);
 		dst->events.count++;
 	}
+	*/
 
 	return 0;
 
-error:
-	return -1;
+//error:
+//	return -1;
 }
 
 /*
@@ -225,9 +228,10 @@ int channel_ust_create(struct ltt_ust_session *usession,
 
 	suchan = trace_ust_create_channel(attr, usession->path);
 	if (suchan == NULL) {
-		ret = LTTCOMM_FATAL;
+		ret = LTTCOMM_UST_CHAN_FAIL;
 		goto error;
 	}
+
 	uattr.overwrite = attr->attr.overwrite;
 	uattr.subbuf_size = attr->attr.subbuf_size;
 	uattr.num_subbuf = attr->attr.num_subbuf;
@@ -240,6 +244,7 @@ int channel_ust_create(struct ltt_ust_session *usession,
 		ret = LTTCOMM_UST_CHAN_FAIL;
 		goto error;
 	}
+
 	suchan->attr.overwrite = uattr.overwrite;
 	suchan->attr.subbuf_size = uattr.subbuf_size;
 	suchan->attr.num_subbuf = uattr.num_subbuf;