X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Frcutorture.h;h=bc394f9f8a048f9ba51575e3d9a1ac4952cf6bdb;hb=6fa8b4f80f1d2efbc90fc6d2a5fb0dc1d7fd2a19;hp=ac5348cd465f004179839b14986e91e0781d7125;hpb=a142df4e35dcf835439bf6714e49e95a2a68f7a6;p=urcu.git

diff --git a/tests/regression/rcutorture.h b/tests/regression/rcutorture.h
index ac5348c..bc394f9 100644
--- a/tests/regression/rcutorture.h
+++ b/tests/regression/rcutorture.h
@@ -79,6 +79,12 @@ enum callrcu_type {
 	CALLRCU_PERTHREAD,
 };
 
+enum writer_state {
+	WRITER_STATE_SYNC_RCU,
+	WRITER_STATE_CALL_RCU,
+	WRITER_STATE_POLL_RCU,
+};
+
 static enum callrcu_type callrcu_type = CALLRCU_GLOBAL;
 
 long long n_reads = 0LL;
@@ -290,7 +296,7 @@ struct rcu_stress {
 	int mbtest;
 };
 
-struct rcu_stress rcu_stress_array[RCU_STRESS_PIPE_LEN] = { { 0 } };
+struct rcu_stress rcu_stress_array[RCU_STRESS_PIPE_LEN] = { { 0, 0 } };
 struct rcu_stress *rcu_stress_current;
 int rcu_stress_idx = 0;
 
@@ -371,12 +377,29 @@ void rcu_update_stress_test_rcu(struct rcu_head *head __attribute__((unused)))
 	}
 }
 
+static
+void advance_writer_state(enum writer_state *state)
+{
+	switch (*state) {
+	case WRITER_STATE_SYNC_RCU:
+		*state = WRITER_STATE_CALL_RCU;
+		break;
+	case WRITER_STATE_CALL_RCU:
+		*state = WRITER_STATE_POLL_RCU;
+		break;
+	case WRITER_STATE_POLL_RCU:
+		*state = WRITER_STATE_SYNC_RCU;
+		break;
+	}
+}
+
 static
 void *rcu_update_stress_test(void *arg __attribute__((unused)))
 {
 	int i;
 	struct rcu_stress *p;
 	struct rcu_head rh;
+	enum writer_state writer_state = WRITER_STATE_SYNC_RCU;
 
 	while (goflag == GOFLAG_INIT)
 		(void) poll(NULL, 0, 1);
@@ -394,9 +417,12 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
 		for (i = 0; i < RCU_STRESS_PIPE_LEN; i++)
 			if (i != rcu_stress_idx)
 				rcu_stress_array[i].pipe_count++;
-		if (n_updates & 0x1)
+		switch (writer_state) {
+		case WRITER_STATE_SYNC_RCU:
 			synchronize_rcu();
-		else {
+			break;
+		case WRITER_STATE_CALL_RCU:
+		{
 			int ret;
 
 			ret = pthread_mutex_lock(&call_rcu_test_mutex);
@@ -438,8 +464,22 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
 					strerror(errno));
 				abort();
 			}
+			break;
+		}
+		case WRITER_STATE_POLL_RCU:
+		{
+			struct urcu_gp_poll_state poll_state;
+
+			rcu_register_thread();
+			poll_state = start_poll_synchronize_rcu();
+			rcu_unregister_thread();
+			while (!poll_state_synchronize_rcu(poll_state))
+				(void) poll(NULL, 0, 1);	/* Wait for 1ms */
+			break;
+		}
 		}
 		n_updates++;
+		advance_writer_state(&writer_state);
 	}
 
 	return NULL;
@@ -532,7 +572,7 @@ int stresstest(int nreaders)
  */
 
 static
-void usage(char *argv[]) __attribute__((noreturn));
+void usage(char *argv[]) __attribute__((__noreturn__));
 
 static
 void usage(char *argv[])