X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-events.h;h=49bd6e9548b16bd8d8e577cbfd6b29265bcd239d;hb=38fae1d354502ffb37f471fbd0fef03412606cc0;hp=6bb4e8cce10ef1b89b791a262b89a0f1cbc42387;hpb=a93bfc45c7cc2117d27f69eb420ab3333280e026;p=lttng-ust.git diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h index 6bb4e8cc..49bd6e95 100644 --- a/include/ust/lttng-events.h +++ b/include/ust/lttng-events.h @@ -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, @@ -214,11 +214,11 @@ struct ltt_channel_ops { 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_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); + struct lttng_ust_shm_handle *handle); int (*event_reserve)(struct lib_ring_buffer_ctx *ctx, uint32_t event_id); void (*event_commit)(struct lib_ring_buffer_ctx *ctx); @@ -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,7 +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 */