X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=rcuja%2Frcuja-shadow-nodes.c;h=d6e4ff5db5212cbdda78eab45d6876a55bb862bd;hb=df65c98a4b6a3c3ba5e55c448521605fe14b6ec3;hp=5ef68d58631bd5d7a673496f78e755ce78b97a90;hpb=e1db2db589f05c48ae9e8b0199989d76bb2f7b14;p=userspace-rcu.git

diff --git a/rcuja/rcuja-shadow-nodes.c b/rcuja/rcuja-shadow-nodes.c
index 5ef68d5..d6e4ff5 100644
--- 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,8 @@ 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);
+	dbg_printf("Lock %p\n", shadow_node->lock);
 	ret = pthread_mutex_lock(shadow_node->lock);
 	assert(!ret);
 	if (cds_lfht_is_node_deleted(lookup_node)) {
@@ -209,26 +210,27 @@ 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;
 
+	dbg_printf("Unlock %p\n", shadow_node->lock);
 	ret = pthread_mutex_unlock(shadow_node->lock);
 	assert(!ret);
 }
 
 __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_shadow_node *rcuja_shadow_set(struct cds_lfht *ht,
+		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;
 
 	shadow_node = calloc(sizeof(*shadow_node), 1);
 	if (!shadow_node)
-		return -ENOMEM;
+		return NULL;
 
 	shadow_node->node = new_node;
 	/*
@@ -240,7 +242,7 @@ int rcuja_shadow_set(struct cds_lfht *ht,
 		shadow_node->lock = calloc(sizeof(*shadow_node->lock), 1);
 		if (!shadow_node->lock) {
 			free(shadow_node);
-			return -ENOMEM;
+			return NULL;
 		}
 		pthread_mutex_init(shadow_node->lock, NULL);
 	}
@@ -256,25 +258,43 @@ int rcuja_shadow_set(struct cds_lfht *ht,
 
 	if (ret_node != &shadow_node->ht_node) {
 		free(shadow_node);
-		return -EEXIST;
+		return NULL;
 	}
-	return 0;
+	return shadow_node;
+}
+
+static
+void free_shadow_node(struct rcu_head *head)
+{
+	struct cds_ja_shadow_node *shadow_node =
+		caa_container_of(head, struct cds_ja_shadow_node, head);
+	free(shadow_node);
 }
 
 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);
 }
 
+static
+void free_shadow_node_and_lock(struct rcu_head *head)
+{
+	struct cds_ja_shadow_node *shadow_node =
+		caa_container_of(head, struct cds_ja_shadow_node, head);
+	free(shadow_node->lock);
+	free(shadow_node);
+}
+
 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);
+	assert(!shadow_node->is_root);
 	free(shadow_node->node);
 	free(shadow_node->lock);
 	free(shadow_node);
@@ -282,17 +302,19 @@ 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,
+		struct cds_ja_shadow_node *shadow_node,
 		unsigned int flags)
 {
 	struct cds_lfht_iter iter;
 	struct cds_lfht_node *lookup_node;
-	struct rcu_ja_shadow_node *shadow_node;
 	const struct rcu_flavor_struct *flavor;
 	int ret, lockret;
+	int lookup_shadow = 0;
 
 	flavor = cds_lfht_rcu_flavor(ht);
 	flavor->read_lock();
+
 	cds_lfht_lookup(ht, hash_pointer(node, hash_seed),
 			match_pointer, node, &iter);
 	lookup_node = cds_lfht_iter_get_node(&iter);
@@ -300,10 +322,14 @@ int rcuja_shadow_clear(struct cds_lfht *ht,
 		ret = -ENOENT;
 		goto rcu_unlock;
 	}
-	shadow_node = caa_container_of(lookup_node,
-			struct rcu_ja_shadow_node, ht_node);
-	lockret = pthread_mutex_lock(shadow_node->lock);
-	assert(!lockret);
+
+	if (!shadow_node) {
+		shadow_node = caa_container_of(lookup_node,
+				struct cds_ja_shadow_node, ht_node);
+		lockret = pthread_mutex_lock(shadow_node->lock);
+		assert(!lockret);
+		lookup_shadow = 1;
+	}
 
 	/*
 	 * Holding the mutex across deletion, and by also re-checking if
@@ -312,23 +338,81 @@ int rcuja_shadow_clear(struct cds_lfht *ht,
 	 */
 	ret = cds_lfht_del(ht, lookup_node);
 	if (!ret) {
-		assert(flags & RCUJA_SHADOW_CLEAR_FREE_NODE);
-		if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
-			flavor->update_call_rcu(&shadow_node->head,
-				free_shadow_node_and_node_and_lock);
+		if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
+				&& !shadow_node->is_root) {
+			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 {
-			flavor->update_call_rcu(&shadow_node->head,
-				free_shadow_node_and_node);
+			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);
+			}
 		}
 	}
-	lockret = pthread_mutex_unlock(shadow_node->lock);
-	assert(!lockret);
+	if (lookup_shadow) {
+		lockret = pthread_mutex_unlock(shadow_node->lock);
+		assert(!lockret);
+	}
 rcu_unlock:
 	flavor->read_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) {
+			if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
+					&& !shadow_node->is_root) {
+				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 {
+					flavor->update_call_rcu(&shadow_node->head,
+						free_shadow_node);
+				}
+			}
+		}
+		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 +422,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))