X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fregression%2Frcutorture.h;h=46a673767ebd4d8ccc02063621a13f783149bfe9;hp=053653faca37a0b3be9f649c3cf7728da4c61400;hb=61c3fb603104bda9e67c0690c1964e61a770d045;hpb=a13ef613168a4f5f35ca820750fedf13c403ce98

diff --git a/tests/regression/rcutorture.h b/tests/regression/rcutorture.h
index 053653f..46a6737 100644
--- a/tests/regression/rcutorture.h
+++ b/tests/regression/rcutorture.h
@@ -113,13 +113,13 @@ volatile int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE)))
 #endif
 
 #ifndef mark_rcu_quiescent_state
-#define mark_rcu_quiescent_state() do ; while (0)
+#define mark_rcu_quiescent_state() do {} while (0)
 #endif /* #ifdef mark_rcu_quiescent_state */
 
 #ifndef put_thread_offline
-#define put_thread_offline()		do ; while (0)
-#define put_thread_online()		do ; while (0)
-#define put_thread_online_delay()	do ; while (0)
+#define put_thread_offline()		do {} while (0)
+#define put_thread_online()		do {} while (0)
+#define put_thread_online_delay()	do {} while (0)
 #else /* #ifndef put_thread_offline */
 #define put_thread_online_delay()	synchronize_rcu()
 #endif /* #else #ifndef put_thread_offline */
@@ -128,6 +128,7 @@ volatile int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE)))
  * Performance test.
  */
 
+static
 void *rcu_read_perf_test(void *arg)
 {
 	int i;
@@ -158,6 +159,7 @@ void *rcu_read_perf_test(void *arg)
 	return (NULL);
 }
 
+static
 void *rcu_update_perf_test(void *arg)
 {
 	long long n_updates_local = 0;
@@ -189,6 +191,7 @@ void *rcu_update_perf_test(void *arg)
 	return NULL;
 }
 
+static
 void perftestinit(void)
 {
 	init_per_thread(n_reads_pt, 0LL);
@@ -196,6 +199,7 @@ void perftestinit(void)
 	uatomic_set(&nthreadsrunning, 0);
 }
 
+static
 int perftestrun(int nthreads, int nreaders, int nupdaters)
 {
 	int t;
@@ -229,6 +233,7 @@ int perftestrun(int nthreads, int nreaders, int nupdaters)
 	return 0;
 }
 
+static
 int perftest(int nreaders, int cpustride)
 {
 	int i;
@@ -244,6 +249,7 @@ int perftest(int nreaders, int cpustride)
 	return perftestrun(i + 1, nreaders, 1);
 }
 
+static
 int rperftest(int nreaders, int cpustride)
 {
 	int i;
@@ -258,6 +264,7 @@ int rperftest(int nreaders, int cpustride)
 	return perftestrun(i, nreaders, 0);
 }
 
+static
 int uperftest(int nupdaters, int cpustride)
 {
 	int i;
@@ -292,6 +299,7 @@ DEFINE_PER_THREAD(long long [RCU_STRESS_PIPE_LEN + 1], rcu_stress_count);
 
 int garbage = 0;
 
+static
 void *rcu_read_stress_test(void *arg)
 {
 	int i;
@@ -335,6 +343,7 @@ void *rcu_read_stress_test(void *arg)
 static pthread_mutex_t call_rcu_test_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t call_rcu_test_cond = PTHREAD_COND_INITIALIZER;
 
+static
 void rcu_update_stress_test_rcu(struct rcu_head *head)
 {
 	int ret;
@@ -362,15 +371,13 @@ void rcu_update_stress_test_rcu(struct rcu_head *head)
 	}
 }
 
+static
 void *rcu_update_stress_test(void *arg)
 {
 	int i;
 	struct rcu_stress *p;
 	struct rcu_head rh;
 
-	rcu_register_thread();
-	rcu_thread_offline();
-
 	while (goflag == GOFLAG_INIT)
 		(void) poll(NULL, 0, 1);
 	while (goflag == GOFLAG_RUN) {
@@ -399,7 +406,23 @@ void *rcu_update_stress_test(void *arg)
 					strerror(errno));
 				abort();
 			}
+			rcu_register_thread();
 			call_rcu(&rh, rcu_update_stress_test_rcu);
+			rcu_unregister_thread();
+			/*
+			 * Our MacOS X test machine with the following
+			 * config:
+			 * 15.6.0 Darwin Kernel Version 15.6.0
+			 * root:xnu-3248.60.10~1/RELEASE_X86_64
+			 * appears to have issues with liburcu-signal
+			 * signal being delivered on top of
+			 * pthread_cond_wait. It seems to make the
+			 * thread continue, and therefore corrupt the
+			 * rcu_head. Work around this issue by
+			 * unregistering the RCU read-side thread
+			 * immediately after call_rcu (call_rcu needs
+			 * us to be registered RCU readers).
+			 */
 			ret = pthread_cond_wait(&call_rcu_test_cond,
 					&call_rcu_test_mutex);
 			if (ret) {
@@ -419,11 +442,10 @@ void *rcu_update_stress_test(void *arg)
 		n_updates++;
 	}
 
-	rcu_thread_online();
-	rcu_unregister_thread();
 	return NULL;
 }
 
+static
 void *rcu_fake_update_stress_test(void *arg)
 {
 	if (callrcu_type == CALLRCU_PERTHREAD) {
@@ -451,6 +473,7 @@ void *rcu_fake_update_stress_test(void *arg)
 	return NULL;
 }
 
+static
 int stresstest(int nreaders)
 {
 	int i;
@@ -508,6 +531,7 @@ int stresstest(int nreaders)
  * Mainprogram.
  */
 
+static
 void usage(int argc, char *argv[])
 {
 	diag("Usage: %s nreaders [ perf | rperf | uperf | stress ] [ stride ] [ callrcu_global | callrcu_percpu | callrcu_perthread ]\n", argv[0]);