For clarity, rename the field to "events" to indicate that it contains
the channel's events.
Change-Id: I0bd90c13d7c8e313fff72eb18d0d7ebfc23762d4
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
"(err = %d)", ret);
goto end;
}
"(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);
event, node.node) {
ret = ust_metadata_event_statedump(registry,
chan, event);
key.name[sizeof(key.name) - 1] = '\0';
key.signature = sig;
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;
node = lttng_ht_iter_get_node_u64(&iter);
if (!node) {
goto end;
* This is an add unique with a custom match function for event. The node
* are matched using the event name and signature.
*/
* 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) {
/*
if (nptr != &event->node.node) {
if (buffer_type == LTTNG_BUFFER_PER_UID) {
/*
/* Delete the node first. */
iter.iter.node = &event->node.node;
/* 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);
LTTNG_ASSERT(!ret);
call_rcu(&event->node.head, destroy_event_rcu);
struct ust_registry_channel *chan =
caa_container_of(head, struct ust_registry_channel, rcu_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);
}
free(chan->ctx_fields);
free(chan);
}
rcu_read_lock();
/* Destroy all event associated with this registry. */
cds_lfht_for_each_entry(
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);
}
/* Delete the node from the ht and free it. */
ust_registry_destroy_event(chan, event);
}
- 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. */
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
/*
* Assign a channel ID right now since the event notification comes
* Hash table containing events sent by the UST tracer. MUST be accessed
* with a RCU read side lock acquired.
*/
* Hash table containing events sent by the UST tracer. MUST be accessed
* with a RCU read side lock acquired.
*/
+ 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. */
/* 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. */