Use ENOMSG as fallback for ENODATA on freebsd

[lttng-ust.git] / tests / ust-basic-tracing / ust-basic-tracing.c

diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index d9339e91cd958135cd3fc83c2dcd3ae1a1f7d12d..a7fa84daec6ff696c2616fcabc6ec25de580dac4 100644 (file)
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -19,6 +19,7 @@
  */
 
 #define _LARGEFILE64_SOURCE
+#define _GNU_SOURCE
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,6 +29,8 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <limits.h>
@@ -36,20 +39,14 @@
 #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"
+#include "../../liblttng-ust/compat.h" /* For ENODATA */
 
 #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 +148,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 +192,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 +202,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 +256,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 +278,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);