X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=c9f98cb79810dd9385e578da5f520c60e8582340;hb=14641debd03ba299bd06040cb62e0dbdef7fac81;hp=f89d803cefacb59542b6e1f095e2ac8c0aa93950;hpb=4b4de73e56cad17f87de69bd9386389ed69c0a12;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index f89d803c..c9f98cb7 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -16,9 +16,15 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#include <urcu/list.h>
+#include <urcu/uatomic.h>
+#include <urcu/ref.h>
+
+#include "ust/core.h"
+
+#include "usterr_signal_safe.h"
 #include "config.h"
 #include "backend_types.h"
-#include "../lib_prio_heap/lttng_prio_heap.h"	/* For per-CPU read-side iterator */
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -26,24 +32,9 @@
  */
 enum switch_mode { SWITCH_ACTIVE, SWITCH_FLUSH };
 
-/* channel-level read-side iterator */
-struct channel_iter {
-	/* Prio heap of buffers. Lowest timestamps at the top. */
-	struct lttng_ptr_heap heap;	/* Heap of struct lib_ring_buffer ptrs */
-	struct list_head empty_head;	/* Empty buffers linked-list head */
-	int read_open;			/* Opened for reading ? */
-	u64 last_qs;			/* Last quiescent state timestamp */
-	u64 last_timestamp;		/* Last timestamp (for WARN_ON) */
-	int last_cpu;			/* Last timestamp cpu */
-	/*
-	 * read() file operation state.
-	 */
-	unsigned long len_left;
-};
-
 /* channel: collection of per-cpu ring buffers. */
 struct channel {
-	atomic_t record_disabled;
+	int record_disabled;
 	unsigned long commit_count_mask;	/*
 						 * Commit count mask, removing
 						 * the MSBs corresponding to
@@ -55,16 +46,9 @@ struct channel {
 
 	unsigned long switch_timer_interval;	/* Buffer flush (jiffies) */
 	unsigned long read_timer_interval;	/* Reader wakeup (jiffies) */
-	struct notifier_block cpu_hp_notifier;	/* CPU hotplug notifier */
-	struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
-	struct notifier_block hp_iter_notifier;	/* hotplug iterator notifier */
-	int cpu_hp_enable:1;			/* Enable CPU hotplug notif. */
-	int hp_iter_enable:1;			/* Enable hp iter notif. */
-	wait_queue_head_t read_wait;		/* reader wait queue */
-	wait_queue_head_t hp_wait;		/* CPU hotplug wait queue */
+	//wait_queue_head_t read_wait;		/* reader wait queue */
 	int finalized;				/* Has channel been finalized */
-	struct channel_iter iter;		/* Channel read-side iterator */
-	struct kref ref;			/* Reference count */
+	struct urcu_ref ref;			/* Reference count */
 };
 
 /* Per-subbuffer commit counters used on the hot path */
@@ -78,35 +62,17 @@ struct commit_counters_cold {
 	union v_atomic cc_sb;		/* Incremented _once_ at sb switch */
 };
 
-/* Per-buffer read iterator */
-struct lib_ring_buffer_iter {
-	u64 timestamp;			/* Current record timestamp */
-	size_t header_len;		/* Current record header length */
-	size_t payload_len;		/* Current record payload length */
-
-	struct list_head empty_node;	/* Linked list of empty buffers */
-	unsigned long consumed, read_offset, data_size;
-	enum {
-		ITER_GET_SUBBUF = 0,
-		ITER_TEST_RECORD,
-		ITER_NEXT_RECORD,
-		ITER_PUT_SUBBUF,
-	} state;
-	int allocated:1;
-	int read_open:1;		/* Opened for reading ? */
-};
-
 /* ring buffer state */
 struct lib_ring_buffer {
 	/* First 32 bytes cache-hot cacheline */
 	union v_atomic offset;		/* Current offset in the buffer */
 	struct commit_counters_hot *commit_hot;
 					/* Commit count per sub-buffer */
-	atomic_long_t consumed;		/*
+	long consumed;			/*
 					 * Current offset in the buffer
 					 * standard atomic access (shared)
 					 */
-	atomic_t record_disabled;
+	int record_disabled;
 	/* End of first 32 bytes cacheline */
 	union v_atomic last_tsc;	/*
 					 * Last timestamp written in the buffer.
@@ -116,7 +82,7 @@ struct lib_ring_buffer {
 
 	struct commit_counters_cold *commit_cold;
 					/* Commit count per sub-buffer */
-	atomic_long_t active_readers;	/*
+	long active_readers;		/*
 					 * Active readers count
 					 * standard atomic access (shared)
 					 */
@@ -126,12 +92,10 @@ struct lib_ring_buffer {
 	union v_atomic records_lost_big;	/* Events too big */
 	union v_atomic records_count;	/* Number of records written */
 	union v_atomic records_overrun;	/* Number of overwritten records */
-	wait_queue_head_t read_wait;	/* reader buffer-level wait queue */
+	//wait_queue_head_t read_wait;	/* reader buffer-level wait queue */
 	int finalized;			/* buffer has been finalized */
-	struct timer_list switch_timer;	/* timer for periodical switch */
-	struct timer_list read_timer;	/* timer for read poll */
-	raw_spinlock_t raw_tick_nohz_spinlock;	/* nohz entry lock/trylock */
-	struct lib_ring_buffer_iter iter;	/* read-side iterator */
+	//struct timer_list switch_timer;	/* timer for periodical switch */
+	//struct timer_list read_timer;	/* timer for read poll */
 	unsigned long get_subbuf_consumed;	/* Read-side consumed */
 	unsigned long prod_snapshot;	/* Producer count snapshot */
 	unsigned long cons_snapshot;	/* Consumer count snapshot */
@@ -157,14 +121,14 @@ void *channel_get_private(struct channel *chan)
 		int _____ret = unlikely(cond);				\
 		if (_____ret) {						\
 			if (__same_type(*(c), struct channel_backend))	\
-				__chan = container_of((void *) (c),	\
+				__chan = caa_container_of((void *) (c),	\
 							struct channel, \
 							backend);	\
 			else if (__same_type(*(c), struct channel))	\
 				__chan = (void *) (c);			\
 			else						\
 				BUG_ON(1);				\
-			atomic_inc(&__chan->record_disabled);		\
+			uatomic_inc(&__chan->record_disabled);		\
 			WARN_ON(1);					\
 		}							\
 		_____ret;						\