X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=92e8bf291152932df5e5f88e7216f4ef24d41ae2;hb=687554296a45bf8b3467ba0bb37c06ba66085641;hp=249f42365ce31f90d6132bab4324d4254fbfadb8;hpb=51c5df09105025dc696ac5c89a819b73cc52b687;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 249f4236..92e8bf29 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -31,6 +31,11 @@ struct ltt_channel; struct ltt_session; struct lttng_ust_lib_ring_buffer_ctx; +/* + * Data structures used by tracepoint event declarations, and by the + * tracer. Those structures have padding for future extension. + */ + /* * LTTng client type enumeration. Used by the consumer to map the * callbacks from its own address space. @@ -63,9 +68,11 @@ enum lttng_string_encodings { NR_STRING_ENCODINGS, }; +#define LTTNG_UST_ENUM_ENTRY_PADDING 16 struct lttng_enum_entry { unsigned long long start, end; /* start and end are inclusive */ const char *string; + char padding[LTTNG_UST_ENUM_ENTRY_PADDING]; }; #define __type_integer(_type, _byte_order, _base, _encoding) \ @@ -82,6 +89,7 @@ struct lttng_enum_entry { }, \ } \ +#define LTTNG_UST_INTEGER_TYPE_PADDING 24 struct lttng_integer_type { unsigned int size; /* in bits */ unsigned short alignment; /* in bits */ @@ -89,6 +97,7 @@ struct lttng_integer_type { unsigned int reverse_byte_order:1; unsigned int base; /* 2, 8, 10, 16, for pretty print */ enum lttng_string_encodings encoding; + char padding[LTTNG_UST_INTEGER_TYPE_PADDING]; }; /* @@ -113,13 +122,16 @@ struct lttng_integer_type { }, \ } \ +#define LTTNG_UST_FLOAT_TYPE_PADDING 24 struct lttng_float_type { unsigned int exp_dig; /* exponent digits, in bits */ unsigned int mant_dig; /* mantissa digits, in bits */ unsigned short alignment; /* in bits */ unsigned int reverse_byte_order:1; + char padding[LTTNG_UST_FLOAT_TYPE_PADDING]; }; +#define LTTNG_UST_BASIC_TYPE_PADDING 128 union _lttng_basic_type { struct lttng_integer_type integer; struct { @@ -129,6 +141,7 @@ union _lttng_basic_type { enum lttng_string_encodings encoding; } string; struct lttng_float_type _float; + char padding[LTTNG_UST_BASIC_TYPE_PADDING]; }; struct lttng_basic_type { @@ -138,6 +151,7 @@ struct lttng_basic_type { } u; }; +#define LTTNG_UST_TYPE_PADDING 128 struct lttng_type { enum abstract_types atype; union { @@ -150,23 +164,29 @@ struct lttng_type { struct lttng_basic_type length_type; struct lttng_basic_type elem_type; } sequence; + char padding[LTTNG_UST_TYPE_PADDING]; } u; }; +#define LTTNG_UST_ENUM_TYPE_PADDING 24 struct lttng_enum { const char *name; struct lttng_type container_type; const struct lttng_enum_entry *entries; unsigned int len; + char padding[LTTNG_UST_ENUM_TYPE_PADDING]; }; /* Event field description */ +#define LTTNG_UST_EVENT_FIELD_PADDING 32 struct lttng_event_field { const char *name; struct lttng_type type; + char padding[LTTNG_UST_EVENT_FIELD_PADDING]; }; +#define LTTNG_UST_CTX_FIELD_PADDING 40 struct lttng_ctx_field { struct lttng_event_field event_field; size_t (*get_size)(size_t offset); @@ -174,21 +194,42 @@ struct lttng_ctx_field { struct lttng_ust_lib_ring_buffer_ctx *ctx, struct ltt_channel *chan); union { + char padding[LTTNG_UST_CTX_FIELD_PADDING]; } u; void (*destroy)(struct lttng_ctx_field *field); }; +#define LTTNG_UST_CTX_PADDING 24 struct lttng_ctx { struct lttng_ctx_field *fields; unsigned int nr_fields; unsigned int allocated_fields; + char padding[LTTNG_UST_CTX_PADDING]; +}; + +#define LTTNG_UST_EVENT_DESC_PADDING 40 +struct lttng_event_desc { + const char *name; + void *probe_callback; + const struct lttng_event_ctx *ctx; /* context */ + const struct lttng_event_field *fields; /* event payload */ + unsigned int nr_fields; + const int **loglevel; + const char *signature; /* Argument types/names received */ + char padding[LTTNG_UST_EVENT_DESC_PADDING]; }; -struct tracepoint_loglevel_entry { - const char *identifier; - long value; +#define LTTNG_UST_PROBE_DESC_PADDING 40 +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 */ + char padding[LTTNG_UST_PROBE_DESC_PADDING]; }; +/* Data structures used by the tracer. */ + /* * Entry describing a per-session active wildcard, along with the event * attribute and channel information configuring the events that need to @@ -213,27 +254,11 @@ struct wildcard_entry { struct cds_list_head list; /* head of session list to which this wildcard apply */ struct cds_list_head session_list; + enum lttng_ust_loglevel_type loglevel_type; + int loglevel; char name[0]; }; -struct lttng_event_desc { - const char *name; - void *probe_callback; - const struct lttng_event_ctx *ctx; /* context */ - const struct lttng_event_field *fields; /* event payload */ - unsigned int nr_fields; - const struct tracepoint_loglevel_entry **loglevel; -}; - -struct lttng_probe_desc { - const char *provider; - const struct lttng_event_desc **event_desc; - unsigned int nr_events; - const struct tracepoint_loglevel_entry **loglevels; - unsigned int nr_loglevels; - struct cds_list_head head; /* chain registered probes */ -}; - struct tp_list_entry { struct lttng_ust_tracepoint_iter tp; struct cds_list_head head; @@ -249,9 +274,6 @@ struct ust_pending_probe; /* * ltt_event structure is referred to by the tracing fast path. It must be * kept small. - * Note about loglevel_list: this list is only used to enable/disable - * events on a per-loglevel basis. The events created internally by the - * loglevel are only freed when the session is destroyed. */ struct ltt_event { unsigned int id; @@ -421,15 +443,15 @@ void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list); struct lttng_ust_tracepoint_iter * lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list); -struct wildcard_entry *match_wildcard(const char *name); -struct session_wildcard *add_wildcard(const char *name, - struct ltt_channel *chan, - struct lttng_ust_event *event_param); -void _remove_wildcard(struct session_wildcard *wildcard); int ltt_wildcard_enable(struct session_wildcard *wildcard); int ltt_wildcard_disable(struct session_wildcard *wildcard); int ltt_wildcard_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, struct session_wildcard **sl); +int ltt_loglevel_match(const struct lttng_event_desc *desc, + enum lttng_ust_loglevel_type req_type, + int req_loglevel); +void ltt_probes_create_wildcard_events(struct wildcard_entry *entry, + struct session_wildcard *wildcard); #endif /* _LTTNG_UST_EVENTS_H */