Close stream and channel file descriptors as soon as passed to sessiond

[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 49a0a3af1cc392e96b3d0e7f0fd5d296228bcb2d..da2852f893b41aaf47879bf0397a9693cc5e21e8 100644 (file)
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -36,7 +36,7 @@
 #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"
 
@@ -203,8 +203,8 @@ int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
        struct channel *chan;
        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);
 
@@ -252,7 +252,7 @@ int consume_stream(struct lttng_ust_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);
        }