Move include/ust/ to include/lttng/

[lttng-ust.git] / tests / ust-multi-test / ust-multi-test.c

diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index 130da70450637d3d689260a0d02e8df21f5262b6..541ed44b22bf04764099e808c36f99a15a02760d 100644 (file)
--- 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 <ust/lttng-ust-comm.h>
+#include <lttng/ust-comm.h>
 #include <../../libringbuffer/backend.h>
 #include <../../libringbuffer/frontend.h>
 
@@ -51,13 +51,6 @@ const char *evname[] = {
        "ust_tests_hello_dontexist",
 };
 
-struct lttng_ust_object_data {
-       int handle;
-       int shm_fd;
-       int wait_fd;
-       uint64_t memory_map_size;
-};
-
 static int session_handle[NR_SESSIONS];
 static struct lttng_ust_object_data metadata_stream_data[NR_SESSIONS];
 static struct lttng_ust_object_data metadata_data[NR_SESSIONS];
@@ -158,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;
 
@@ -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,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;
@@ -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);