X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fust-basic-tracing%2Fust-basic-tracing.c;h=43628bd44cec2e1f4bd72dc88283ea7ca54929f3;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=d9339e91cd958135cd3fc83c2dcd3ae1a1f7d12d;hpb=61f02aea2c4336e2789e2dc97380835b17e5a427;p=lttng-ust.git

diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index d9339e91..43628bd4 100644
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -36,20 +36,13 @@
 #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"
 
 #define MAX_NR_STREAMS	64
 #define MAX_NR_EVENTS	128
 
-struct lttng_ust_object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle;
 static struct lttng_ust_object_data metadata_stream_data;
 static struct lttng_ust_object_data metadata_data;
@@ -151,10 +144,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 +188,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 +198,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;
@@ -281,7 +274,7 @@ int consume_buffers(const char *outputpath)
 	int k, ret;
 	mode_t old_umask;
 	char pathname[PATH_MAX];
-	struct shm_handle *handle;
+	struct lttng_ust_shm_handle *handle;
 
 	snprintf(pathname, PATH_MAX - 1, "%s", outputpath);
 	old_umask = umask(0);