update for v2.6.17

[lttv.git] / ltt-usertrace / ltt-usertrace-fast.c

diff --git a/ltt-usertrace/ltt-usertrace-fast.c b/ltt-usertrace/ltt-usertrace-fast.c
index 1364d3bb6a0a15c1fa0f15620ffccf2b104ba116..2d22ce9b98a45dd1fb2500ea63a31e1bf5f9088e 100644 (file)
--- a/ltt-usertrace/ltt-usertrace-fast.c
+++ b/ltt-usertrace/ltt-usertrace-fast.c
@@ -46,8 +46,6 @@
 #define _GNU_SOURCE
 #define LTT_TRACE
 #define LTT_TRACE_FAST
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,22 +55,25 @@
 #include <pthread.h>
 #include <malloc.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <linux/unistd.h>
 
-#include <asm/atomic.h>
+// included with hack for powerpc in ltt-usertrace.h #include <asm/atomic.h>
 #include <asm/timex.h> //for get_cycles()
 
-_syscall0(pid_t,gettid)
-
 #include <ltt/ltt-usertrace.h>
 
+_syscall0(pid_t,gettid);
+
 #ifdef LTT_SHOW_DEBUG
 #define dbg_printf(...) printf(__VA_ARGS__)
 #else
@@ -205,7 +206,7 @@ static void flush_buffer(struct ltt_buf *ltt_buf, enum force_switch_mode mode)
                                 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);