X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-usertrace%2Fltt%2Fltt-usertrace-fast.h;h=bfca0c10d5b994b4df5292bb02c7481e8ea1a865;hb=3a4541a514dc6da3580401c084489910bc769ab7;hp=4d7c56ba808872a18596e38e19c44a7636d14f31;hpb=38f24d5cd982084f488f6e09d7d007e98fe1e20c;p=lttv.git

diff --git a/ltt-usertrace/ltt/ltt-usertrace-fast.h b/ltt-usertrace/ltt/ltt-usertrace-fast.h
index 4d7c56ba..bfca0c10 100644
--- a/ltt-usertrace/ltt/ltt-usertrace-fast.h
+++ b/ltt-usertrace/ltt/ltt-usertrace-fast.h
@@ -12,16 +12,13 @@
 #ifdef LTT_TRACE_FAST
 
 #include <errno.h>
-#include <asm/atomic.h>
 #include <pthread.h>
 #include <stdint.h>
 #include <syscall.h>
-#include <asm/timex.h>
 #include <semaphore.h>
 #include <signal.h>
 
 #include <ltt/ltt-facility-id-user_generic.h>
-#include <ltt/ltt-generic.h>
 
 #ifndef	LTT_N_SUBBUFS
 #define LTT_N_SUBBUFS 2
@@ -58,8 +55,6 @@
 #define atomic_cmpxchg(v, old, new) ((int)cmpxchg(&((v)->counter), old, new))
 #endif //atomic_cmpxchg
 
-typedef unsigned int ltt_facility_t;
-	
 struct ltt_trace_header {
 	uint32_t				magic_number;
 	uint32_t				arch_type;
@@ -353,7 +348,7 @@ static inline void * __attribute__((no_instrument_function)) ltt_reserve_slot(
 															struct ltt_trace_info *trace,
 															struct ltt_buf *ltt_buf,
 															unsigned int data_size,
-															unsigned int *slot_size,
+															size_t *slot_size,
 															uint64_t *tsc,
 															size_t *before_hdr_pad,
 															size_t *after_hdr_pad,
@@ -479,7 +474,7 @@ static inline void * __attribute__((no_instrument_function)) ltt_reserve_slot(
 			 index in the buffer being the one which will win this loop. */
 		/* If the buffer is not in overwrite mode, pushing the reader only
 			 happen if a sub-buffer is corrupted */
-		if((SUBBUF_TRUNC(offset_end, ltt_buf) 
+		if((SUBBUF_TRUNC(offset_end-1, ltt_buf) 
 					- SUBBUF_TRUNC(consumed_old, ltt_buf)) 
 							>= ltt_buf->alloc_size)
 			consumed_new = SUBBUF_ALIGN(consumed_old, ltt_buf);