#include <common/common.hpp>
#include <common/defaults.hpp>
+#include <common/urcu.hpp>
#include <string.h>
#include <urcu.h>
pthread_mutex_lock(&seed_lock);
if (!seed_init) {
- lttng_ht_seed = (unsigned long) time(NULL);
+ lttng_ht_seed = (unsigned long) time(nullptr);
seed_init = true;
}
pthread_mutex_unlock(&seed_lock);
ht = zmalloc<lttng_ht>();
- if (ht == NULL) {
+ if (ht == nullptr) {
PERROR("zmalloc lttng_ht");
goto error;
}
min_hash_alloc_size,
max_hash_buckets_size,
CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING,
- NULL);
+ nullptr);
/*
* There is already an assert in the RCU hashtable code so if the ht is
* NULL here there is a *huge* problem.
return ht;
error:
- return NULL;
+ return nullptr;
}
/*
{
int ret;
- ret = cds_lfht_destroy(ht->ht, NULL);
+ ret = cds_lfht_destroy(ht->ht, nullptr);
LTTNG_ASSERT(!ret);
free(ht);
}
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct(node->key, lttng_ht_seed),
ht->match_fct,
node->key,
&node->node);
- rcu_read_unlock();
LTTNG_ASSERT(node_ptr == &node->node);
}
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
cds_lfht_add(ht->ht, ht->hash_fct(node->key, lttng_ht_seed), &node->node);
- rcu_read_unlock();
}
/*
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
cds_lfht_add(ht->ht, ht->hash_fct((void *) node->key, lttng_ht_seed), &node->node);
- rcu_read_unlock();
}
/*
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
cds_lfht_add(ht->ht, ht->hash_fct(&node->key, lttng_ht_seed), &node->node);
- rcu_read_unlock();
}
/*
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct((void *) node->key, lttng_ht_seed),
ht->match_fct,
(void *) node->key,
&node->node);
- rcu_read_unlock();
LTTNG_ASSERT(node_ptr == &node->node);
}
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct(&node->key, lttng_ht_seed),
ht->match_fct,
&node->key,
&node->node);
- rcu_read_unlock();
LTTNG_ASSERT(node_ptr == &node->node);
}
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct((void *) &node->key, lttng_ht_seed),
ht->match_fct,
(void *) &node->key,
&node->node);
- rcu_read_unlock();
LTTNG_ASSERT(node_ptr == &node->node);
}
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_replace(ht->ht,
ht->hash_fct((void *) node->key, lttng_ht_seed),
ht->match_fct,
(void *) node->key,
&node->node);
- rcu_read_unlock();
if (!node_ptr) {
- return NULL;
+ return nullptr;
} else {
return lttng::utils::container_of(node_ptr, <tng_ht_node_ulong::node);
}
- LTTNG_ASSERT(node_ptr == &node->node);
}
/*
LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
node_ptr = cds_lfht_add_replace(ht->ht,
ht->hash_fct(&node->key, lttng_ht_seed),
ht->match_fct,
&node->key,
&node->node);
- rcu_read_unlock();
if (!node_ptr) {
- return NULL;
+ return nullptr;
} else {
+ LTTNG_ASSERT(node_ptr == &node->node);
return lttng::utils::container_of(node_ptr, <tng_ht_node_u64::node);
}
- LTTNG_ASSERT(node_ptr == &node->node);
}
/*
LTTNG_ASSERT(iter);
/* RCU read lock protects from ABA. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
ret = cds_lfht_del(ht->ht, iter->iter.node);
- rcu_read_unlock();
return ret;
}
LTTNG_ASSERT(ht->ht);
/* RCU read lock protects from ABA and allows RCU traversal. */
- rcu_read_lock();
+ lttng::urcu::read_lock_guard read_lock;
cds_lfht_count_nodes(ht->ht, &scb, &count, &sca);
- rcu_read_unlock();
return count;
}
LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
- return NULL;
+ return nullptr;
}
return lttng::utils::container_of(node, <tng_ht_node_str::node);
}
LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
- return NULL;
+ return nullptr;
}
return lttng::utils::container_of(node, <tng_ht_node_ulong::node);
}
LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
- return NULL;
+ return nullptr;
}
return lttng::utils::container_of(node, <tng_ht_node_u64::node);
}
LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
- return NULL;
+ return nullptr;
}
return lttng::utils::container_of(node, <tng_ht_node_two_u64::node);
}