Rename lttng_event_notifier_group events_ht to events_name_ht

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I64313d4b8255a717ef06ef7bf5944d2c1c4e24da

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index 8483a6a8f035b62872009f3bde8354821a338415..9c999898a0732d1bbd6d2c4cf6890eadfc2a96eb 100644 (file)
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -519,7 +519,7 @@ struct lttng_event_notifier_group {
        struct list_head node;          /* event notifier group list */
        struct list_head enablers_head; /* List of enablers */
        struct list_head event_notifiers_head; /* List of event notifier */
-       struct lttng_event_ht events_ht; /* Hash table of event notifiers */
+       struct lttng_event_ht events_name_ht; /* Hash table of event notifiers, indexed by name */
        struct lttng_kernel_channel_buffer_ops *ops;
        struct lttng_transport *transport;
        struct lttng_kernel_ring_buffer_channel *chan;          /* Ring buffer channel for event notifier group. */
@@ -699,7 +699,7 @@ struct lttng_event_ht *lttng_get_events_name_ht_from_enabler(struct lttng_event_
        {
                struct lttng_event_notifier_enabler *event_notifier_enabler =
                        container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
-               return &event_notifier_enabler->group->events_ht;
+               return &event_notifier_enabler->group->events_name_ht;
        }
        default:
                return NULL;

diff --git a/src/lttng-events.c b/src/lttng-events.c
index cc8459b0fc99cc3d6675e64106151d28f30d66a4..7a1305b2ee6f6781eb849de0c60a820be4984f4e 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -330,7 +330,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
        INIT_LIST_HEAD(&event_notifier_group->enablers_head);
        INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head);
        for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++)
-               INIT_HLIST_HEAD(&event_notifier_group->events_ht.table[i]);
+               INIT_HLIST_HEAD(&event_notifier_group->events_name_ht.table[i]);
 
        list_add(&event_notifier_group->node, &event_notifier_groups);