X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=b74a176755af19f0bc12da564035a14db5bd3877;hb=e6c12e3dd164fcab19db5985f8729e3d1767571c;hp=63162948d67563028a130ba1c833075f6b5b9d21;hpb=23c8854a5fa1120df5cfdfbf08f00e00976f95fa;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 63162948..b74a1767 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -19,6 +19,7 @@ */ #include +#include #include #include #include @@ -183,25 +184,99 @@ struct lttng_ctx { unsigned int allocated_fields; }; +struct tracepoint_loglevel_entry { + const char *identifier; + long value; +}; + +struct loglevel_entry; + +/* + * Entry describing a per-session active loglevel, along with the event + * attribute and channel information configuring the events that need to + * be enabled. + */ +struct session_loglevel { + 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 loglevels */ + struct cds_list_head session_list; + struct loglevel_entry *entry; + unsigned int enabled:1; +}; + +/* + * Entry describing an active loglevel (per name) for all sessions. + */ +struct loglevel_entry { + struct cds_hlist_node hlist; + struct cds_list_head session_list; + char name[0]; +}; + +/* + * 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; + struct wildcard_entry *entry; + unsigned int enabled:1; +}; + +/* + * Entry describing an active wildcard (per name) for all sessions. + */ +struct wildcard_entry { + struct cds_list_head list; + struct cds_list_head session_list; + 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 struct lttng_event_desc *event_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; +}; + +struct lttng_ust_tracepoint_list { + struct tp_list_entry *iter; + struct cds_list_head head; +}; + 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; @@ -214,8 +289,10 @@ struct ltt_event { union { } u; struct cds_list_head list; /* Event list */ + struct cds_list_head loglevel_list; /* Event list for loglevel */ + 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; @@ -275,7 +352,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; @@ -290,10 +367,12 @@ 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 loglevels; /* Loglevel 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 { @@ -324,9 +403,10 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, 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); @@ -363,4 +443,32 @@ 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); + +struct loglevel_entry *get_loglevel(const char *name); +struct loglevel_entry *get_loglevel_value(int64_t value); +struct session_loglevel *add_loglevel(const char *name, + struct ltt_channel *chan, + struct lttng_ust_event *event_param); +void _remove_loglevel(struct session_loglevel *loglevel); +int ltt_loglevel_enable(struct session_loglevel *loglevel); +int ltt_loglevel_disable(struct session_loglevel *loglevel); +int ltt_loglevel_create(struct ltt_channel *chan, + struct lttng_ust_event *event_param, + struct session_loglevel **sl); + +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); + #endif /* _LTTNG_UST_EVENTS_H */