-#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>
/* open the metadata global channel */
int ustctl_open_metadata(int sock, int session_handle,
struct lttng_ust_channel_attr *chops,
/* open the metadata global channel */
int ustctl_open_metadata(int sock, int session_handle,
struct lttng_ust_channel_attr *chops,
int ustctl_create_channel(int sock, int session_handle,
struct lttng_ust_channel_attr *chops,
int ustctl_create_channel(int sock, int session_handle,
struct lttng_ust_channel_attr *chops,
-int ustctl_create_stream(int sock, struct object_data *channel_data,
- struct object_data **_stream_data)
+int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
+ struct lttng_ust_object_data **_stream_data)
- struct object_data *channel_data,
- struct object_data **_event_data)
+ struct lttng_ust_object_data *channel_data,
+ struct lttng_ust_object_data **_event_data)
- struct object_data *obj_data,
- struct object_data **_context_data)
+ struct lttng_ust_object_data *obj_data,
+ struct lttng_ust_object_data **_context_data)
-int ustctl_add_stream(struct shm_handle *handle,
- struct object_data *stream_data)
+int ustctl_add_stream(struct lttng_ust_shm_handle *handle,
+ struct lttng_ust_object_data *stream_data)
-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 */
{
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. */
{
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,
-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,
-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)
-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)
-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)
-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. */
{
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)
-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) */
{
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)
-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)
-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 */
{
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)
-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)