X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=8a2fa14c04e1c5f2247c6f303d750c7d932e5246;hb=38cb89917116813af9f12bfeb2c389628e2ac901;hp=f1ef8c91ee7f6f52cf6e7105147e0317c2dbc7a2;hpb=49365f4b706194cafe75d8b759554bf9de743c1d;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index f1ef8c91..8a2fa14c 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 @@ -180,10 +181,11 @@ struct lttng_enum { /* Event field description */ -#define LTTNG_UST_EVENT_FIELD_PADDING 32 +#define LTTNG_UST_EVENT_FIELD_PADDING 28 struct lttng_event_field { const char *name; struct lttng_type type; + unsigned int written; /* written into trace */ char padding[LTTNG_UST_EVENT_FIELD_PADDING]; }; @@ -211,7 +213,7 @@ struct lttng_ctx { #define LTTNG_UST_EVENT_DESC_PADDING 40 struct lttng_event_desc { const char *name; - void *probe_callback; + void (*probe_callback)(void); const struct lttng_event_ctx *ctx; /* context */ const struct lttng_event_field *fields; /* event payload */ unsigned int nr_fields; @@ -244,6 +246,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; }; @@ -256,6 +259,7 @@ 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]; }; @@ -270,7 +274,19 @@ 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 @@ -281,7 +297,8 @@ struct ltt_event { struct ltt_channel *chan; int enabled; const struct lttng_event_desc *desc; - void *filter; + int (*filter)(void *filter_data, const char *filter_stack_data); + void *filter_data; struct lttng_ctx *ctx; enum lttng_ust_instrumentation instrumentation; union { @@ -289,6 +306,7 @@ struct ltt_event { struct cds_list_head list; /* Event list */ struct cds_list_head wildcard_list; /* Event list for wildcard */ struct ust_pending_probe *pending_probe; + struct lttng_ust_filter_bytecode *filter_bytecode; unsigned int metadata_dumped:1; }; @@ -401,7 +419,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); @@ -433,9 +450,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); @@ -443,6 +460,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); @@ -454,5 +475,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 */