X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=c739f71d1525a860fa07cf3c55663a604a882438;hb=362a65de6aba2cbc27c61c9fc23e755cb617837f;hp=9d6568573d77ab523bff7d5fd3af03a0cd0da4fc;hpb=871ad31c32e253edbd2f85f40ffd77dc3315efad;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 9d656857..c739f71d 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -351,29 +351,6 @@ struct lttng_probe_desc { /* Data structures used by the tracer. */ -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 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 lttng_event; - /* * Bytecode interpreter return value masks. */ @@ -384,16 +361,18 @@ enum lttng_bytecode_interpreter_ret { }; struct lttng_interpreter_output; +struct lttng_ust_bytecode_runtime_private; /* - * This structure is used in the probes. More specifically, the `filter` and - * `node` fields are explicity used in the probes. When modifying this - * structure we must not change the layout of these two fields as it is - * considered ABI. + * This structure is used in the probes. More specifically, the + * `interpreter_funcs` and `node` fields are explicity used in the + * probes. When modifying this structure we must not change the layout + * of these two fields as it is considered ABI. */ struct lttng_bytecode_runtime { + struct lttng_ust_bytecode_runtime_private *priv; + /* Associated bytecode */ - struct lttng_ust_bytecode_node *bc; union { uint64_t (*filter)(void *interpreter_data, const char *interpreter_stack_data); @@ -401,27 +380,7 @@ struct lttng_bytecode_runtime { const char *interpreter_stack_data, struct lttng_interpreter_output *interpreter_output); } interpreter_funcs; - int link_failed; struct cds_list_head node; /* list of bytecode runtime in event */ - /* - * Pointer to a URCU-protected pointer owned by an `struct - * lttng_session`or `struct lttng_event_notifier_group`. - */ - struct lttng_ctx **pctx; -}; - -/* - * Objects in a linked-list of enablers, owned by an event or event_notifier. - * This is used because an event (or a event_notifier) can be enabled by more - * than one enabler and we want a quick way to iterate over all enablers of an - * object. - * - * For example, event rules "my_app:a*" and "my_app:ab*" will both match the - * event with the name "my_app:abc". - */ -struct lttng_enabler_ref { - struct cds_list_head node; /* enabler ref list */ - struct lttng_enabler *ref; /* backward ref */ }; /* @@ -432,22 +391,19 @@ struct lttng_enabler_ref { * UST. Fields need to be only added at the end, never reordered, never * removed. */ + +struct lttng_ust_event_private; + struct lttng_event { + struct lttng_ust_event_private *priv; /* Private event interface */ + unsigned int id; - struct lttng_channel *chan; int enabled; - const struct lttng_event_desc *desc; - struct lttng_ctx *ctx; - enum lttng_ust_instrumentation instrumentation; - struct cds_list_head node; /* Event list in session */ - + int has_enablers_without_bytecode; /* list of struct lttng_bytecode_runtime, sorted by seqnum */ struct cds_list_head filter_bytecode_runtime_head; - int has_enablers_without_bytecode; - /* Backward references: list of lttng_enabler_ref (ref to enablers) */ - struct cds_list_head enablers_ref_head; - struct cds_hlist_node hlist; /* session ht of events */ - int registered; /* has reg'd tracepoint probe */ + struct lttng_channel *chan; + struct lttng_ctx *ctx; }; struct lttng_event_notifier { @@ -544,15 +500,7 @@ struct lttng_channel { int tstate:1; /* Transient enable state */ }; -#define LTTNG_COUNTER_DIMENSION_MAX 8 - -struct lttng_counter_dimension { - uint64_t size; - uint64_t underflow_index; - uint64_t overflow_index; - uint8_t has_underflow; - uint8_t has_overflow; -}; +struct lttng_counter_dimension; struct lttng_counter_ops { struct lib_counter *(*counter_create)(size_t nr_dimensions, @@ -631,70 +579,8 @@ struct lttng_session { struct lttng_ctx *ctx; /* contexts for filters. */ }; -struct lttng_counter { - int objd; - struct lttng_event_notifier_group *event_notifier_group; /* owner */ - struct lttng_counter_transport *transport; - struct lib_counter *counter; - struct lttng_counter_ops *ops; -}; - -struct lttng_event_notifier_group { - int objd; - void *owner; - int notification_fd; - struct cds_list_head node; /* Event notifier group handle list */ - struct cds_list_head enablers_head; - struct cds_list_head event_notifiers_head; /* list of event_notifiers */ - struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */ - struct lttng_ctx *ctx; /* contexts for filters. */ - - struct lttng_counter *error_counter; - size_t error_counter_len; -}; - -struct lttng_transport { - char *name; - struct cds_list_head node; - struct lttng_channel_ops ops; - const struct lttng_ust_lib_ring_buffer_config *client_config; -}; - -struct lttng_counter_transport { - char *name; - struct cds_list_head node; - struct lttng_counter_ops ops; - const struct lib_counter_config *client_config; -}; - -struct lttng_session *lttng_session_create(void); -int lttng_session_enable(struct lttng_session *session); -int lttng_session_disable(struct lttng_session *session); -int lttng_session_statedump(struct lttng_session *session); -void lttng_session_destroy(struct lttng_session *session); - -struct lttng_channel *lttng_channel_create(struct lttng_session *session, - const char *transport_name, - 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, - struct lttng_channel *chan_priv_init); - -int lttng_channel_enable(struct lttng_channel *channel); -int lttng_channel_disable(struct lttng_channel *channel); - -void lttng_transport_register(struct lttng_transport *transport); -void lttng_transport_unregister(struct lttng_transport *transport); - int lttng_probe_register(struct lttng_probe_desc *desc); void lttng_probe_unregister(struct lttng_probe_desc *desc); -void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc); -int lttng_fix_pending_events(void); -int lttng_probes_init(void); -void lttng_probes_exit(void); /* * Can be used by applications that change their procname to clear the ust cached value. @@ -703,27 +589,8 @@ void lttng_context_procname_reset(void); struct lttng_transport *lttng_transport_find(const char *name); -int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list); -void lttng_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 lttng_probes_get_field_list(struct lttng_ust_field_list *list); -void lttng_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); - -void lttng_free_event_filter_runtime(struct lttng_event *event); - -struct cds_list_head *lttng_get_probe_list_head(void); int lttng_session_active(void); -typedef int (*t_statedump_func_ptr)(struct lttng_session *session); -void lttng_handle_pending_statedump(void *owner); -struct cds_list_head *_lttng_get_sessions(void); - -struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session, - const struct lttng_enum_desc *enum_desc); - void lttng_ust_dl_update(void *ip); #ifdef __cplusplus