X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=test_urcu_gc.c;h=f1cce248a8b604709ffcb9e3a265c1f983bc03f7;hb=2a7ac59da1436b86d7cb59fb8b5712c7d98c1519;hp=d8dc70952817f61ceb13ab1cb0ec6b737c4ba02e;hpb=4a3e0004ec4c2eccf3b9954ec5c781e0714dd5e3;p=urcu.git

diff --git a/test_urcu_gc.c b/test_urcu_gc.c
index d8dc709..f1cce24 100644
--- a/test_urcu_gc.c
+++ b/test_urcu_gc.c
@@ -38,6 +38,9 @@
 /* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
 #define CACHE_LINE_SIZE 4096
 
+/* hardcoded number of CPUs */
+#define NR_CPUS 16384
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -98,6 +101,26 @@ static int verbose_mode;
 			printf(fmt, args);	\
 	} while (0)
 
+static unsigned int cpu_affinities[NR_CPUS];
+static unsigned int next_aff = 0;
+static int use_affinity = 0;
+
+static void set_affinity(void)
+{
+	cpu_set_t mask;
+	int cpu;
+
+	if (!use_affinity)
+		return;
+
+	cpu = cpu_affinities[next_aff++];
+	CPU_ZERO(&mask);
+	CPU_SET(cpu, &mask);
+	sched_setaffinity(0, sizeof(mask), &mask);
+}
+
+
+
 /*
  * returns 0 if test should end.
  */
@@ -151,6 +174,8 @@ void *thr_reader(void *_count)
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
 
+	set_affinity();
+
 	rcu_register_thread();
 
 	while (!test_go)
@@ -181,20 +206,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 +223,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)
@@ -232,6 +245,8 @@ void *thr_writer(void *data)
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long)gettid());
 
+	set_affinity();
+
 	while (!test_go)
 	{
 	}
@@ -273,8 +288,6 @@ void show_usage(int argc, char **argv)
 	printf("\n");
 }
 
-cpu_set_t affinity;
-
 int main(int argc, char **argv)
 {
 	int err;
@@ -283,7 +296,6 @@ int main(int argc, char **argv)
 	unsigned long long *count_reader;
 	unsigned long long tot_reads = 0, tot_writes = 0;
 	int i, a;
-	int use_affinity = 0;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -308,8 +320,6 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	CPU_ZERO(&affinity);
-
 	for (i = 4; i < argc; i++) {
 		if (argv[i][0] != '-')
 			continue;
@@ -328,7 +338,7 @@ int main(int argc, char **argv)
 				return -1;
 			}
 			a = atoi(argv[++i]);
-			CPU_SET(a, &affinity);
+			cpu_affinities[next_aff++] = a;
 			use_affinity = 1;
 			printf_verbose("Adding CPU %d affinity\n", a);
 			break;
@@ -366,12 +376,6 @@ int main(int argc, char **argv)
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
-	if (use_affinity
-	    && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
-		perror("sched_setaffinity");
-		exit(-1);
-	}
-
 	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
 	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);
@@ -388,6 +392,8 @@ int main(int argc, char **argv)
 	for (i = 0; i < nr_writers; i++)
 		pending_reclaims[i].head = pending_reclaims[i].queue;
 
+	next_aff = 0;
+
 	for (i = 0; i < nr_readers; i++) {
 		err = pthread_create(&tid_reader[i], NULL, thr_reader,
 				     &count_reader[i]);
@@ -420,7 +426,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,