X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=0e19ed2229ac9c7b417aee01be5113e0701351fe;hb=6ddc916dfa930b6b9018ffd53a76faeb61b81ebd;hp=96435c481c7b5aa117ed04b893a057bd531dfdfd;hpb=c759fe81a6251b9feddf5cd9576278ffedf92ac3;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 96435c48..0e19ed22 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -4,18 +4,19 @@ /* * lttng/ust-events.h * - * Copyright 2010 (c) - Mathieu Desnoyers + * Copyright 2010-2012 (c) - Mathieu Desnoyers * * Holds LTTng per-session event registry. * - * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED - * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * Permission is hereby granted to use or copy this program - * for any purpose, provided the above notices are retained on all copies. - * Permission to modify the code and to distribute modified code is granted, - * provided the above notices are retained, and a notice that the code was - * modified is included with the above copyright notice. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. */ #include @@ -32,6 +33,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. @@ -64,9 +70,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) \ @@ -83,6 +91,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 */ @@ -90,6 +99,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]; }; /* @@ -114,13 +124,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 { @@ -130,6 +143,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 { @@ -139,6 +153,7 @@ struct lttng_basic_type { } u; }; +#define LTTNG_UST_TYPE_PADDING 128 struct lttng_type { enum abstract_types atype; union { @@ -151,23 +166,36 @@ 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 */ +/* + * Event field description + * + * 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 + * removed. + */ +#define LTTNG_UST_EVENT_FIELD_PADDING 28 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]; }; +#define LTTNG_UST_CTX_FIELD_PADDING 40 struct lttng_ctx_field { struct lttng_event_field event_field; size_t (*get_size)(size_t offset); @@ -175,16 +203,47 @@ 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)(void); + 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 */ + union { + struct { + const char **model_emf_uri; + } ext; + char padding[LTTNG_UST_EVENT_DESC_PADDING]; + } u; +}; + +#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 @@ -198,6 +257,7 @@ struct session_wildcard { struct cds_list_head list; /* per-session list of wildcards */ struct cds_list_head session_list; /* node of session wildcard list */ struct wildcard_entry *entry; + struct lttng_ust_filter_bytecode *filter_bytecode; unsigned int enabled:1; }; @@ -210,26 +270,11 @@ struct wildcard_entry { /* head of session list to which this wildcard apply */ struct cds_list_head session_list; enum lttng_ust_loglevel_type loglevel_type; + struct lttng_ust_filter_bytecode *filter_bytecode; 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 int **loglevel; -}; - -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 tp_list_entry { struct lttng_ust_tracepoint_iter tp; struct cds_list_head head; @@ -240,18 +285,35 @@ struct lttng_ust_tracepoint_list { struct cds_list_head head; }; +struct tp_field_list_entry { + struct lttng_ust_field_iter field; + struct cds_list_head head; +}; + +struct lttng_ust_field_list { + struct tp_field_list_entry *iter; + struct cds_list_head head; +}; + struct ust_pending_probe; +struct ltt_event; +struct lttng_ust_filter_bytecode; /* * ltt_event structure is referred to by the tracing fast path. It must be * kept small. + * + * 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 + * removed. */ struct ltt_event { + /* LTTng-UST 2.0 starts here */ unsigned int id; struct ltt_channel *chan; int enabled; const struct lttng_event_desc *desc; - void *filter; + int (*filter)(void *filter_data, const char *filter_stack_data); struct lttng_ctx *ctx; enum lttng_ust_instrumentation instrumentation; union { @@ -260,11 +322,19 @@ struct ltt_event { struct cds_list_head wildcard_list; /* Event list for wildcard */ struct ust_pending_probe *pending_probe; unsigned int metadata_dumped:1; + /* LTTng-UST 2.1 starts here */ + struct lttng_ust_filter_bytecode *filter_bytecode; + void *filter_data; }; struct channel; struct lttng_ust_shm_handle; +/* + * 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 + * removed. + */ struct ltt_channel_ops { struct ltt_channel *(*channel_create)(const char *name, void *buf_addr, @@ -300,6 +370,11 @@ struct ltt_channel_ops { int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle); }; +/* + * 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 + * removed. + */ struct ltt_channel { /* * The pointers located in this private data are NOT safe to be @@ -327,6 +402,11 @@ struct ltt_channel { unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ }; +/* + * 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 + * removed. + */ struct ltt_session { int active; /* Is trace session active ? */ int been_active; /* Has trace session been active ? */ @@ -371,7 +451,6 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, int ltt_event_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, - void *filter, struct ltt_event **event); int ltt_channel_enable(struct ltt_channel *channel); @@ -403,9 +482,9 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx); void lttng_context_vtid_reset(void); void lttng_context_vpid_reset(void); -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata; -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard; -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; +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; struct ltt_transport *ltt_transport_find(const char *name); @@ -413,6 +492,10 @@ int ltt_probes_get_event_list(struct lttng_ust_tracepoint_list *list); 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); +int ltt_probes_get_field_list(struct lttng_ust_field_list *list); +void ltt_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); int ltt_wildcard_enable(struct session_wildcard *wildcard); int ltt_wildcard_disable(struct session_wildcard *wildcard); @@ -424,5 +507,12 @@ int ltt_loglevel_match(const struct lttng_event_desc *desc, int req_loglevel); void ltt_probes_create_wildcard_events(struct wildcard_entry *entry, struct session_wildcard *wildcard); +int lttng_filter_event_attach_bytecode(struct ltt_event *event, + struct lttng_ust_filter_bytecode *filter); +int lttng_filter_wildcard_attach_bytecode(struct session_wildcard *wildcard, + struct lttng_ust_filter_bytecode *filter); +void lttng_filter_event_link_bytecode(struct ltt_event *event, + struct lttng_ust_filter_bytecode *filter_bytecode); +void lttng_filter_wildcard_link_bytecode(struct session_wildcard *wildcard); #endif /* _LTTNG_UST_EVENTS_H */