X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=2385d392e68f985c9061e02ee1f6690692b3ff09;hb=8da6cd6d27941d7b3b67ea1878e32a0c20206468;hp=9d73da16fee45b0f28937d86f2a459d04c6767a2;hpb=14641debd03ba299bd06040cb62e0dbdef7fac81;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 9d73da16..2385d392 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -19,6 +19,7 @@
 #include <urcu/compiler.h>
 #include <urcu/uatomic.h>
 
+#include "smp.h"
 /* Internal helpers */
 #include "frontend_internal.h"
 
@@ -36,12 +37,12 @@
  */
 
 extern
-struct channel *channel_create(const struct lib_ring_buffer_config *config,
-			       const char *name, void *priv,
-			       void *buf_addr,
-			       size_t subbuf_size, size_t num_subbuf,
-			       unsigned int switch_timer_interval,
-			       unsigned int read_timer_interval);
+struct shm_handle *channel_create(const struct lib_ring_buffer_config *config,
+				const char *name, void *priv,
+				void *buf_addr,
+				size_t subbuf_size, size_t num_subbuf,
+				unsigned int switch_timer_interval,
+				unsigned int read_timer_interval);
 
 /*
  * channel_destroy returns the private data pointer. It finalizes all channel's
@@ -49,7 +50,7 @@ struct channel *channel_create(const struct lib_ring_buffer_config *config,
  * channel.
  */
 extern
-void *channel_destroy(struct channel *chan);
+void *channel_destroy(struct channel *chan, struct shm_handle *handle);
 
 
 /* Buffer read operations */
@@ -61,54 +62,63 @@ 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);	\
-		   cmm_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,
-				struct channel *chan, int cpu);
-extern int lib_ring_buffer_open_read(struct lib_ring_buffer *buf);
-extern void lib_ring_buffer_release_read(struct lib_ring_buffer *buf);
+				struct channel *chan, int cpu,
+				struct shm_handle *handle);
+extern int lib_ring_buffer_open_read(struct lib_ring_buffer *buf,
+				     struct shm_handle *handle);
+extern void lib_ring_buffer_release_read(struct lib_ring_buffer *buf,
+					 struct shm_handle *handle);
 
 /*
  * Read sequence: snapshot, many get_subbuf/put_subbuf, move_consumer.
  */
 extern int lib_ring_buffer_snapshot(struct lib_ring_buffer *buf,
 				    unsigned long *consumed,
-				    unsigned long *produced);
+				    unsigned long *produced,
+				    struct shm_handle *handle);
 extern void lib_ring_buffer_move_consumer(struct lib_ring_buffer *buf,
-					  unsigned long consumed_new);
+					  unsigned long consumed_new,
+					  struct shm_handle *handle);
 
 extern int lib_ring_buffer_get_subbuf(struct lib_ring_buffer *buf,
-				      unsigned long consumed);
-extern void lib_ring_buffer_put_subbuf(struct lib_ring_buffer *buf);
+				      unsigned long consumed,
+				      struct shm_handle *handle);
+extern void lib_ring_buffer_put_subbuf(struct lib_ring_buffer *buf,
+				       struct shm_handle *handle);
 
 /*
  * lib_ring_buffer_get_next_subbuf/lib_ring_buffer_put_next_subbuf are helpers
  * to read sub-buffers sequentially.
  */
-static inline int lib_ring_buffer_get_next_subbuf(struct lib_ring_buffer *buf)
+static inline int lib_ring_buffer_get_next_subbuf(struct lib_ring_buffer *buf,
+						  struct shm_handle *handle)
 {
 	int ret;
 
 	ret = lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
-				       &buf->prod_snapshot);
+				       &buf->prod_snapshot, handle);
 	if (ret)
 		return ret;
-	ret = lib_ring_buffer_get_subbuf(buf, buf->cons_snapshot);
+	ret = lib_ring_buffer_get_subbuf(buf, buf->cons_snapshot, handle);
 	return ret;
 }
 
-static inline void lib_ring_buffer_put_next_subbuf(struct lib_ring_buffer *buf)
+static inline
+void lib_ring_buffer_put_next_subbuf(struct lib_ring_buffer *buf,
+				     struct shm_handle *handle)
 {
-	lib_ring_buffer_put_subbuf(buf);
+	lib_ring_buffer_put_subbuf(buf, handle);
 	lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot,
-						    buf->backend.chan));
+							shmp(handle, buf->backend.chan)), handle);
 }
 
 extern void channel_reset(struct channel *chan);
-extern void lib_ring_buffer_reset(struct lib_ring_buffer *buf);
+extern void lib_ring_buffer_reset(struct lib_ring_buffer *buf,
+				  struct shm_handle *handle);
 
 static inline
 unsigned long lib_ring_buffer_get_offset(const struct lib_ring_buffer_config *config,
@@ -155,9 +165,10 @@ int lib_ring_buffer_channel_is_disabled(const struct channel *chan)
 static inline
 unsigned long lib_ring_buffer_get_read_data_size(
 				const struct lib_ring_buffer_config *config,
-				struct lib_ring_buffer *buf)
+				struct lib_ring_buffer *buf,
+				struct shm_handle *handle)
 {
-	return subbuffer_get_read_data_size(config, &buf->backend);
+	return subbuffer_get_read_data_size(config, &buf->backend, handle);
 }
 
 static inline