X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=5975789f8a95372f9fe0803bb2caa9eb0fbe0bcc;hb=67e5f39161d80ea3d972a37ecf76f45a260c480d;hp=ee5364fc927b0b0fea36756c932c4dd2b73184e8;hpb=38fae1d354502ffb37f471fbd0fef03412606cc0;p=lttng-ust.git

diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index ee5364fc..5975789f 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -19,6 +19,7 @@
  */
 
 #define _LARGEFILE64_SOURCE
+#define _GNU_SOURCE
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,6 +28,8 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
@@ -36,7 +39,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <ust/lttng-ust-comm.h>
+#include <ust-comm.h>
 #include <../../libringbuffer/backend.h>
 #include <../../libringbuffer/frontend.h>
 
@@ -208,10 +211,10 @@ static
 int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
 {
 	struct channel *chan;
-	struct lib_ring_buffer *buf;
+	struct lttng_ust_lib_ring_buffer *buf;
 	int outfd, ret;
-	int shm_fd, wait_fd;
-	uint64_t memory_map_size;
+	int *shm_fd, *wait_fd;
+	uint64_t *memory_map_size;
 
 	chan = shmp(handle, handle->chan);
 
@@ -259,7 +262,7 @@ int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
 		printf("WRITE: copy %lu bytes\n", read_size);
 		copy_size = write(outfd, ptr, read_size);
 		if (copy_size < read_size) {
-			printf("write issue: copied %zd, expected %lu\n", copy_size, read_size);
+			printf("write issue: copied %lu, expected %lu\n", copy_size, read_size);
 		}
 		lib_ring_buffer_put_next_subbuf(buf, handle);
 	}