X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=formal-model%2Furcu%2FMakefile;h=c52c4badaf93e2dcbcbd96ae1b22e014e4fcaf09;hp=7b395cbdd95c677dab4b3d2f2d31dcee57dc417c;hb=89674313b5ff1209dc090e3b2c48680d222e81cd;hpb=710b09b7ba5203ea868240c1746d0ac0fc65f884

diff --git a/formal-model/urcu/Makefile b/formal-model/urcu/Makefile
index 7b395cb..c52c4ba 100644
--- a/formal-model/urcu/Makefile
+++ b/formal-model/urcu/Makefile
@@ -27,6 +27,9 @@ default:
 	make urcu_free_no_wmb | tee urcu_free_no_wmb.log
 	make urcu_free_no_mb | tee urcu_free_no_mb.log
 	make urcu_free_single_flip | tee urcu_free_single_flip.log
+	make urcu_progress_writer | tee urcu_progress_writer.log
+	make urcu_progress_reader | tee urcu_progress_reader.log
+	make urcu_progress_writer_error | tee urcu_progress_writer_error.log
 	make asserts | tee asserts.log
 	make summary
 
@@ -36,7 +39,7 @@ default:
 summary:
 	@echo
 	@echo "Verification summary"
-	@grep error *.log
+	@grep errors: *.log
 
 asserts: clean
 	cat DEFINES > .input.spin
@@ -86,6 +89,54 @@ urcu_free_ltl:
 	cat .input.define >> pan.ltl
 	spin -f "!(`cat urcu_free.ltl | grep -v ^//`)" >> pan.ltl
 
+# Progress checks
+
+urcu_progress_writer: clean urcu_progress_writer_ltl \
+		urcu_progress_writer_define run_weak_fair
+	cp .input.spin $@.spin.input
+	-cp .input.spin.trail $@.spin.input.trail
+
+urcu_progress_writer_define:
+	cp urcu_progress_writer.define .input.define
+
+urcu_progress_writer_ltl:
+	touch .input.define
+	cat DEFINES > pan.ltl
+	cat .input.define >> pan.ltl
+	spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
+
+urcu_progress_reader: clean urcu_progress_reader_ltl \
+		urcu_progress_reader_define run_weak_fair
+	cp .input.spin $@.spin.input
+	-cp .input.spin.trail $@.spin.input.trail
+
+urcu_progress_reader_define:
+	cp urcu_progress_reader.define .input.define
+
+urcu_progress_reader_ltl:
+	touch .input.define
+	cat DEFINES > pan.ltl
+	cat .input.define >> pan.ltl
+	spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
+
+urcu_progress_writer_error: clean urcu_progress_writer_error_ltl \
+		urcu_progress_writer_error_define run_weak_fair
+	cp .input.spin $@.spin.input
+	-cp .input.spin.trail $@.spin.input.trail
+
+urcu_progress_writer_error_define:
+	cp urcu_progress_writer_error.define .input.define
+
+urcu_progress_writer_error_ltl:
+	touch .input.define
+	cat DEFINES > pan.ltl
+	cat .input.define >> pan.ltl
+	spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
+
+
+run_weak_fair: pan
+	./pan -a -f -v -c1 -X -m10000 -w20
+
 run: pan
 	./pan -a -v -c1 -X -m10000 -w20