#include <time.h>
#include "rcuja-internal.h"
-#include "bitfield.h"
static unsigned long hash_seed;
struct cds_ja_shadow_node *rcuja_shadow_set(struct cds_lfht *ht,
struct cds_ja_inode_flag *new_node_flag,
struct cds_ja_shadow_node *inherit_from,
- struct cds_ja *ja)
+ struct cds_ja *ja, int level)
{
struct cds_ja_shadow_node *shadow_node;
struct cds_lfht_node *ret_node;
*/
if (inherit_from) {
shadow_node->lock = inherit_from->lock;
+ shadow_node->level = inherit_from->level;
} else {
shadow_node->lock = calloc(sizeof(*shadow_node->lock), 1);
if (!shadow_node->lock) {
return NULL;
}
pthread_mutex_init(shadow_node->lock, NULL);
+ shadow_node->level = level;
}
flavor = cds_lfht_rcu_flavor(ht);
{
struct cds_ja_shadow_node *shadow_node =
caa_container_of(head, struct cds_ja_shadow_node, head);
- free(ja_node_ptr(shadow_node->node_flag));
+ free_cds_ja_node(shadow_node->ja, ja_node_ptr(shadow_node->node_flag));
free(shadow_node);
}
struct cds_ja_shadow_node *shadow_node =
caa_container_of(head, struct cds_ja_shadow_node, head);
assert(shadow_node->level);
- free(ja_node_ptr(shadow_node->node_flag));
+ free_cds_ja_node(shadow_node->ja, ja_node_ptr(shadow_node->node_flag));
free(shadow_node->lock);
free(shadow_node);
}
* don't let RCU JA use a node being removed.
*/
ret = cds_lfht_del(ht, lookup_node);
- if (!ret) {
- if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
- && shadow_node->level) {
- if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_node_and_lock);
- } else {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_node);
- }
+ if (ret)
+ goto unlock;
+ if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
+ && shadow_node->level) {
+ if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_node_and_lock);
} else {
- if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_lock);
- } else {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node);
- }
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_node);
+ }
+ } else {
+ if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_lock);
+ } else {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node);
}
}
+unlock:
if (lookup_shadow) {
lockret = pthread_mutex_unlock(shadow_node->lock);
assert(!lockret);
__attribute__((visibility("protected")))
void rcuja_shadow_prune(struct cds_lfht *ht,
unsigned int flags,
- void (*free_node_cb)(struct rcu_head *head))
+ void (*free_node_cb)(struct cds_ja_node *node))
{
const struct rcu_flavor_struct *flavor;
struct cds_ja_shadow_node *shadow_node;
int ret, lockret;
flavor = cds_lfht_rcu_flavor(ht);
+ /*
+ * Read-side lock is needed to ensure hash table node existence
+ * vs concurrent resize.
+ */
flavor->read_lock();
cds_lfht_for_each_entry(ht, &iter, shadow_node, ht_node) {
lockret = pthread_mutex_lock(shadow_node->lock);
assert(!lockret);
ret = cds_lfht_del(ht, &shadow_node->ht_node);
- if (!ret) {
- if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
- && shadow_node->level) {
- if (shadow_node->level == shadow_node->ja->tree_depth - 1) {
- rcuja_free_all_children(shadow_node,
- shadow_node->node_flag,
- free_node_cb);
- }
- if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_node_and_lock);
- } else {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_node);
- }
+ if (ret)
+ goto unlock;
+ if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
+ && shadow_node->level) {
+ if (shadow_node->level == shadow_node->ja->tree_depth - 1) {
+ rcuja_free_all_children(shadow_node,
+ shadow_node->node_flag,
+ free_node_cb);
+ }
+ if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_node_and_lock);
+ } else {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_node);
+ }
+ } else {
+ if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node_and_lock);
} else {
- if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node_and_lock);
- } else {
- flavor->update_call_rcu(&shadow_node->head,
- free_shadow_node);
- }
+ flavor->update_call_rcu(&shadow_node->head,
+ free_shadow_node);
}
}
+ unlock:
lockret = pthread_mutex_unlock(shadow_node->lock);
assert(!lockret);
}