From 0d19be9d7e89fa4ff548592edd6d00a723070ced Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 6 Jan 2022 12:49:09 -0500 Subject: [PATCH] lttng-sessiond: rename ust_registry_channel::ht to events MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For clarity, rename the field to "events" to indicate that it contains the channel's events. Change-Id: I0bd90c13d7c8e313fff72eb18d0d7ebfc23762d4 Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.cpp | 2 +- src/bin/lttng-sessiond/ust-registry.cpp | 27 +++++++++++++------------ src/bin/lttng-sessiond/ust-registry.hpp | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp index 47c049b31..49fa0c686 100644 --- a/src/bin/lttng-sessiond/cmd.cpp +++ b/src/bin/lttng-sessiond/cmd.cpp @@ -4366,7 +4366,7 @@ int ust_regenerate_metadata(struct ltt_ust_session *usess) "(err = %d)", ret); goto end; } - cds_lfht_for_each_entry(chan->ht->ht, &iter_event.iter, + cds_lfht_for_each_entry(chan->events->ht, &iter_event.iter, event, node.node) { ret = ust_metadata_event_statedump(registry, chan, event); diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp index effb31999..0b92d19c5 100644 --- a/src/bin/lttng-sessiond/ust-registry.cpp +++ b/src/bin/lttng-sessiond/ust-registry.cpp @@ -368,8 +368,8 @@ struct ust_registry_event *ust_registry_find_event( key.name[sizeof(key.name) - 1] = '\0'; key.signature = sig; - cds_lfht_lookup(chan->ht->ht, chan->ht->hash_fct(&key, lttng_ht_seed), - chan->ht->match_fct, &key, &iter.iter); + cds_lfht_lookup(chan->events->ht, chan->events->hash_fct(&key, lttng_ht_seed), + chan->events->match_fct, &key, &iter.iter); node = lttng_ht_iter_get_node_u64(&iter); if (!node) { goto end; @@ -446,8 +446,8 @@ int ust_registry_create_event(struct ust_registry_session *session, * This is an add unique with a custom match function for event. The node * are matched using the event name and signature. */ - nptr = cds_lfht_add_unique(chan->ht->ht, chan->ht->hash_fct(event, - lttng_ht_seed), chan->ht->match_fct, event, &event->node.node); + nptr = cds_lfht_add_unique(chan->events->ht, chan->events->hash_fct(event, + lttng_ht_seed), chan->events->match_fct, event, &event->node.node); if (nptr != &event->node.node) { if (buffer_type == LTTNG_BUFFER_PER_UID) { /* @@ -514,7 +514,7 @@ void ust_registry_destroy_event(struct ust_registry_channel *chan, /* Delete the node first. */ iter.iter.node = &event->node.node; - ret = lttng_ht_del(chan->ht, &iter); + ret = lttng_ht_del(chan->events, &iter); LTTNG_ASSERT(!ret); call_rcu(&event->node.head, destroy_event_rcu); @@ -702,9 +702,10 @@ void destroy_channel_rcu(struct rcu_head *head) struct ust_registry_channel *chan = caa_container_of(head, struct ust_registry_channel, rcu_head); - if (chan->ht) { - lttng_ht_destroy(chan->ht); + if (chan->events) { + lttng_ht_destroy(chan->events); } + free(chan->ctx_fields); free(chan); } @@ -731,11 +732,11 @@ static void destroy_channel(struct ust_registry_channel *chan, bool notif) } } - if (chan->ht) { + if (chan->events) { rcu_read_lock(); /* Destroy all event associated with this registry. */ cds_lfht_for_each_entry( - chan->ht->ht, &iter.iter, event, node.node) { + chan->events->ht, &iter.iter, event, node.node) { /* Delete the node from the ht and free it. */ ust_registry_destroy_event(chan, event); } @@ -762,15 +763,15 @@ int ust_registry_channel_add(struct ust_registry_session *session, goto error_alloc; } - chan->ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING); - if (!chan->ht) { + chan->events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING); + if (!chan->events) { ret = -ENOMEM; goto error; } /* Set custom match function. */ - chan->ht->match_fct = ht_match_event; - chan->ht->hash_fct = ht_hash_event; + chan->events->match_fct = ht_match_event; + chan->events->hash_fct = ht_hash_event; /* * Assign a channel ID right now since the event notification comes diff --git a/src/bin/lttng-sessiond/ust-registry.hpp b/src/bin/lttng-sessiond/ust-registry.hpp index 3bf439f23..39afe90ce 100644 --- a/src/bin/lttng-sessiond/ust-registry.hpp +++ b/src/bin/lttng-sessiond/ust-registry.hpp @@ -146,7 +146,7 @@ struct ust_registry_channel { * Hash table containing events sent by the UST tracer. MUST be accessed * with a RCU read side lock acquired. */ - struct lttng_ht *ht; + struct lttng_ht *events; /* Next event ID available for a newly registered event. */ uint32_t next_event_id; /* Once this value reaches UINT32_MAX, no more id can be allocated. */ -- 2.34.1