Introduce event type field in common structure

[lttng-ust.git] / liblttng-ust / lttng-events.c

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 8762b24b8e39b1d293e107a6076e9af9c1a18c77..c74db4551f7db631026f38c4451d6c4a196dabd0 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -780,6 +780,7 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
                goto parent_error;
        }
        event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_recorder->parent->type = LTTNG_UST_EVENT_TYPE_RECORDER;
 
        event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
        if (!event_recorder_priv) {
@@ -873,6 +874,7 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
                goto parent_error;
        }
        event_notifier->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_notifier->parent->type = LTTNG_UST_EVENT_TYPE_NOTIFIER;
 
        event_notifier_priv = zmalloc(sizeof(struct lttng_ust_event_notifier_private));
        if (!event_notifier_priv) {
@@ -922,7 +924,7 @@ void _lttng_event_notifier_destroy(struct lttng_ust_event_notifier *event_notifi
        /* Remove from event_notifier hash table. */
        cds_hlist_del(&event_notifier->priv->hlist);
 
-       lttng_free_event_notifier_filter_runtime(event_notifier);
+       lttng_free_event_filter_runtime(event_notifier->parent);
 
        /* Free event_notifier enabler refs */
        cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
@@ -1377,7 +1379,7 @@ void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_record
        cds_hlist_del(&event_recorder->priv->hlist);
 
        lttng_destroy_context(event_recorder->ctx);
-       lttng_free_event_recorder_filter_runtime(event_recorder);
+       lttng_free_event_filter_runtime(event_recorder->parent);
        /* Free event enabler refs */
        cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
                        &event_recorder->parent->priv->enablers_ref_head, node)