X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=e4b4edeba005e25e926a54a7674d51915e766d65;hb=a9ff648cc;hp=331506bd69d838a0c77075489ec3830b859dbe86;hpb=8a92ed2aba5250d41e31d1af5620a2317105c91a;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 331506bd..e4b4edeb 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -17,18 +17,43 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include #include +#include #include #include #include #include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif #define LTTNG_UST_UUID_LEN 16 +/* + * Tracepoint provider version. Compatibility based on the major number. + * Older tracepoint providers can always register to newer lttng-ust + * library, but the opposite is rejected: a newer tracepoint provider is + * rejected by an older lttng-ust library. + */ +#define LTTNG_UST_PROVIDER_MAJOR 1 +#define LTTNG_UST_PROVIDER_MINOR 0 + struct lttng_channel; struct lttng_session; struct lttng_ust_lib_ring_buffer_ctx; @@ -46,6 +71,8 @@ enum lttng_client_types { LTTNG_CLIENT_METADATA = 0, LTTNG_CLIENT_DISCARD = 1, LTTNG_CLIENT_OVERWRITE = 2, + LTTNG_CLIENT_DISCARD_RT = 3, + LTTNG_CLIENT_OVERWRITE_RT = 4, LTTNG_NR_CLIENT_TYPES, }; @@ -79,15 +106,21 @@ struct lttng_enum_entry { #define __type_integer(_type, _byte_order, _base, _encoding) \ { \ - .atype = atype_integer, \ - .u.basic.integer = \ + .atype = atype_integer, \ + .u = \ { \ - .size = sizeof(_type) * CHAR_BIT, \ - .alignment = lttng_alignof(_type) * CHAR_BIT, \ - .signedness = lttng_is_signed_type(_type), \ - .reverse_byte_order = _byte_order != BYTE_ORDER, \ - .base = _base, \ - .encoding = lttng_encode_##_encoding, \ + .basic = \ + { \ + .integer = \ + { \ + .size = sizeof(_type) * CHAR_BIT, \ + .alignment = lttng_alignof(_type) * CHAR_BIT, \ + .signedness = lttng_is_signed_type(_type), \ + .reverse_byte_order = _byte_order != BYTE_ORDER, \ + .base = _base, \ + .encoding = lttng_encode_##_encoding, \ + } \ + } \ }, \ } \ @@ -113,14 +146,20 @@ struct lttng_integer_type { #define __type_float(_type) \ { \ - .atype = atype_float, \ - .u.basic._float = \ + .atype = atype_float, \ + .u = \ { \ - .exp_dig = sizeof(_type) * CHAR_BIT \ - - _float_mant_dig(_type), \ - .mant_dig = _float_mant_dig(_type), \ - .alignment = lttng_alignof(_type) * CHAR_BIT, \ - .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \ + .basic = \ + { \ + ._float = \ + { \ + .exp_dig = sizeof(_type) * CHAR_BIT \ + - _float_mant_dig(_type), \ + .mant_dig = _float_mant_dig(_type), \ + .alignment = lttng_alignof(_type) * CHAR_BIT, \ + .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \ + } \ + } \ }, \ } \ @@ -195,6 +234,14 @@ struct lttng_event_field { char padding[LTTNG_UST_EVENT_FIELD_PADDING]; }; +union lttng_ctx_value { + int64_t s64; + const char *str; + double d; +}; + +struct lttng_perf_counter_field; + #define LTTNG_UST_CTX_FIELD_PADDING 40 struct lttng_ctx_field { struct lttng_event_field event_field; @@ -202,17 +249,21 @@ struct lttng_ctx_field { void (*record)(struct lttng_ctx_field *field, struct lttng_ust_lib_ring_buffer_ctx *ctx, struct lttng_channel *chan); + void (*get_value)(struct lttng_ctx_field *field, + union lttng_ctx_value *value); union { + struct lttng_perf_counter_field *perf_counter; char padding[LTTNG_UST_CTX_FIELD_PADDING]; } u; void (*destroy)(struct lttng_ctx_field *field); }; -#define LTTNG_UST_CTX_PADDING 24 +#define LTTNG_UST_CTX_PADDING 20 struct lttng_ctx { struct lttng_ctx_field *fields; unsigned int nr_fields; unsigned int allocated_fields; + unsigned int largest_align; char padding[LTTNG_UST_CTX_PADDING]; }; @@ -233,12 +284,16 @@ struct lttng_event_desc { } u; }; -#define LTTNG_UST_PROBE_DESC_PADDING 40 +#define LTTNG_UST_PROBE_DESC_PADDING 12 struct lttng_probe_desc { const char *provider; const struct lttng_event_desc **event_desc; unsigned int nr_events; struct cds_list_head head; /* chain registered probes */ + struct cds_list_head lazy_init_head; + int lazy; /* lazy registration */ + uint32_t major; + uint32_t minor; char padding[LTTNG_UST_PROBE_DESC_PADDING]; }; @@ -258,6 +313,8 @@ struct lttng_enabler { /* head list of struct lttng_ust_filter_bytecode_node */ struct cds_list_head filter_bytecode_head; + /* head list of struct lttng_ust_excluder_node */ + struct cds_list_head excluder_head; struct cds_list_head node; /* per-session list of enablers */ struct lttng_ust_event event_param; @@ -299,6 +356,15 @@ struct lttng_ust_filter_bytecode_node { struct lttng_ust_filter_bytecode bc; }; +struct lttng_ust_excluder_node { + struct cds_list_head node; + struct lttng_enabler *enabler; + /* + * struct lttng_ust_event_exclusion had variable sized array, + * must be last field. + */ + struct lttng_ust_event_exclusion excluder; +}; /* * Filter return value masks. */ @@ -346,14 +412,16 @@ struct lttng_event { struct cds_list_head node; /* Event list in session */ struct cds_list_head _deprecated2; void *_deprecated3; - unsigned int metadata_dumped:1; + unsigned int _deprecated4:1; /* LTTng-UST 2.1 starts here */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ struct cds_list_head bytecode_runtime_head; - + int has_enablers_without_bytecode; /* Backward references: list of lttng_enabler_ref (ref to enablers) */ struct cds_list_head enablers_ref_head; + struct cds_hlist_node hlist; /* session ht of events */ + int registered; /* has reg'd tracepoint probe */ }; struct channel; @@ -366,25 +434,24 @@ struct lttng_ust_shm_handle; */ struct lttng_channel_ops { struct lttng_channel *(*channel_create)(const char *name, - void *buf_addr, - size_t subbuf_size, size_t num_subbuf, - unsigned int switch_timer_interval, - unsigned int read_timer_interval, - int **shm_fd, int **wait_fd, - uint64_t **memory_map_size, - struct lttng_channel *chan_priv_init); - void (*channel_destroy)(struct lttng_channel *lttng_chan); - 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 lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle); + void *buf_addr, + size_t subbuf_size, size_t num_subbuf, + unsigned int switch_timer_interval, + unsigned int read_timer_interval, + unsigned char *uuid, + uint32_t chan_id, + const char *shm_path); + void (*channel_destroy)(struct lttng_channel *chan); + union { + void *_deprecated1; + unsigned long has_strcpy:1; /* ABI has strcpy */ + } u; + void *_deprecated2; int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id); 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); + 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 * packet. Note that the size returned is only a hint, since it @@ -397,6 +464,8 @@ struct lttng_channel_ops { int (*is_finalized)(struct channel *chan); int (*is_disabled)(struct channel *chan); int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle); + void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx, + const char *src, size_t len); }; /* @@ -417,21 +486,22 @@ struct lttng_channel { /* Event ID management */ struct lttng_session *session; int objd; /* Object associated to channel */ - unsigned int free_event_id; /* Next event ID to allocate */ - unsigned int used_event_id; /* Max allocated event IDs */ + unsigned int _deprecated1; + unsigned int _deprecated2; struct cds_list_head node; /* Channel list in session */ - struct lttng_channel_ops *ops; + const struct lttng_channel_ops *ops; int header_type; /* 0: unset, 1: compact, 2: large */ struct lttng_ust_shm_handle *handle; /* shared-memory handle */ - unsigned int metadata_dumped:1; + unsigned int _deprecated3:1; - /* Channel ID, available for consumer too */ + /* Channel ID */ unsigned int id; - /* Copy of session UUID for consumer (availability through shm) */ + enum lttng_ust_chan_type type; unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ + int tstate:1; /* Transient enable state */ }; -#define LTTNG_UST_EVENT_HT_BITS 6 +#define LTTNG_UST_EVENT_HT_BITS 12 #define LTTNG_UST_EVENT_HT_SIZE (1U << LTTNG_UST_EVENT_HT_BITS) struct lttng_ust_event_ht { @@ -447,24 +517,30 @@ struct lttng_session { int active; /* Is trace session active ? */ int been_active; /* Been active ? */ int objd; /* Object associated */ - struct lttng_channel *metadata; /* Metadata channel */ + void *_deprecated1; struct cds_list_head chan_head; /* Channel list head */ struct cds_list_head events_head; /* list of events */ - struct cds_list_head _deprecated1; + struct cds_list_head _deprecated2; struct cds_list_head node; /* Session list */ - unsigned int free_chan_id; /* Next chan ID to allocate */ - unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ - unsigned int metadata_dumped:1; + int _deprecated3; + unsigned int _deprecated4:1; /* New UST 2.1 */ /* List of enablers */ struct cds_list_head enablers_head; + struct lttng_ust_event_ht events_ht; /* ht of events */ + void *owner; /* object owner */ + int tstate:1; /* Transient enable state */ + + /* New UST 2.4 */ + int statedump_pending:1; }; struct lttng_transport { char *name; struct cds_list_head node; struct lttng_channel_ops ops; + const struct lttng_ust_lib_ring_buffer_config *client_config; }; struct lttng_session *lttng_session_create(void); @@ -481,13 +557,6 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session, int **shm_fd, int **wait_fd, uint64_t **memory_map_size, struct lttng_channel *chan_priv_init); -struct lttng_channel *lttng_global_channel_create(struct lttng_session *session, - int overwrite, void *buf_addr, - size_t subbuf_size, size_t num_subbuf, - unsigned int switch_timer_interval, - unsigned int read_timer_interval, - int **shm_fd, int **wait_fd, - uint64_t **memory_map_size); int lttng_channel_enable(struct lttng_channel *channel); int lttng_channel_disable(struct lttng_channel *channel); @@ -501,9 +570,14 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler, struct lttng_ust_filter_bytecode_node *bytecode); int lttng_enabler_attach_context(struct lttng_enabler *enabler, struct lttng_ust_context *ctx); +int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler, + struct lttng_ust_excluder_node *excluder); int lttng_attach_context(struct lttng_ust_context *context_param, struct lttng_ctx **ctx, struct lttng_session *session); +void lttng_context_init(void); +void lttng_context_exit(void); +extern struct lttng_ctx *lttng_static_ctx; /* Used by filtering */ void lttng_transport_register(struct lttng_transport *transport); void lttng_transport_unregister(struct lttng_transport *transport); @@ -512,13 +586,13 @@ void synchronize_trace(void); int lttng_probe_register(struct lttng_probe_desc *desc); void lttng_probe_unregister(struct lttng_probe_desc *desc); -int lttng_fix_pending_event_desc(const struct lttng_event_desc *desc); -const struct lttng_event_desc *lttng_event_get(const char *name); -void lttng_event_put(const struct lttng_event_desc *desc); +int lttng_fix_pending_events(void); int lttng_probes_init(void); void lttng_probes_exit(void); int lttng_find_context(struct lttng_ctx *ctx, const char *name); +int lttng_get_context_index(struct lttng_ctx *ctx, const char *name); struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p); +void lttng_context_update(struct lttng_ctx *ctx); void lttng_remove_context_field(struct lttng_ctx **ctx_p, struct lttng_ctx_field *field); void lttng_destroy_context(struct lttng_ctx *ctx); @@ -526,12 +600,40 @@ 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); +int lttng_add_ip_to_ctx(struct lttng_ctx **ctx); void lttng_context_vtid_reset(void); void lttng_context_vpid_reset(void); -extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata; -extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard; -extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; +#ifdef LTTNG_UST_HAVE_PERF_EVENT +int lttng_add_perf_counter_to_ctx(uint32_t type, + uint64_t config, + const char *name, + struct lttng_ctx **ctx); +int lttng_perf_counter_init(void); +void lttng_perf_counter_exit(void); +#else /* #ifdef LTTNG_UST_HAVE_PERF_EVENT */ +static inline +int lttng_add_perf_counter_to_ctx(uint32_t type, + uint64_t config, + const char *name, + struct lttng_ctx **ctx) +{ + return -ENOSYS; +} +static inline +int lttng_perf_counter_init(void) +{ + return 0; +} +static inline +void lttng_perf_counter_exit(void) +{ +} +#endif /* #else #ifdef LTTNG_UST_HAVE_PERF_EVENT */ + +extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata; +extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_discard; +extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; struct lttng_transport *lttng_transport_find(const char *name); @@ -551,5 +653,14 @@ void lttng_free_event_filter_runtime(struct lttng_event *event); void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime); struct cds_list_head *lttng_get_probe_list_head(void); +int lttng_session_active(void); + +typedef int (*t_statedump_func_ptr)(struct lttng_session *session); +void lttng_handle_pending_statedump(void *owner); +struct cds_list_head *_lttng_get_sessions(void); + +#ifdef __cplusplus +} +#endif #endif /* _LTTNG_UST_EVENTS_H */