X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=54eb09550ce4000bd20855c0e40f254960ad19cb;hb=218deb69baab;hp=01f611b29c789909f7f933698c1e71b7be8d9cc6;hpb=d58d145447ffcc9497801769e1fe754b30dca5b8;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 01f611b2..54eb0955 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,10 @@ #include #include +#ifndef LTTNG_PACKED +#error "LTTNG_PACKED should be defined" +#endif + #ifdef __cplusplus extern "C" { #endif @@ -51,12 +56,14 @@ extern "C" { * 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_MAJOR 2 #define LTTNG_UST_PROVIDER_MINOR 0 struct lttng_channel; struct lttng_session; struct lttng_ust_lib_ring_buffer_ctx; +struct lttng_ust_context_app; +struct lttng_event_field; /* * Data structures used by tracepoint event declarations, and by the @@ -81,11 +88,17 @@ enum lttng_client_types { /* Update the astract_types name table in lttng-types.c along with this enum */ enum lttng_abstract_types { atype_integer, - atype_enum, - atype_array, - atype_sequence, + atype_enum, /* legacy */ + atype_array, /* legacy */ + atype_sequence, /* legacy */ atype_string, atype_float, + atype_dynamic, + atype_struct, /* legacy */ + atype_enum_nestable, + atype_array_nestable, + atype_sequence_nestable, + atype_struct_nestable, NR_ABSTRACT_TYPES, }; @@ -97,11 +110,25 @@ enum lttng_string_encodings { NR_STRING_ENCODINGS, }; +struct lttng_enum_value { + unsigned long long value; + unsigned int signedness:1; +}; + +enum lttng_enum_entry_options { + LTTNG_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0, +}; + #define LTTNG_UST_ENUM_ENTRY_PADDING 16 struct lttng_enum_entry { - unsigned long long start, end; /* start and end are inclusive */ + struct lttng_enum_value start, end; /* start and end are inclusive */ const char *string; - char padding[LTTNG_UST_ENUM_ENTRY_PADDING]; + union { + struct { + unsigned int options; + } LTTNG_PACKED extra; + char padding[LTTNG_UST_ENUM_ENTRY_PADDING]; + } u; }; #define __type_integer(_type, _byte_order, _base, _encoding) \ @@ -109,17 +136,14 @@ struct lttng_enum_entry { .atype = atype_integer, \ .u = \ { \ - .basic = \ + .integer = \ { \ - .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, \ - } \ + .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, \ } \ }, \ } \ @@ -149,18 +173,15 @@ struct lttng_integer_type { .atype = atype_float, \ .u = \ { \ - .basic = \ + ._float = \ { \ - ._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, \ - } \ + .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, \ } \ - }, \ + } \ } \ #define LTTNG_UST_FLOAT_TYPE_PADDING 24 @@ -172,19 +193,22 @@ struct lttng_float_type { char padding[LTTNG_UST_FLOAT_TYPE_PADDING]; }; +/* legacy */ #define LTTNG_UST_BASIC_TYPE_PADDING 128 union _lttng_basic_type { - struct lttng_integer_type integer; + struct lttng_integer_type integer; /* legacy */ struct { - const char *name; - } enumeration; + const struct lttng_enum_desc *desc; /* Enumeration mapping */ + struct lttng_integer_type container_type; + } enumeration; /* legacy */ struct { enum lttng_string_encodings encoding; - } string; - struct lttng_float_type _float; + } string; /* legacy */ + struct lttng_float_type _float; /* legacy */ char padding[LTTNG_UST_BASIC_TYPE_PADDING]; }; +/* legacy */ struct lttng_basic_type { enum lttng_abstract_types atype; union { @@ -196,25 +220,57 @@ struct lttng_basic_type { struct lttng_type { enum lttng_abstract_types atype; union { - union _lttng_basic_type basic; + /* provider ABI 2.0 */ + struct lttng_integer_type integer; + struct lttng_float_type _float; struct { - struct lttng_basic_type elem_type; - unsigned int length; /* num. elems. */ - } array; + enum lttng_string_encodings encoding; + } string; struct { - struct lttng_basic_type length_type; - struct lttng_basic_type elem_type; - } sequence; + const struct lttng_enum_desc *desc; /* Enumeration mapping */ + struct lttng_type *container_type; + } enum_nestable; + struct { + const struct lttng_type *elem_type; + unsigned int length; /* Num. elems. */ + unsigned int alignment; + } array_nestable; + struct { + const char *length_name; /* Length field name. */ + const struct lttng_type *elem_type; + unsigned int alignment; /* Alignment before elements. */ + } sequence_nestable; + struct { + unsigned int nr_fields; + const struct lttng_event_field *fields; /* Array of fields. */ + unsigned int alignment; + } struct_nestable; + + union { + /* legacy provider ABI 1.0 */ + union _lttng_basic_type basic; /* legacy */ + struct { + struct lttng_basic_type elem_type; + unsigned int length; /* Num. elems. */ + } array; /* legacy */ + struct { + struct lttng_basic_type length_type; + struct lttng_basic_type elem_type; + } sequence; /* legacy */ + struct { + unsigned int nr_fields; + struct lttng_event_field *fields; /* Array of fields. */ + } _struct; /* legacy */ + } legacy; char padding[LTTNG_UST_TYPE_PADDING]; } u; }; #define LTTNG_UST_ENUM_TYPE_PADDING 24 -struct lttng_enum { +struct lttng_enum_desc { const char *name; - struct lttng_type container_type; const struct lttng_enum_entry *entries; - unsigned int len; + unsigned int nr_entries; char padding[LTTNG_UST_ENUM_TYPE_PADDING]; }; @@ -231,13 +287,37 @@ struct lttng_event_field { const char *name; struct lttng_type type; unsigned int nowrite; /* do not write into trace */ - char padding[LTTNG_UST_EVENT_FIELD_PADDING]; + union { + struct { + unsigned int nofilter:1; /* do not consider for filter */ + } ext; + char padding[LTTNG_UST_EVENT_FIELD_PADDING]; + } u; }; -union lttng_ctx_value { - int64_t s64; - const char *str; - double d; +enum lttng_ust_dynamic_type { + LTTNG_UST_DYNAMIC_TYPE_NONE, + LTTNG_UST_DYNAMIC_TYPE_S8, + LTTNG_UST_DYNAMIC_TYPE_S16, + LTTNG_UST_DYNAMIC_TYPE_S32, + LTTNG_UST_DYNAMIC_TYPE_S64, + LTTNG_UST_DYNAMIC_TYPE_U8, + LTTNG_UST_DYNAMIC_TYPE_U16, + LTTNG_UST_DYNAMIC_TYPE_U32, + LTTNG_UST_DYNAMIC_TYPE_U64, + LTTNG_UST_DYNAMIC_TYPE_FLOAT, + LTTNG_UST_DYNAMIC_TYPE_DOUBLE, + LTTNG_UST_DYNAMIC_TYPE_STRING, + _NR_LTTNG_UST_DYNAMIC_TYPES, +}; + +struct lttng_ctx_value { + enum lttng_ust_dynamic_type sel; + union { + int64_t s64; + const char *str; + double d; + } u; }; struct lttng_perf_counter_field; @@ -245,24 +325,26 @@ struct lttng_perf_counter_field; #define LTTNG_UST_CTX_FIELD_PADDING 40 struct lttng_ctx_field { struct lttng_event_field event_field; - size_t (*get_size)(size_t offset); + size_t (*get_size)(struct lttng_ctx_field *field, size_t offset); 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); + struct 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); + char *field_name; /* Has ownership, dynamically allocated. */ }; -#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]; }; @@ -299,7 +381,7 @@ struct lttng_probe_desc { /* Data structures used by the tracer. */ enum lttng_enabler_type { - LTTNG_ENABLER_WILDCARD, + LTTNG_ENABLER_STAR_GLOB, LTTNG_ENABLER_EVENT, }; @@ -318,6 +400,10 @@ struct lttng_enabler { struct lttng_ust_event event_param; struct lttng_channel *chan; + /* + * Unused, but kept around to make it explicit that the tracer can do + * it. + */ struct lttng_ctx *ctx; unsigned int enabled:1; }; @@ -379,6 +465,7 @@ struct lttng_bytecode_runtime { uint64_t (*filter)(void *filter_data, const char *filter_stack_data); int link_failed; struct cds_list_head node; /* list of bytecode runtime in event */ + struct lttng_session *session; }; /* @@ -406,8 +493,6 @@ struct lttng_event { void *_deprecated1; struct lttng_ctx *ctx; enum lttng_ust_instrumentation instrumentation; - union { - } u; struct cds_list_head node; /* Event list in session */ struct cds_list_head _deprecated2; void *_deprecated3; @@ -423,6 +508,14 @@ struct lttng_event { int registered; /* has reg'd tracepoint probe */ }; +struct lttng_enum { + const struct lttng_enum_desc *desc; + struct lttng_session *session; + struct cds_list_head node; /* Enum list in session */ + struct cds_hlist_node hlist; /* Session ht of enums */ + uint64_t id; /* Enumeration ID in sessiond */ +}; + struct channel; struct lttng_ust_shm_handle; @@ -438,10 +531,19 @@ struct lttng_channel_ops { unsigned int switch_timer_interval, unsigned int read_timer_interval, unsigned char *uuid, - uint32_t chan_id); + uint32_t chan_id, + const int *stream_fds, int nr_stream_fds, + int64_t blocking_timeout); void (*channel_destroy)(struct lttng_channel *chan); union { void *_deprecated1; + /* + * has_strcpy is needed by probe providers version 1.0 to + * dynamically detect whether the LTTng-UST tracepoint + * provider ABI implements event_strcpy. Starting from + * probe providers version 2.0, the check is not needed, + * but backward compatibility is provided for older versions. + */ unsigned long has_strcpy:1; /* ABI has strcpy */ } u; void *_deprecated2; @@ -499,6 +601,14 @@ struct lttng_channel { int tstate:1; /* Transient enable state */ }; +#define LTTNG_UST_STACK_CTX_PADDING 32 +struct lttng_stack_ctx { + struct lttng_event *event; + struct lttng_ctx *chan_ctx; /* RCU dereferenced. */ + struct lttng_ctx *event_ctx; /* RCU dereferenced. */ + char padding[LTTNG_UST_STACK_CTX_PADDING]; +}; + #define LTTNG_UST_EVENT_HT_BITS 12 #define LTTNG_UST_EVENT_HT_SIZE (1U << LTTNG_UST_EVENT_HT_BITS) @@ -506,6 +616,13 @@ struct lttng_ust_event_ht { struct cds_hlist_head table[LTTNG_UST_EVENT_HT_SIZE]; }; +#define LTTNG_UST_ENUM_HT_BITS 12 +#define LTTNG_UST_ENUM_HT_SIZE (1U << LTTNG_UST_ENUM_HT_BITS) + +struct lttng_ust_enum_ht { + struct cds_hlist_head table[LTTNG_UST_ENUM_HT_SIZE]; +}; + /* * IMPORTANT: this structure is part of the ABI between the probe and * UST. Fields need to be only added at the end, never reordered, never @@ -532,6 +649,11 @@ struct lttng_session { /* New UST 2.4 */ int statedump_pending:1; + + /* New UST 2.8 */ + struct lttng_ust_enum_ht enums_ht; /* ht of enumerations */ + struct cds_list_head enums_head; + struct lttng_ctx *ctx; /* contexts for filters. */ }; struct lttng_transport { @@ -544,6 +666,7 @@ struct lttng_transport { struct lttng_session *lttng_session_create(void); int lttng_session_enable(struct lttng_session *session); int lttng_session_disable(struct lttng_session *session); +int lttng_session_statedump(struct lttng_session *session); void lttng_session_destroy(struct lttng_session *session); struct lttng_channel *lttng_channel_create(struct lttng_session *session, @@ -572,10 +695,9 @@ 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, + union ust_args *uargs, 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 */ +int lttng_session_context_init(struct lttng_ctx **ctx); void lttng_transport_register(struct lttng_transport *transport); void lttng_transport_unregister(struct lttng_transport *transport); @@ -584,12 +706,14 @@ void synchronize_trace(void); int lttng_probe_register(struct lttng_probe_desc *desc); void lttng_probe_unregister(struct lttng_probe_desc *desc); +void lttng_probe_provider_unregister_events(struct lttng_probe_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); @@ -598,8 +722,37 @@ 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); +int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx); +int lttng_add_dyntest_to_ctx(struct lttng_ctx **ctx); +int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx); +int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_veuid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_vsuid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_vgid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_vegid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_vsgid_to_ctx(struct lttng_ctx **ctx); void lttng_context_vtid_reset(void); void lttng_context_vpid_reset(void); +void lttng_context_procname_reset(void); +void lttng_context_cgroup_ns_reset(void); +void lttng_context_ipc_ns_reset(void); +void lttng_context_mnt_ns_reset(void); +void lttng_context_net_ns_reset(void); +void lttng_context_pid_ns_reset(void); +void lttng_context_user_ns_reset(void); +void lttng_context_uts_ns_reset(void); +void lttng_context_vuid_reset(void); +void lttng_context_veuid_reset(void); +void lttng_context_vsuid_reset(void); +void lttng_context_vgid_reset(void); +void lttng_context_vegid_reset(void); +void lttng_context_vsgid_reset(void); #ifdef LTTNG_UST_HAVE_PERF_EVENT int lttng_add_perf_counter_to_ctx(uint32_t type, @@ -643,7 +796,6 @@ void lttng_probes_prune_field_list(struct lttng_ust_field_list *list); struct lttng_ust_field_iter * lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list); -void lttng_filter_event_link_bytecode(struct lttng_event *event); void lttng_enabler_event_link_bytecode(struct lttng_event *event, struct lttng_enabler *enabler); void lttng_free_event_filter_runtime(struct lttng_event *event); @@ -656,6 +808,18 @@ 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); +struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session, + const struct lttng_enum_desc *enum_desc); + +void lttng_ust_dl_update(void *ip); +void lttng_ust_fixup_fd_tracker_tls(void); + +/* For backward compatibility. Leave those exported symbols in place. */ +extern struct lttng_ctx *lttng_static_ctx; +void lttng_context_init(void); +void lttng_context_exit(void); +void lttng_filter_event_link_bytecode(struct lttng_event *event); + #ifdef __cplusplus } #endif