X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fchannels.h;h=e7bc59fefb36be0e4b4c513077c19b5f7939651d;hb=1d7304a3f27fd639b513415c27b759e133e3d484;hp=693bf82bedc9bac9208abd66d491fd878ed9efb4;hpb=8649cd59b1c15b8d4097cf63f733e8007d76ad13;p=ust.git

diff --git a/libust/channels.h b/libust/channels.h
index 693bf82..e7bc59f 100644
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -23,8 +23,12 @@
 
 #include <linux/limits.h>
 #include <errno.h>
+#include <ust/kcompat/kcompat.h>
+#include <ust/core.h>
 
-#include <ust/kernelcompat.h>
+#define _LGPL_SOURCE
+#include <urcu/list.h>
+#include <urcu/urcu_ref.h>
 
 #define EVENTS_PER_CHANNEL	65536
 #define MAX_CPUS		32
@@ -51,7 +55,7 @@ struct ust_channel {
 						 */
 	/* End of first 32 bytes cacheline */
 
-	struct kref kref;	/* Channel transport reference count */
+	struct urcu_ref urcu_ref;	/* Channel transport reference count */
 	size_t subbuf_size;
 	int subbuf_size_order;
 	unsigned int subbuf_cnt;
@@ -60,14 +64,14 @@ struct ust_channel {
 
 	u32 version;
 	size_t alloc_size;
-	struct list_head list;
+	struct cds_list_head list;
 } ____cacheline_aligned;
 
 struct ltt_channel_setting {
 	unsigned int subbuf_size;
 	unsigned int subbuf_cnt;
-	struct kref kref;	/* Number of references to structure content */
-	struct list_head list;
+	struct urcu_ref urcu_ref;	/* Number of references to structure content */
+	struct cds_list_head list;
 	unsigned int index;	/* index of channel in trace channel array */
 	u16 free_event_id;	/* Next event ID to allocate */
 	char name[PATH_MAX];