X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=dc91b847e39abbc5a210eb3a318c8c990d0f1425;hb=5cd198029b32a694091328e73035dcf8bc26045e;hp=2869b0e0c13d30f3d75d6900cb4762c2b5f15170;hpb=92462b01cae094cbb15052c3a4775071319121fb;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 2869b0e0..dc91b847 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,9 +39,10 @@
 #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>
+#include "../../liblttng-ust/compat.h"	/* For ENODATA */
 
 #define NR_SESSIONS	4
 #define NR_CHANNELS	1
@@ -151,10 +155,10 @@ int close_streams(int sock, struct lttng_ust_object_data *stream_datas, int nr_c
 }
 
 static
-struct shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
+struct lttng_ust_shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
 		struct lttng_ust_object_data *stream_datas, int nr_check)
 {
-	struct shm_handle *handle;
+	struct lttng_ust_shm_handle *handle;
 	struct channel *chan;
 	int k, ret;
 
@@ -195,7 +199,7 @@ error_destroy:
 }
 
 static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan;
 
@@ -205,13 +209,13 @@ void unmap_channel(struct shm_handle *handle)
 }
 
 static
-int consume_stream(struct shm_handle *handle, int cpu, char *outfile)
+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);
 
@@ -226,7 +230,7 @@ int consume_stream(struct shm_handle *handle, int cpu, char *outfile)
 	}
 
 	/* copy */
-	outfd = open(outfile, O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC,
+	outfd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 	if (outfd < 0) {
 		perror("open output");
@@ -259,7 +263,7 @@ int consume_stream(struct 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);
 	}
@@ -283,7 +287,7 @@ int consume_buffers(void)
 
 	for (i = 0; i < NR_SESSIONS; i++) {
 		char pathname[PATH_MAX];
-		struct shm_handle *handle;
+		struct lttng_ust_shm_handle *handle;
 
 		snprintf(pathname, PATH_MAX - 1, "/tmp/testtrace%u", i);
 		old_umask = umask(0);