X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=fe301c1b4ee981268fdc8f4e71e8de241ceae012;hb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;hp=1eb4ae92d6c69cab1f184f572b21c647f5f866ee;hpb=4931a13e87ddbbabe4911e622e78c85b2197ecbf;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 1eb4ae92..fe301c1b 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -16,6 +16,10 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+
+#include "smp.h"
 /* Internal helpers */
 #include "frontend_internal.h"
 
@@ -38,7 +42,8 @@ struct channel *channel_create(const struct lib_ring_buffer_config *config,
 			       void *buf_addr,
 			       size_t subbuf_size, size_t num_subbuf,
 			       unsigned int switch_timer_interval,
-			       unsigned int read_timer_interval);
+			       unsigned int read_timer_interval,
+			       int *shmid);
 
 /*
  * channel_destroy returns the private data pointer. It finalizes all channel's
@@ -58,9 +63,7 @@ void *channel_destroy(struct channel *chan);
  * only performed at channel destruction.
  */
 #define for_each_channel_cpu(cpu, chan)					\
-	for ((cpu) = -1;						\
-		({ (cpu) = cpumask_next(cpu, (chan)->backend.cpumask);	\
-		   smp_read_barrier_depends(); (cpu) < nr_cpu_ids; });)
+	for_each_possible_cpu(cpu)
 
 extern struct lib_ring_buffer *channel_get_ring_buffer(
 				const struct lib_ring_buffer_config *config,
@@ -101,7 +104,7 @@ static inline void lib_ring_buffer_put_next_subbuf(struct lib_ring_buffer *buf)
 {
 	lib_ring_buffer_put_subbuf(buf);
 	lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot,
-						    buf->backend.chan));
+						    shmp(buf->backend.chan)));
 }
 
 extern void channel_reset(struct channel *chan);
@@ -118,7 +121,7 @@ static inline
 unsigned long lib_ring_buffer_get_consumed(const struct lib_ring_buffer_config *config,
 					   struct lib_ring_buffer *buf)
 {
-	return atomic_long_read(&buf->consumed);
+	return uatomic_read(&buf->consumed);
 }
 
 /*
@@ -129,11 +132,11 @@ static inline
 int lib_ring_buffer_is_finalized(const struct lib_ring_buffer_config *config,
 				 struct lib_ring_buffer *buf)
 {
-	int finalized = ACCESS_ONCE(buf->finalized);
+	int finalized = CMM_ACCESS_ONCE(buf->finalized);
 	/*
 	 * Read finalized before counters.
 	 */
-	smp_rmb();
+	cmm_smp_rmb();
 	return finalized;
 }
 
@@ -146,7 +149,7 @@ int lib_ring_buffer_channel_is_finalized(const struct channel *chan)
 static inline
 int lib_ring_buffer_channel_is_disabled(const struct channel *chan)
 {
-	return atomic_read(&chan->record_disabled);
+	return uatomic_read(&chan->record_disabled);
 }
 
 static inline