X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=rcuja%2Frcuja-shadow-nodes.c;h=b27812e3a74429efaaa945603499a7004421a1e8;hb=refs%2Fheads%2Furcu%2Frcuja-range;hp=1c6124e3e749e5cc6c72e28a0c584c4f272b811f;hpb=2514605a40babb8d02e05b9533974cc08adcf93c;p=userspace-rcu.git

diff --git a/rcuja/rcuja-shadow-nodes.c b/rcuja/rcuja-shadow-nodes.c
index 1c6124e..b27812e 100644
--- a/rcuja/rcuja-shadow-nodes.c
+++ b/rcuja/rcuja-shadow-nodes.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - RCU Judy Array Shadow Node Hash Table
  *
- * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2012-2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,13 +24,13 @@
 #include <stdint.h>
 #include <errno.h>
 #include <limits.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <time.h>
 #include <urcu/rcuja.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include <assert.h>
 #include <urcu-pointer.h>
-#include <stdlib.h>
-#include <time.h>
 
 #include "rcuja-internal.h"
 
@@ -340,26 +340,27 @@ int rcuja_shadow_clear(struct cds_lfht *ht,
 	 * 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);
@@ -376,8 +377,7 @@ rcu_unlock:
  */
 __attribute__((visibility("protected")))
 void rcuja_shadow_prune(struct cds_lfht *ht,
-		unsigned int flags,
-		void (*free_node_cb)(struct rcu_head *head))
+		unsigned int flags)
 {
 	const struct rcu_flavor_struct *flavor;
 	struct cds_ja_shadow_node *shadow_node;
@@ -385,37 +385,37 @@ void rcuja_shadow_prune(struct cds_lfht *ht,
 	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 (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:
 		lockret = pthread_mutex_unlock(shadow_node->lock);
 		assert(!lockret);
 	}