X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fust-basic-tracing%2Fust-basic-tracing.c;h=da2852f893b41aaf47879bf0397a9693cc5e21e8;hb=ef9ff354212ff4b038e1a5b6a7ed0ffe1b949663;hp=a0ed9796ed2a8a6314b8d4be6bf1672d330770e8;hpb=e41474be35fb9a706872316b06127d108b86b617;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 a0ed9796..da2852f8 100644
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -36,25 +36,18 @@
 #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"
 
 #define MAX_NR_STREAMS	64
 #define MAX_NR_EVENTS	128
 
-struct object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle;
-static struct object_data metadata_stream_data;
-static struct object_data metadata_data;
-static struct object_data channel_data;
-static struct object_data stream_data[MAX_NR_STREAMS];
+static struct lttng_ust_object_data metadata_stream_data;
+static struct lttng_ust_object_data metadata_data;
+static struct lttng_ust_object_data channel_data;
+static struct lttng_ust_object_data stream_data[MAX_NR_STREAMS];
 static int event_handle[MAX_NR_EVENTS];
 static int context_handle;
 
@@ -70,7 +63,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;
@@ -114,7 +107,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;
 
@@ -151,10 +144,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;
 
@@ -171,7 +164,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;
@@ -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,13 +198,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);
 
@@ -259,7 +252,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);
 	}
@@ -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);