From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Thu, 18 Jun 2009 15:01:18 +0000 (-0400)
Subject: Fix gc tests
X-Git-Tag: v0.1~139
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=53091fe5df117942e27128da4b44279cc0a88e7c;p=userspace-rcu.git

Fix gc tests

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---

diff --git a/test_qsbr_gc.c b/test_qsbr_gc.c
index 0b34ece..c5cb9b1 100644
--- a/test_qsbr_gc.c
+++ b/test_qsbr_gc.c
@@ -180,20 +180,11 @@ void *thr_reader(void *_count)
 
 }
 
-/* Using per-thread queue */
-static void rcu_gc_reclaim(unsigned long wtidx, void *old)
+static void rcu_gc_clear_queue(unsigned long wtidx)
 {
 	void **p;
 
-	/* Queue pointer */
-	*pending_reclaims[wtidx].head = old;
-	pending_reclaims[wtidx].head++;
-
-	if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
-			< reclaim_batch))
-		return;
-
-	/* If queue is full, wait for Q.S and empty queue */
+	/* Wait for Q.S and empty queue */
 	synchronize_rcu();
 
 	for (p = pending_reclaims[wtidx].queue;
@@ -206,21 +197,18 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 	pending_reclaims[wtidx].head = pending_reclaims[wtidx].queue;
 }
 
-static void rcu_gc_cleanup(unsigned long wtidx)
+/* Using per-thread queue */
+static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 {
-	void **p;
+	/* Queue pointer */
+	*pending_reclaims[wtidx].head = old;
+	pending_reclaims[wtidx].head++;
 
-	/* Wait for Q.S and empty queue */
-	synchronize_rcu();
+	if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
+			< reclaim_batch))
+		return;
 
-	for (p = pending_reclaims[wtidx].queue;
-			p < pending_reclaims[wtidx].head; p++) {
-		/* poison */
-		if (*p)
-			((struct test_array *)*p)->a = 0;
-		free(*p);
-	}
-	pending_reclaims[wtidx].head = pending_reclaims[wtidx].queue;
+	rcu_gc_clear_queue(wtidx);
 }
 
 void *thr_writer(void *data)
@@ -419,7 +407,7 @@ int main(int argc, char **argv)
 		if (err != 0)
 			exit(1);
 		tot_writes += tot_nr_writes[i];
-		rcu_gc_cleanup(i);
+		rcu_gc_clear_queue(i);
 	}
 	
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
diff --git a/test_urcu_gc.c b/test_urcu_gc.c
index d8dc709..ee936f0 100644
--- a/test_urcu_gc.c
+++ b/test_urcu_gc.c
@@ -181,20 +181,11 @@ void *thr_reader(void *_count)
 
 }
 
-/* Using per-thread queue */
-static void rcu_gc_reclaim(unsigned long wtidx, void *old)
+static void rcu_gc_clear_queue(unsigned long wtidx)
 {
 	void **p;
 
-	/* Queue pointer */
-	*pending_reclaims[wtidx].head = old;
-	pending_reclaims[wtidx].head++;
-
-	if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
-			< reclaim_batch))
-		return;
-
-	/* If queue is full, wait for Q.S and empty queue */
+	/* Wait for Q.S and empty queue */
 	synchronize_rcu();
 
 	for (p = pending_reclaims[wtidx].queue;
@@ -207,21 +198,18 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 	pending_reclaims[wtidx].head = pending_reclaims[wtidx].queue;
 }
 
-static void rcu_gc_cleanup(unsigned long wtidx)
+/* Using per-thread queue */
+static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 {
-	void **p;
+	/* Queue pointer */
+	*pending_reclaims[wtidx].head = old;
+	pending_reclaims[wtidx].head++;
 
-	/* Wait for Q.S and empty queue */
-	synchronize_rcu();
+	if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
+			< reclaim_batch))
+		return;
 
-	for (p = pending_reclaims[wtidx].queue;
-			p < pending_reclaims[wtidx].head; p++) {
-		/* poison */
-		if (*p)
-			((struct test_array *)*p)->a = 0;
-		free(*p);
-	}
-	pending_reclaims[wtidx].head = pending_reclaims[wtidx].queue;
+	rcu_gc_clear_queue(wtidx);
 }
 
 void *thr_writer(void *data)
@@ -420,7 +408,7 @@ int main(int argc, char **argv)
 		if (err != 0)
 			exit(1);
 		tot_writes += tot_nr_writes[i];
-		rcu_gc_cleanup(i);
+		rcu_gc_clear_queue(i);
 	}
 	
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,