X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=libust%2Ftracer.h;h=164432731b85aca628633ac913a1e3984b510d70;hb=22cb38fbb2b49a37488e09c836e19f924d1ebbc8;hp=cc86d548ecfb39e6a4af5429289e0ee55de67da2;hpb=b4512257eb71d0432554047acf6278dc42a15a75;p=ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index cc86d54..1644327 100644
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -14,9 +14,10 @@
 
 #include <sys/types.h>
 #include <stdarg.h>
-#include "relay.h"
-#include "list.h"
+//#include "list.h"
 #include "kernelcompat.h"
+#include "buffer.h"
+#include "relay.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "marker.h"
@@ -135,9 +136,9 @@ struct ltt_trace_ops {
 				size_t *slot_size, long *buf_offset, u64 *tsc,
 				unsigned int *rflags,
 				int largest_align);
-	void (*commit_slot) (struct ltt_channel_struct *channel,
-				void **transport_data, long buf_offset,
-				size_t slot_size);
+//ust//	void (*commit_slot) (struct ltt_channel_struct *channel,
+//ust//				void **transport_data, long buf_offset,
+//ust//				size_t slot_size);
 	void (*wakeup_channel) (struct ltt_channel_struct *ltt_channel);
 	int (*user_blocking) (struct ltt_trace_struct *trace,
 				unsigned int index, size_t data_size,
@@ -430,23 +431,6 @@ static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace,
 
 /* Lockless LTTng */
 
-/* Buffer offset macros */
-
-/*
- * BUFFER_TRUNC zeroes the subbuffer offset and the subbuffer number parts of
- * the offset, which leaves only the buffer number.
- */
-#define BUFFER_TRUNC(offset, chan) \
-	((offset) & (~((chan)->alloc_size-1)))
-#define BUFFER_OFFSET(offset, chan) ((offset) & ((chan)->alloc_size - 1))
-#define SUBBUF_OFFSET(offset, chan) ((offset) & ((chan)->subbuf_size - 1))
-#define SUBBUF_ALIGN(offset, chan) \
-	(((offset) + (chan)->subbuf_size) & (~((chan)->subbuf_size - 1)))
-#define SUBBUF_TRUNC(offset, chan) \
-	((offset) & (~((chan)->subbuf_size - 1)))
-#define SUBBUF_INDEX(offset, chan) \
-	(BUFFER_OFFSET((offset), chan) >> (chan)->subbuf_size_order)
-
 /*
  * ltt_reserve_slot
  *
@@ -484,29 +468,29 @@ static inline int ltt_reserve_slot(
 }
 
 
-/*
- * ltt_commit_slot
- *
- * Atomic unordered slot commit. Increments the commit count in the
- * specified sub-buffer, and delivers it if necessary.
- *
- * Parameters:
- *
- * @channel : the chanel to reserve space into.
- * @transport_data : specific transport data.
- * @buf_offset : offset of beginning of reserved slot
- * @slot_size : size of the reserved slot.
- */
-static inline void ltt_commit_slot(
-		struct ltt_channel_struct *channel,
-		void **transport_data,
-		long buf_offset,
-		size_t slot_size)
-{
-	struct ltt_trace_struct *trace = channel->trace;
-
-	trace->ops->commit_slot(channel, transport_data, buf_offset, slot_size);
-}
+///*
+// * ltt_commit_slot
+// *
+// * Atomic unordered slot commit. Increments the commit count in the
+// * specified sub-buffer, and delivers it if necessary.
+// *
+// * Parameters:
+// *
+// * @channel : the chanel to reserve space into.
+// * @transport_data : specific transport data.
+// * @buf_offset : offset of beginning of reserved slot
+// * @slot_size : size of the reserved slot.
+// */
+//static inline void ltt_commit_slot(
+//		struct ltt_channel_struct *channel,
+//		void **transport_data,
+//		long buf_offset,
+//		size_t slot_size)
+//{
+//	struct ltt_trace_struct *trace = channel->trace;
+//
+//	trace->ops->commit_slot(channel, transport_data, buf_offset, slot_size);
+//}
 
 /*
  * Control channels :