tap-driver.sh: flush stdout after each test result

[babeltrace.git] / ctfser / ctfser.c

diff --git a/ctfser/ctfser.c b/ctfser/ctfser.c
index e06972b9801c5d059788ef92543d7eb0ff3e18e7..32cc9d0b848271dc44038c1f51a88cb642bf80ca 100644 (file)
--- a/ctfser/ctfser.c
+++ b/ctfser/ctfser.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <glib.h>
@@ -37,11 +37,11 @@
 #include <stdio.h>
 #include <wchar.h>
 #include <stdbool.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/ctfser-internal.h>
-#include <babeltrace/compat/unistd-internal.h>
-#include <babeltrace/compat/fcntl-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/ctfser-internal.h>
+#include <babeltrace2/compat/unistd-internal.h>
+#include <babeltrace2/compat/fcntl-internal.h>
 
 static inline
 uint64_t get_packet_size_increment_bytes(void)
@@ -52,7 +52,8 @@ uint64_t get_packet_size_increment_bytes(void)
 static inline
 void mmap_align_ctfser(struct bt_ctfser *ctfser)
 {
-       ctfser->base_mma = mmap_align(ctfser->cur_packet_size_bytes, PROT_WRITE,
+       ctfser->base_mma = mmap_align(ctfser->cur_packet_size_bytes,
+               PROT_READ | PROT_WRITE,
                MAP_SHARED, ctfser->fd, ctfser->mmap_offset);
 }