Update to urcu/ref.h and urcu/uatomic.h

[ust.git] / libust / channels.h

diff --git a/libust/channels.h b/libust/channels.h
index 2000430d9f42041c80d0820fa25e0f88b6963335..eb9a11c76849d1d6f88fb940ab89ea819f0952cc 100644 (file)
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -21,11 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <linux/limits.h>
 #include <errno.h>
 #include <ust/kcompat/kcompat.h>
-#include <urcu/list.h>
 #include <ust/core.h>
+#include <urcu/list.h>
+#include <urcu/ref.h>
 
 #define EVENTS_PER_CHANNEL     65536
 #define MAX_CPUS               32
@@ -52,7 +54,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;
@@ -61,14 +63,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];