Update readme

[lttng-ust.git] / libustctl / ustctl.c

diff --git a/libustctl/ustctl.c b/libustctl/ustctl.c
index 8e6e2f31402397d1dbfbaa933cd188cec6c2bbf4..6f3d1ed97c6c983b52a631ab95cbdc358cfd0497 100644 (file)
--- a/libustctl/ustctl.c
+++ b/libustctl/ustctl.c
@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#include <ust/usterr-signal-safe.h>
-#include <ust/lttng-ust-comm.h>
+#include <lttng/ust-ctl.h>
+#include <lttng/ust-abi.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ust-comm.h>
 
 #include "../libringbuffer/backend.h"
 #include "../libringbuffer/frontend.h"
@@ -426,9 +426,9 @@ int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
 /* Buffer operations */
 
 /* Map channel shm into process memory */
-struct shm_handle *ustctl_map_channel(struct lttng_ust_object_data *chan_data)
+struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *chan_data)
 {
-       struct shm_handle *handle;
+       struct lttng_ust_shm_handle *handle;
        struct channel *chan;
        size_t chan_size;
 
@@ -440,7 +440,7 @@ struct shm_handle *ustctl_map_channel(struct lttng_ust_object_data *chan_data)
                return NULL;
        }
        /*
-        * Set to -1 because the shm_handle destruction will take care
+        * Set to -1 because the lttng_ust_shm_handle destruction will take care
         * of closing shm_fd and wait_fd.
         */
        chan_data->shm_fd = -1;
@@ -464,7 +464,7 @@ struct shm_handle *ustctl_map_channel(struct lttng_ust_object_data *chan_data)
 }
 
 /* Add stream to channel shm and map its shm into process memory */
-int ustctl_add_stream(struct shm_handle *handle,
+int ustctl_add_stream(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_object_data *stream_data)
 {
        int ret;
@@ -481,7 +481,7 @@ int ustctl_add_stream(struct shm_handle *handle,
                return ret;
        }
        /*
-        * Set to -1 because the shm_handle destruction will take care
+        * Set to -1 because the lttng_ust_shm_handle destruction will take care
         * of closing shm_fd and wait_fd.
         */
        stream_data->shm_fd = -1;
@@ -489,7 +489,7 @@ int ustctl_add_stream(struct shm_handle *handle,
        return 0;
 }
 
-void ustctl_unmap_channel(struct shm_handle *handle)
+void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
 {
        struct channel *chan;
 
@@ -497,13 +497,13 @@ void ustctl_unmap_channel(struct shm_handle *handle)
        channel_destroy(chan, handle, 1);
 }
 
-struct lib_ring_buffer *ustctl_open_stream_read(struct shm_handle *handle,
+struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
        int cpu)
 {
        struct channel *chan = handle->shadow_chan;
        int shm_fd, wait_fd;
        uint64_t memory_map_size;
-       struct lib_ring_buffer *buf;
+       struct lttng_ust_lib_ring_buffer *buf;
        int ret;
 
        buf = channel_get_ring_buffer(&chan->backend.config,
@@ -516,23 +516,23 @@ struct lib_ring_buffer *ustctl_open_stream_read(struct shm_handle *handle,
        return buf;
 }
 
-void ustctl_close_stream_read(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+void ustctl_close_stream_read(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        lib_ring_buffer_release_read(buf, handle, 1);
 }
 
 /* For mmap mode, readable without "get" operation */
 
-void *ustctl_get_mmap_base(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+void *ustctl_get_mmap_base(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        return shmp(handle, buf->backend.memory_map);
 }
 
 /* returns the length to mmap. */
-int ustctl_get_mmap_len(struct shm_handle *handle,
-               struct lib_ring_buffer *buf,
+int ustctl_get_mmap_len(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf,
                unsigned long *len)
 {
        unsigned long mmap_buf_len;
@@ -550,8 +550,8 @@ int ustctl_get_mmap_len(struct shm_handle *handle,
 }
 
 /* returns the maximum size for sub-buffers. */
-int ustctl_get_max_subbuf_size(struct shm_handle *handle,
-               struct lib_ring_buffer *buf,
+int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf,
                unsigned long *len)
 {
        struct channel *chan = handle->shadow_chan;
@@ -566,8 +566,8 @@ int ustctl_get_max_subbuf_size(struct shm_handle *handle,
  */
 
 /* returns the offset of the subbuffer belonging to the mmap reader. */
-int ustctl_get_mmap_read_offset(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *off)
+int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *off)
 {
        struct channel *chan = handle->shadow_chan;
        unsigned long sb_bindex;
@@ -581,8 +581,8 @@ int ustctl_get_mmap_read_offset(struct shm_handle *handle,
 }
 
 /* returns the size of the current sub-buffer, without padding (for mmap). */
-int ustctl_get_subbuf_size(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *len)
+int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
        struct channel *chan = handle->shadow_chan;
 
@@ -592,8 +592,8 @@ int ustctl_get_subbuf_size(struct shm_handle *handle,
 }
 
 /* returns the size of the current sub-buffer, without padding (for mmap). */
-int ustctl_get_padded_subbuf_size(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *len)
+int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
        struct channel *chan = handle->shadow_chan;
 
@@ -604,16 +604,16 @@ int ustctl_get_padded_subbuf_size(struct shm_handle *handle,
 }
 
 /* Get exclusive read access to the next sub-buffer that can be read. */
-int ustctl_get_next_subbuf(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+int ustctl_get_next_subbuf(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        return lib_ring_buffer_get_next_subbuf(buf, handle);
 }
 
 
 /* Release exclusive sub-buffer access, move consumer forward. */
-int ustctl_put_next_subbuf(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+int ustctl_put_next_subbuf(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        lib_ring_buffer_put_next_subbuf(buf, handle);
        return 0;
@@ -622,46 +622,46 @@ int ustctl_put_next_subbuf(struct shm_handle *handle,
 /* snapshot */
 
 /* Get a snapshot of the current ring buffer producer and consumer positions */
-int ustctl_snapshot(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+int ustctl_snapshot(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
                        &buf->prod_snapshot, handle);
 }
 
 /* Get the consumer position (iteration start) */
-int ustctl_snapshot_get_consumed(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *pos)
+int ustctl_snapshot_get_consumed(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
        *pos = buf->cons_snapshot;
        return 0;
 }
 
 /* Get the producer position (iteration end) */
-int ustctl_snapshot_get_produced(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *pos)
+int ustctl_snapshot_get_produced(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
        *pos = buf->prod_snapshot;
        return 0;
 }
 
 /* Get exclusive read access to the specified sub-buffer position */
-int ustctl_get_subbuf(struct shm_handle *handle,
-               struct lib_ring_buffer *buf, unsigned long *pos)
+int ustctl_get_subbuf(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
        return lib_ring_buffer_get_subbuf(buf, *pos, handle);
 }
 
 /* Release exclusive sub-buffer access */
-int ustctl_put_subbuf(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        lib_ring_buffer_put_subbuf(buf, handle);
        return 0;
 }
 
-int ustctl_buffer_flush(struct shm_handle *handle,
-               struct lib_ring_buffer *buf)
+int ustctl_buffer_flush(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf)
 {
        lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE, handle);
        return 0;