X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=d0ff92779d805ccd78df386e93f9f9c37491f0dc;hb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;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..d0ff9277 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -151,10 +151,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 +195,7 @@ error_destroy:
 }
 
 static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan;
 
@@ -205,10 +205,10 @@ 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;
@@ -283,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);