X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fust-events-internal.h;h=f351e954767f0fe0e8c19a6f92fa82e15a507383;hb=891d6b550bf16672b0c3a7b35362f231d6e10fc1;hp=1a94ba0ea3acf4d16136fb9c18843535e312aac4;hpb=68bb7559b0041c38158c9ed0528d91d655e7eb6c;p=lttng-ust.git diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h index 1a94ba0e..f351e954 100644 --- a/liblttng-ust/ust-events-internal.h +++ b/liblttng-ust/ust-events-internal.h @@ -15,6 +15,41 @@ #include #include + +struct lttng_ust_abi_obj; + +union lttng_ust_abi_args { + struct { + void *chan_data; + int wakeup_fd; + } channel; + struct { + int shm_fd; + int wakeup_fd; + } stream; + struct { + struct lttng_ust_abi_field_iter entry; + } field_list; + struct { + char *ctxname; + } app_context; + struct { + int event_notifier_notif_fd; + } event_notifier_handle; + struct { + void *counter_data; + } counter; + struct { + int shm_fd; + } counter_shm; +}; + +struct lttng_ust_abi_objd_ops { + long (*cmd)(int objd, unsigned int cmd, unsigned long arg, + union lttng_ust_abi_args *args, void *owner); + int (*release)(int objd); +}; + enum lttng_enabler_format_type { LTTNG_ENABLER_FORMAT_STAR_GLOB, LTTNG_ENABLER_FORMAT_EVENT, @@ -32,7 +67,7 @@ struct lttng_enabler { /* head list of struct lttng_ust_excluder_node */ struct cds_list_head excluder_head; - struct lttng_ust_event event_param; + struct lttng_ust_abi_event event_param; unsigned int enabled:1; }; @@ -81,13 +116,13 @@ struct lttng_ust_excluder_node { * struct lttng_ust_event_exclusion had variable sized array, * must be last field. */ - struct lttng_ust_event_exclusion excluder; + struct lttng_ust_abi_event_exclusion excluder; }; /* Data structures used by the tracer. */ struct tp_list_entry { - struct lttng_ust_tracepoint_iter tp; + struct lttng_ust_abi_tracepoint_iter tp; struct cds_list_head head; }; @@ -97,7 +132,7 @@ struct lttng_ust_tracepoint_list { }; struct tp_field_list_entry { - struct lttng_ust_field_iter field; + struct lttng_ust_abi_field_iter field; struct cds_list_head head; }; @@ -165,17 +200,70 @@ struct lttng_counter_transport { const struct lib_counter_config *client_config; }; -struct lttng_ust_event_private { - struct lttng_event *pub; /* Public event interface */ - - const struct lttng_event_desc *desc; - enum lttng_ust_instrumentation instrumentation; - struct cds_list_head node; /* Event list in session */ +struct lttng_ust_event_common_private { + struct lttng_ust_event_common *pub; /* Public event interface */ + const struct lttng_ust_event_desc *desc; /* 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 */ + uint64_t user_token; +}; + +struct lttng_ust_event_recorder_private { + struct lttng_ust_event_common_private parent; + + struct lttng_ust_event_recorder *pub; /* Public event interface */ + struct cds_list_head node; /* Event recorder list */ + struct cds_hlist_node hlist; /* Hash table of event recorders */ +}; + +struct lttng_ust_event_notifier_private { + struct lttng_ust_event_common_private parent; + + struct lttng_ust_event_notifier *pub; /* Public event notifier interface */ + struct lttng_event_notifier_group *group; /* weak ref */ + size_t num_captures; /* Needed to allocate the msgpack array. */ + uint64_t error_counter_index; + struct cds_list_head node; /* Event notifier list */ + struct cds_hlist_node hlist; /* Hash table of event notifiers */ +}; + +struct lttng_ust_bytecode_runtime_private { + struct bytecode_runtime *pub; /* Public bytecode runtime interface */ + + struct lttng_ust_bytecode_node *bc; + int link_failed; + /* + * Pointer to a URCU-protected pointer owned by an `struct + * lttng_session`or `struct lttng_event_notifier_group`. + */ + struct lttng_ctx **pctx; +}; + +struct lttng_ust_session_private { + struct lttng_session *pub; /* Public session interface */ + + int been_active; /* Been active ? */ + int objd; /* Object associated */ + struct cds_list_head chan_head; /* Channel list head */ + struct cds_list_head events_head; /* list of events */ + struct cds_list_head node; /* Session list */ + + /* New UST 2.1 */ + /* List of enablers */ + struct cds_list_head enablers_head; + struct lttng_ust_event_ht events_ht; /* ht of events */ + void *owner; /* object owner */ + int tstate:1; /* Transient enable state */ + + /* New UST 2.4 */ + int statedump_pending:1; + + /* New UST 2.8 */ + struct lttng_ust_enum_ht enums_ht; /* ht of enumerations */ + struct cds_list_head enums_head; + struct lttng_ctx *ctx; /* contexts for filters. */ }; static inline @@ -201,7 +289,7 @@ struct lttng_enabler *lttng_event_notifier_enabler_as_enabler( LTTNG_HIDDEN struct lttng_event_enabler *lttng_event_enabler_create( enum lttng_enabler_format_type format_type, - struct lttng_ust_event *event_param, + struct lttng_ust_abi_event *event_param, struct lttng_channel *chan); /* @@ -240,7 +328,7 @@ int lttng_event_enabler_attach_filter_bytecode( */ LTTNG_HIDDEN int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler, - struct lttng_ust_context *ctx); + struct lttng_ust_abi_context *ctx); /* * Attach exclusion list to `struct lttng_event_enabler` and all @@ -258,7 +346,7 @@ int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *enabler, * event_notifier enabler) to ensure each is linked to the provided instance. */ LTTNG_HIDDEN -void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, +void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc, struct lttng_ctx **ctx, struct cds_list_head *instance_bytecode_runtime_head, struct cds_list_head *enabler_bytecode_runtime_head); @@ -289,7 +377,7 @@ LTTNG_HIDDEN struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( struct lttng_event_notifier_group *event_notifier_group, enum lttng_enabler_format_type format_type, - struct lttng_ust_event_notifier *event_notifier_param); + struct lttng_ust_abi_event_notifier *event_notifier_param); /* * Destroy a `struct lttng_event_notifier_enabler` object. @@ -342,11 +430,7 @@ int lttng_event_notifier_enabler_attach_exclusion( struct lttng_ust_excluder_node **excluder); LTTNG_HIDDEN -void lttng_free_event_filter_runtime(struct lttng_event *event); - -LTTNG_HIDDEN -void lttng_free_event_notifier_filter_runtime( - struct lttng_event_notifier *event_notifier); +void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event); /* * Connect the probe on all enablers matching this event description. @@ -404,10 +488,10 @@ LTTNG_HIDDEN void lttng_probes_prune_field_list(struct lttng_ust_field_list *list); LTTNG_HIDDEN -struct lttng_ust_tracepoint_iter * +struct lttng_ust_abi_tracepoint_iter * lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list); LTTNG_HIDDEN -struct lttng_ust_field_iter * +struct lttng_ust_abi_field_iter * lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list); LTTNG_HIDDEN @@ -449,7 +533,7 @@ LTTNG_HIDDEN void lttng_transport_unregister(struct lttng_transport *transport); LTTNG_HIDDEN -void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc); +void lttng_probe_provider_unregister_events(struct lttng_ust_probe_desc *desc); LTTNG_HIDDEN int lttng_fix_pending_events(void); @@ -459,6 +543,20 @@ struct cds_list_head *lttng_get_probe_list_head(void); LTTNG_HIDDEN struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session, - const struct lttng_enum_desc *enum_desc); + const struct lttng_ust_enum_desc *enum_desc); + +LTTNG_HIDDEN +int lttng_abi_create_root_handle(void); + +LTTNG_HIDDEN +const struct lttng_ust_abi_objd_ops *lttng_ust_abi_objd_ops(int id); +LTTNG_HIDDEN +int lttng_ust_abi_objd_unref(int id, int is_owner); +LTTNG_HIDDEN +void lttng_ust_abi_exit(void); +LTTNG_HIDDEN +void lttng_ust_abi_events_exit(void); +LTTNG_HIDDEN +void lttng_ust_abi_objd_table_owner_cleanup(void *owner); #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */