Refactoring: combine event recorder and notifier callback functions

[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..0cec28704e2bb5d949e3ac4ec0957d8bc0d548f2 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -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 {
@@ -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.