X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=96435c481c7b5aa117ed04b893a057bd531dfdfd;hb=ad496c21b85087f600271299c9cd2a3ffe00c4c1;hp=6b4863fd494540b921c6158544b94a8d3ebf3929;hpb=df854e41ded4203a5b86bac062b8604bb038759a;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 6b4863fd..96435c48 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -19,13 +19,15 @@ */ #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; @@ -75,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, \ }, \ @@ -108,7 +110,7 @@ struct lttng_integer_type { - _float_mant_dig(_type), \ .mant_dig = _float_mant_dig(_type), \ .alignment = lttng_alignof(_type) * CHAR_BIT, \ - .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \ + .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \ }, \ } \ @@ -183,9 +185,33 @@ struct lttng_ctx { unsigned int allocated_fields; }; -struct tracepoint_loglevel_entry { - const char *identifier; - long value; +/* + * 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 { @@ -194,21 +220,24 @@ 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 */ }; -struct tp_loglevel_iter { - struct lttng_probe_desc *desc; - const struct tracepoint_loglevel_entry *loglevel; +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; @@ -228,8 +257,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; @@ -241,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, @@ -289,12 +319,12 @@ 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; /* 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 { @@ -304,10 +334,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 char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ + unsigned int metadata_dumped:1; }; struct ltt_transport { @@ -327,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, @@ -378,4 +409,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 */