X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=formal-model%2Furcu%2Furcu.spin;fp=formal-model%2Furcu%2Furcu.spin;h=570da40231773d139e2c80166b584b0585136da3;hb=6ae334b09959594326f5d85f76e0427c03a64995;hp=2282407ce5aa6c16a4891748df3923d4b492cc57;hpb=ddf10ea4a538eaeb7b32429d20008e00ade33b7c;p=urcu.git

diff --git a/formal-model/urcu/urcu.spin b/formal-model/urcu/urcu.spin
index 2282407..570da40 100644
--- a/formal-model/urcu/urcu.spin
+++ b/formal-model/urcu/urcu.spin
@@ -240,6 +240,53 @@ inline wait_for_quiescent_state(tmp, i, j)
 
 /* Model the RCU read-side critical section. */
 
+inline urcu_one_read(i, nest_i, tmp, tmp2)
+{
+	nest_i = 0;
+	do
+	:: nest_i < READER_NEST_LEVEL ->
+		ooo_mem(i);
+		tmp = READ_CACHED_VAR(urcu_active_readers_one);
+		ooo_mem(i);
+		if
+		:: (!(tmp & RCU_GP_CTR_NEST_MASK))
+			->
+			tmp2 = READ_CACHED_VAR(urcu_gp_ctr);
+			ooo_mem(i);
+			WRITE_CACHED_VAR(urcu_active_readers_one, tmp2);
+		:: else	->
+			WRITE_CACHED_VAR(urcu_active_readers_one,
+					 tmp + 1);
+		fi;
+		ooo_mem(i);
+		smp_mb(i);
+		nest_i++;
+	:: nest_i >= READER_NEST_LEVEL -> break;
+	od;
+
+	ooo_mem(i);
+	read_generation = READ_CACHED_VAR(generation_ptr);
+	ooo_mem(i);
+	data_access = 1;
+	ooo_mem(i);
+	data_access = 0;
+
+	nest_i = 0;
+	do
+	:: nest_i < READER_NEST_LEVEL ->
+		ooo_mem(i);
+		smp_mb(i);
+		ooo_mem(i);
+		tmp2 = READ_CACHED_VAR(urcu_active_readers_one);
+		ooo_mem(i);
+		WRITE_CACHED_VAR(urcu_active_readers_one, tmp2 - 1);
+		nest_i++;
+	:: nest_i >= READER_NEST_LEVEL -> break;
+	od;
+	ooo_mem(i);
+	//smp_mc(i);	/* added */
+}
+
 active [NR_READERS] proctype urcu_reader()
 {
 	byte i, nest_i;
@@ -260,53 +307,10 @@ end_reader:
 #ifdef READER_PROGRESS
 progress_reader:
 #endif
-		nest_i = 0;
-		do
-		:: nest_i < READER_NEST_LEVEL ->
-			ooo_mem(i);
-			tmp = READ_CACHED_VAR(urcu_active_readers_one);
-			ooo_mem(i);
-			if
-			:: (!(tmp & RCU_GP_CTR_NEST_MASK))
-				->
-				tmp2 = READ_CACHED_VAR(urcu_gp_ctr);
-				ooo_mem(i);
-				WRITE_CACHED_VAR(urcu_active_readers_one, tmp2);
-			:: else	->
-				WRITE_CACHED_VAR(urcu_active_readers_one,
-						 tmp + 1);
-			fi;
-			ooo_mem(i);
-			smp_mb(i);
-			nest_i++;
-		:: nest_i >= READER_NEST_LEVEL -> break;
-		od;
-
-		ooo_mem(i);
-		read_generation = READ_CACHED_VAR(generation_ptr);
-		ooo_mem(i);
-		data_access = 1;
-		ooo_mem(i);
-		data_access = 0;
-
-		nest_i = 0;
-		do
-		:: nest_i < READER_NEST_LEVEL ->
-			ooo_mem(i);
-			smp_mb(i);
-			ooo_mem(i);
-			tmp2 = READ_CACHED_VAR(urcu_active_readers_one);
-			ooo_mem(i);
-			WRITE_CACHED_VAR(urcu_active_readers_one, tmp2 - 1);
-			nest_i++;
-		:: nest_i >= READER_NEST_LEVEL -> break;
-		od;
-		ooo_mem(i);
-		//smp_mc(i);	/* added */
+		urcu_one_read(i, nest_i, tmp, tmp2);
 	od;
 }
 
-
 /* Model the RCU update process. */
 
 active [NR_WRITERS] proctype urcu_writer()