X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fust-events-internal.h;h=ec2b8e4b67ca2858229075480d222bebe1959608;hb=b1f720f08ebd9f83045a8ed7689658b8171a8adf;hp=536a70d926010446baef6c1a816dbe30e5b2e894;hpb=362a65de6aba2cbc27c61c9fc23e755cb617837f;p=lttng-ust.git diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h index 536a70d9..ec2b8e4b 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,33 @@ struct lttng_counter_transport { const struct lib_counter_config *client_config; }; -struct lttng_ust_event_private { - struct lttng_event *pub; /* Public event interface */ +struct lttng_ust_event_common_private { + struct lttng_ust_event_common *pub; /* Public event interface */ const struct lttng_event_desc *desc; - enum lttng_ust_instrumentation instrumentation; - struct cds_list_head node; /* Event list in session */ - /* 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 list in session */ + struct cds_hlist_node hlist; /* session ht of events */ +}; + +struct lttng_ust_event_notifier_private { + struct lttng_ust_event_common_private parent; + + struct lttng_ust_event_notifier *pub; /* Public event notifier interface */ + struct cds_hlist_node hlist; /* hashtable of event_notifiers */ + struct cds_list_head node; /* event_notifier list in session */ + struct lttng_event_notifier_group *group; /* weak ref */ + size_t num_captures; /* Needed to allocate the msgpack array. */ + uint64_t error_counter_index; }; struct lttng_ust_bytecode_runtime_private { @@ -190,6 +241,31 @@ struct lttng_ust_bytecode_runtime_private { 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 struct lttng_enabler *lttng_event_enabler_as_enabler( struct lttng_event_enabler *event_enabler) @@ -213,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); /* @@ -252,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 @@ -301,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. @@ -354,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. @@ -416,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 @@ -473,4 +545,18 @@ LTTNG_HIDDEN struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session, const struct lttng_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 */