Refactoring: struct lttng_enum_desc and lttng_enum_entry

[lttng-ust.git] / liblttng-ust / ust-events-internal.h

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index effd747d0ca1ef76fe884123c9e57108f507cb7a..f351e954767f0fe0e8c19a6f92fa82e15a507383 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -203,7 +203,7 @@ struct lttng_counter_transport {
 struct lttng_ust_event_common_private {
        struct lttng_ust_event_common *pub;     /* Public event interface */
 
-       const struct lttng_event_desc *desc;
+       const struct lttng_ust_event_desc *desc;
        /* Backward references: list of lttng_enabler_ref (ref to enablers) */
        struct cds_list_head enablers_ref_head;
        int registered;                 /* has reg'd tracepoint probe */
@@ -214,19 +214,19 @@ 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 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 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 cds_list_head node;              /* Event notifier list */
+       struct cds_hlist_node hlist;            /* Hash table of event notifiers */
 };
 
 struct lttng_ust_bytecode_runtime_private {
@@ -346,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);
@@ -430,11 +430,7 @@ int lttng_event_notifier_enabler_attach_exclusion(
                struct lttng_ust_excluder_node **excluder);
 
 LTTNG_HIDDEN
-void lttng_free_event_recorder_filter_runtime(struct lttng_ust_event_recorder *event_recorder);
-
-LTTNG_HIDDEN
-void lttng_free_event_notifier_filter_runtime(
-               struct lttng_ust_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.
@@ -537,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);
@@ -547,7 +543,7 @@ 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);