X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=b3c97ea10f0397ebdfbf4a99f6dfea85a41358bb;hb=5ad63a1632792c8bc40fa5bc9f7f45f037a68032;hp=59f54a9c93efa0375c4dc69a998b73d27bf3aabd;hpb=57773204abc43ed7d4350ac0d641ddbbda1e441e;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 59f54a9c..b3c97ea1 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include "lttng-ust-comm.h"
+#include <ust-comm.h>
 #include <../../libringbuffer/backend.h>
 #include <../../libringbuffer/frontend.h>
 
@@ -51,18 +51,11 @@ const char *evname[] = {
 	"ust_tests_hello_dontexist",
 };
 
-struct object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle[NR_SESSIONS];
-static struct object_data metadata_stream_data[NR_SESSIONS];
-static struct object_data metadata_data[NR_SESSIONS];
-static struct object_data channel_data[NR_SESSIONS][NR_CHANNELS];
-static struct object_data stream_data[NR_SESSIONS][NR_CHANNELS][MAX_NR_STREAMS];
+static struct lttng_ust_object_data metadata_stream_data[NR_SESSIONS];
+static struct lttng_ust_object_data metadata_data[NR_SESSIONS];
+static struct lttng_ust_object_data channel_data[NR_SESSIONS][NR_CHANNELS];
+static struct lttng_ust_object_data stream_data[NR_SESSIONS][NR_CHANNELS][MAX_NR_STREAMS];
 static int event_handle[NR_SESSIONS][NR_CHANNELS][NR_EVENTS];
 
 static int apps_socket = -1;
@@ -77,7 +70,7 @@ static void handle_signals(int signo)
 }
 
 static
-int open_streams(int sock, int channel_handle, struct object_data *stream_datas,
+int open_streams(int sock, int channel_handle, struct lttng_ust_object_data *stream_datas,
 		int nr_check)
 {
 	int ret, k = 0;
@@ -121,7 +114,7 @@ int open_streams(int sock, int channel_handle, struct object_data *stream_datas,
 }
 
 static
-int close_streams(int sock, struct object_data *stream_datas, int nr_check)
+int close_streams(int sock, struct lttng_ust_object_data *stream_datas, int nr_check)
 {
 	int ret, k;
 
@@ -158,10 +151,10 @@ int close_streams(int sock, struct object_data *stream_datas, int nr_check)
 }
 
 static
-struct shm_handle *map_channel(struct object_data *chan_data,
-		struct object_data *stream_datas, int nr_check)
+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;
 
@@ -178,7 +171,7 @@ struct shm_handle *map_channel(struct object_data *chan_data,
 	chan = shmp(handle, handle->chan);
 
 	for (k = 0; k < nr_check; k++) {
-		struct object_data *stream_data = &stream_datas[k];
+		struct lttng_ust_object_data *stream_data = &stream_datas[k];
 
 		if (!stream_data->handle)
 			break;
@@ -202,7 +195,7 @@ error_destroy:
 }
 
 static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan;
 
@@ -212,13 +205,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);
 
@@ -266,7 +259,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);
 	}
@@ -290,7 +283,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);