Rename struct lib_ring_buffer* to struct lttng_ust_lib_ring_buffer*

[lttng-ust.git] / include / ust / lttng-events.h

diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h
index 7a8cf6f839617de14ef7673fc301487ca5f14639..e028f6b2ce43de7e1ff71c5dd4e5904cfa3ebbba 100644 (file)
--- a/include/ust/lttng-events.h
+++ b/include/ust/lttng-events.h
@@ -21,7 +21,7 @@
 
 struct ltt_channel;
 struct ltt_session;
-struct lib_ring_buffer_ctx;
+struct lttng_ust_lib_ring_buffer_ctx;
 
 /* Type description */
 
@@ -152,7 +152,7 @@ struct lttng_ctx_field {
        struct lttng_event_field event_field;
        size_t (*get_size)(size_t offset);
        void (*record)(struct lttng_ctx_field *field,
-                      struct lib_ring_buffer_ctx *ctx,
+                      struct lttng_ust_lib_ring_buffer_ctx *ctx,
                       struct ltt_channel *chan);
        union {
        } u;
@@ -201,7 +201,7 @@ struct ltt_event {
 };
 
 struct channel;
-struct shm_handle;
+struct lttng_ust_shm_handle;
 
 struct ltt_channel_ops {
        struct ltt_channel *(*channel_create)(const char *name,
@@ -213,16 +213,16 @@ struct ltt_channel_ops {
                                int *shm_fd, int *wait_fd,
                                uint64_t *memory_map_size);
        void (*channel_destroy)(struct ltt_channel *ltt_chan);
-       struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
-                               struct shm_handle *handle,
+       struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
+                               struct lttng_ust_shm_handle *handle,
                                int *shm_fd, int *wait_fd,
                                uint64_t *memory_map_size);
-       void (*buffer_read_close)(struct lib_ring_buffer *buf,
-                               struct shm_handle *handle);
-       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
+       void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf,
+                               struct lttng_ust_shm_handle *handle);
+       int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                             uint32_t event_id);
-       void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
-       void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
+       void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
+       void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *src,
                            size_t len);
        /*
         * packet_avail_size returns the available size in the current
@@ -230,11 +230,12 @@ struct ltt_channel_ops {
         * may change due to concurrent writes.
         */
        size_t (*packet_avail_size)(struct channel *chan,
-                                   struct shm_handle *handle);
+                                   struct lttng_ust_shm_handle *handle);
        //wait_queue_head_t *(*get_reader_wait_queue)(struct channel *chan);
        //wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan);
        int (*is_finalized)(struct channel *chan);
        int (*is_disabled)(struct channel *chan);
+       int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
 };
 
 struct ltt_channel {
@@ -250,7 +251,7 @@ struct ltt_channel {
        struct cds_list_head list;      /* Channel list */
        struct ltt_channel_ops *ops;
        int header_type;                /* 0: unset, 1: compact, 2: large */
-       struct shm_handle *handle;      /* shared-memory handle */
+       struct lttng_ust_shm_handle *handle;    /* shared-memory handle */
        int metadata_dumped:1;
 };
 
@@ -321,6 +322,10 @@ void lttng_remove_context_field(struct lttng_ctx **ctx_p,
                                struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
 int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
+void lttng_context_vtid_reset(void);
+void lttng_context_vpid_reset(void);
 
 #endif /* _UST_LTTNG_EVENTS_H */