X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=2f00440bdc173dbced449363e252860c190cd178;hb=a7859af5c73c3f7cc863702d322d86fc2c4523ab;hp=afcc67f910795aaf10cfa63a2be3e0fa58f34741;hpb=05ceaafdd290220147a1faf4ca78d440f1e279b4;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index afcc67f9..2f00440b 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -19,6 +19,7 @@ */ #include +#include #include #include #include @@ -183,19 +184,59 @@ struct lttng_ctx { unsigned int allocated_fields; }; +/* + * Entry describing a per-session active wildcard, along with the event + * attribute and channel information configuring the events that need to + * be enabled. + */ +struct session_wildcard { + struct ltt_channel *chan; + struct lttng_ctx *ctx; /* TODO */ + struct lttng_ust_event event_param; + struct cds_list_head events; /* list of events enabled */ + 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; + unsigned int enabled:1; +}; + +/* + * Entry describing an active wildcard (per name) for all sessions. + */ +struct wildcard_entry { + /* node of global wildcards list */ + 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 int **loglevel; }; struct lttng_probe_desc { - const struct lttng_event_desc *event_desc; + const char *provider; + const struct lttng_event_desc **event_desc; unsigned int nr_events; struct cds_list_head head; /* chain registered probes */ - struct tracepoint_loglevel *loglevels; +}; + +struct tp_list_entry { + struct lttng_ust_tracepoint_iter tp; + struct cds_list_head head; +}; + +struct lttng_ust_tracepoint_list { + struct tp_list_entry *iter; + struct cds_list_head head; }; struct ust_pending_probe; @@ -215,8 +256,9 @@ struct ltt_event { union { } u; struct cds_list_head list; /* Event list */ + struct cds_list_head wildcard_list; /* Event list for wildcard */ struct ust_pending_probe *pending_probe; - int metadata_dumped:1; + unsigned int metadata_dumped:1; }; struct channel; @@ -228,14 +270,14 @@ struct ltt_channel_ops { 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 **shm_fd, int **wait_fd, + uint64_t **memory_map_size, struct ltt_channel *chan_priv_init); void (*channel_destroy)(struct ltt_channel *ltt_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); + 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); int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx, @@ -276,7 +318,7 @@ struct ltt_channel { struct ltt_channel_ops *ops; int header_type; /* 0: unset, 1: compact, 2: large */ struct lttng_ust_shm_handle *handle; /* shared-memory handle */ - int metadata_dumped:1; + unsigned int metadata_dumped:1; /* Channel ID, available for consumer too */ unsigned int id; @@ -291,10 +333,11 @@ struct ltt_session { struct ltt_channel *metadata; /* Metadata channel */ struct cds_list_head chan; /* Channel list head */ struct cds_list_head events; /* Event list head */ + struct cds_list_head wildcards; /* Wildcard list head */ struct cds_list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ uuid_t uuid; /* Trace session unique ID */ - int metadata_dumped:1; + unsigned int metadata_dumped:1; }; struct ltt_transport { @@ -303,17 +346,6 @@ struct ltt_transport { struct ltt_channel_ops ops; }; -struct tracepoint_loglevel_enum_entry { - const char *identifier; - long value; -}; - -/* mapping between tracepoint and loglevel */ -struct tracepoint_loglevel { - const char *name; - const struct tracepoint_loglevel_enum_entry *loglevel; -}; - struct ltt_session *ltt_session_create(void); int ltt_session_enable(struct ltt_session *session); int ltt_session_disable(struct ltt_session *session); @@ -325,20 +357,21 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session, 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 **shm_fd, int **wait_fd, + uint64_t **memory_map_size, struct ltt_channel *chan_priv_init); struct ltt_channel *ltt_global_channel_create(struct ltt_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 **shm_fd, int **wait_fd, + uint64_t **memory_map_size); -struct ltt_event *ltt_event_create(struct ltt_channel *chan, - struct lttng_ust_event *event_param, - void *filter); +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); int ltt_channel_disable(struct ltt_channel *channel); @@ -375,4 +408,20 @@ const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwri struct ltt_transport *ltt_transport_find(const char *name); +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_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 */