X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=476ddd7845a5ea264bf0b837ad37aaa91ad66d86;hb=52367557562008ab80a94adbaf047dd44b282d15;hp=5867b124878c6993291591094d049634c5c699f1;hpb=1f18504e513d549093432516f983105ad5142808;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 5867b124..476ddd78 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -20,13 +20,14 @@ #include #include -#include #include #include #include -#include +#include #include +#define LTTNG_UST_UUID_LEN 16 + struct ltt_channel; struct ltt_session; struct lttng_ust_lib_ring_buffer_ctx; @@ -76,7 +77,7 @@ struct lttng_enum_entry { .size = sizeof(_type) * CHAR_BIT, \ .alignment = lttng_alignof(_type) * CHAR_BIT, \ .signedness = lttng_is_signed_type(_type), \ - .reverse_byte_order = _byte_order != __BYTE_ORDER, \ + .reverse_byte_order = _byte_order != BYTE_ORDER, \ .base = _base, \ .encoding = lttng_encode_##_encoding, \ }, \ @@ -184,24 +185,32 @@ struct lttng_ctx { unsigned int allocated_fields; }; -struct tracepoint_loglevel_entry { - const char *identifier; - long value; -}; - /* - * Entry describing an active loglevel, along with the event attribute - * and channel information configuring the events that need to be - * enabled. + * Entry describing a per-session active wildcard, along with the event + * attribute and channel information configuring the events that need to + * be enabled. */ -struct loglevel_entry { - struct cds_hlist_node hlist; +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 loglevels */ + 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]; }; @@ -211,15 +220,13 @@ struct lttng_event_desc { 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; + const int **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 */ }; @@ -238,9 +245,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; @@ -253,7 +257,7 @@ 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; unsigned int metadata_dumped:1; }; @@ -267,14 +271,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, @@ -320,7 +324,7 @@ struct ltt_channel { /* Channel ID, available for consumer too */ unsigned int id; /* Copy of session UUID for consumer (availability through shm) */ - uuid_t uuid; /* Trace session unique ID */ + unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ }; struct ltt_session { @@ -330,10 +334,10 @@ 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 */ + unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ unsigned int metadata_dumped:1; }; @@ -354,16 +358,16 @@ 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); int ltt_event_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, @@ -410,15 +414,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 loglevel_entry *get_loglevel(const char *name); -struct loglevel_entry *add_loglevel(const char *name, - struct ltt_channel *chan, - struct lttng_ust_event *event_param); -void _remove_loglevel(struct loglevel_entry *e); -int ltt_loglevel_enable(struct loglevel_entry *loglevel); -int ltt_loglevel_disable(struct loglevel_entry *loglevel); -int ltt_loglevel_create(struct ltt_channel *chan, +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 loglevel_entry **_entry); + 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 */