X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracer.h;h=164432731b85aca628633ac913a1e3984b510d70;hb=27ac60757bacb8a0cdc9c1a73400b36f50689730;hp=70d1c10d7851a2988bb3c7a465668e29b6efc2cc;hpb=8431032f4fc1ce2c758568e27685a3e46265a745;p=lttng-ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index 70d1c10d..16443273 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"
@@ -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
  *