rcuja: implement lookup

[userspace-rcu.git] / rcuja / rcuja-shadow-nodes.c

diff --git a/rcuja/rcuja-shadow-nodes.c b/rcuja/rcuja-shadow-nodes.c
index 5ef68d58631bd5d7a673496f78e755ce78b97a90..2b369add76b7df205789f0aa0687639f32ae18a8 100644 (file)
--- a/rcuja/rcuja-shadow-nodes.c
+++ b/rcuja/rcuja-shadow-nodes.c
@@ -168,19 +168,19 @@ unsigned long hash_pointer(const void *_key, unsigned long seed)
 static
 int match_pointer(struct cds_lfht_node *node, const void *key)
 {
-       struct rcu_ja_shadow_node *shadow =
-               caa_container_of(node, struct rcu_ja_shadow_node, ht_node);
+       struct cds_ja_shadow_node *shadow =
+               caa_container_of(node, struct cds_ja_shadow_node, ht_node);
 
        return (key == shadow->node);
 }
 
 __attribute__((visibility("protected")))
-struct rcu_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
-               struct rcu_ja_node *node)
+struct cds_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
+               struct cds_ja_inode *node)
 {
        struct cds_lfht_iter iter;
        struct cds_lfht_node *lookup_node;
-       struct rcu_ja_shadow_node *shadow_node;
+       struct cds_ja_shadow_node *shadow_node;
        const struct rcu_flavor_struct *flavor;
        int ret;
 
@@ -195,7 +195,7 @@ struct rcu_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
                goto rcu_unlock;
        }
        shadow_node = caa_container_of(lookup_node,
-                       struct rcu_ja_shadow_node, ht_node);
+                       struct cds_ja_shadow_node, ht_node);
        ret = pthread_mutex_lock(shadow_node->lock);
        assert(!ret);
        if (cds_lfht_is_node_deleted(lookup_node)) {
@@ -209,7 +209,7 @@ rcu_unlock:
 }
 
 __attribute__((visibility("protected")))
-void rcuja_shadow_unlock(struct rcu_ja_shadow_node *shadow_node)
+void rcuja_shadow_unlock(struct cds_ja_shadow_node *shadow_node)
 {
        int ret;
 
@@ -219,10 +219,10 @@ void rcuja_shadow_unlock(struct rcu_ja_shadow_node *shadow_node)
 
 __attribute__((visibility("protected")))
 int rcuja_shadow_set(struct cds_lfht *ht,
-               struct rcu_ja_node *new_node,
-               struct rcu_ja_shadow_node *inherit_from)
+               struct cds_ja_inode *new_node,
+               struct cds_ja_shadow_node *inherit_from)
 {
-       struct rcu_ja_shadow_node *shadow_node;
+       struct cds_ja_shadow_node *shadow_node;
        struct cds_lfht_node *ret_node;
        const struct rcu_flavor_struct *flavor;
 
@@ -264,8 +264,8 @@ int rcuja_shadow_set(struct cds_lfht *ht,
 static
 void free_shadow_node_and_node(struct rcu_head *head)
 {
-       struct rcu_ja_shadow_node *shadow_node =
-               caa_container_of(head, struct rcu_ja_shadow_node, head);
+       struct cds_ja_shadow_node *shadow_node =
+               caa_container_of(head, struct cds_ja_shadow_node, head);
        free(shadow_node->node);
        free(shadow_node);
 }
@@ -273,8 +273,8 @@ void free_shadow_node_and_node(struct rcu_head *head)
 static
 void free_shadow_node_and_node_and_lock(struct rcu_head *head)
 {
-       struct rcu_ja_shadow_node *shadow_node =
-               caa_container_of(head, struct rcu_ja_shadow_node, head);
+       struct cds_ja_shadow_node *shadow_node =
+               caa_container_of(head, struct cds_ja_shadow_node, head);
        free(shadow_node->node);
        free(shadow_node->lock);
        free(shadow_node);
@@ -282,12 +282,12 @@ void free_shadow_node_and_node_and_lock(struct rcu_head *head)
 
 __attribute__((visibility("protected")))
 int rcuja_shadow_clear(struct cds_lfht *ht,
-               struct rcu_ja_node *node,
+               struct cds_ja_inode *node,
                unsigned int flags)
 {
        struct cds_lfht_iter iter;
        struct cds_lfht_node *lookup_node;
-       struct rcu_ja_shadow_node *shadow_node;
+       struct cds_ja_shadow_node *shadow_node;
        const struct rcu_flavor_struct *flavor;
        int ret, lockret;
 
@@ -301,7 +301,7 @@ int rcuja_shadow_clear(struct cds_lfht *ht,
                goto rcu_unlock;
        }
        shadow_node = caa_container_of(lookup_node,
-                       struct rcu_ja_shadow_node, ht_node);
+                       struct cds_ja_shadow_node, ht_node);
        lockret = pthread_mutex_lock(shadow_node->lock);
        assert(!lockret);
 
@@ -329,6 +329,38 @@ rcu_unlock:
        return ret;
 }
 
+/*
+ * Delete all shadow nodes and nodes from hash table, along with their
+ * associated lock.
+ */
+__attribute__((visibility("protected")))
+void rcuja_shadow_prune(struct cds_lfht *ht,
+               unsigned int flags)
+{
+       const struct rcu_flavor_struct *flavor;
+       struct cds_ja_shadow_node *shadow_node;
+       struct cds_lfht_iter iter;
+       int ret, lockret;
+
+       flavor = cds_lfht_rcu_flavor(ht);
+       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) {
+                       assert((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
+                               && (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK));
+                       flavor->update_call_rcu(&shadow_node->head,
+                               free_shadow_node_and_node_and_lock);
+               }
+               lockret = pthread_mutex_unlock(shadow_node->lock);
+               assert(!lockret);
+       }
+       flavor->read_unlock();
+}
+
 __attribute__((visibility("protected")))
 struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor)
 {
@@ -338,12 +370,9 @@ struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor)
 }
 
 __attribute__((visibility("protected")))
-void rcuja_delete_ht(struct cds_lfht *ht)
+int rcuja_delete_ht(struct cds_lfht *ht)
 {
-       int ret;
-
-       ret = cds_lfht_destroy(ht, NULL);
-       assert(!ret);
+       return cds_lfht_destroy(ht, NULL);
 }
 
 __attribute__((constructor))