X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_qsbr_gc.c;h=3a66a845f3636071d9cad298ef1c1f351982bbb6;hp=0b2d5df8ddd8dd13cc36c1b40998f78e2a646322;hb=9fb223da744aff7501107d09d7502c2baadc421f;hpb=2a7ac59da1436b86d7cb59fb8b5712c7d98c1519

diff --git a/test_qsbr_gc.c b/test_qsbr_gc.c
index 0b2d5df..3a66a84 100644
--- a/test_qsbr_gc.c
+++ b/test_qsbr_gc.c
@@ -101,22 +101,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
 	cpu_set_t mask;
 	int cpu;
+	int ret;
 
 	if (!use_affinity)
 		return;
 
+	ret = pthread_mutex_lock(&affinity_mutex);
+	if (ret) {
+		perror("Error in pthread mutex lock");
+		exit(-1);
+	}
 	cpu = cpu_affinities[next_aff++];
+	ret = pthread_mutex_unlock(&affinity_mutex);
+	if (ret) {
+		perror("Error in pthread mutex unlock");
+		exit(-1);
+	}
 	CPU_ZERO(&mask);
 	CPU_SET(cpu, &mask);
 	sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */
@@ -239,7 +250,11 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 void *thr_writer(void *data)
 {
 	unsigned long wtidx = (unsigned long)data;
+#ifdef TEST_LOCAL_GC
+	struct test_array *old = NULL;
+#else
 	struct test_array *new, *old;
+#endif
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long)gettid());
@@ -252,14 +267,11 @@ void *thr_writer(void *data)
 	smp_mb();
 
 	for (;;) {
+#ifndef TEST_LOCAL_GC
 		new = malloc(sizeof(*new));
-		rcu_copy_mutex_lock();
-		old = test_rcu_pointer;
-		if (old)
-			assert(old->a == 8);
 		new->a = 8;
 		old = _rcu_xchg_pointer(&test_rcu_pointer, new);
-		rcu_copy_mutex_unlock();
+#endif
 		rcu_gc_reclaim(wtidx, old);
 		nr_writes++;
 		if (unlikely(!test_duration_write()))