From 86ea30a243222af5ac0860c1b9b1b694a7618f09 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Mon, 30 Mar 2009 16:52:46 -0400
Subject: [PATCH] Execute sig handler unconditionnally

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---
 formal-model/urcu/Makefile  | 10 ++++++++--
 formal-model/urcu/urcu.spin | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/formal-model/urcu/Makefile b/formal-model/urcu/Makefile
index dc36c25..8af320d 100644
--- a/formal-model/urcu/Makefile
+++ b/formal-model/urcu/Makefile
@@ -17,6 +17,12 @@
 # Authors: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
 
 #CFLAGS=-DSAFETY
+#for multi-core verif, 15.5GB shared mem, use files if full
+#CFLAGS=-DHASH64 -DMEMLIM=15500 -DNCORE=2
+#CFLAGS=-DHASH64 -DCOLLAPSE -DMA=88 -DMEMLIM=15500 -DNCORE=8
+
+#liveness
+#CFLAGS=-DHASH64 -DCOLLAPSE -DMA=88
 CFLAGS=-DHASH64
 
 SPINFILE=urcu.spin
@@ -48,7 +54,7 @@ asserts: clean
 	cat ${SPINFILE} >> .input.spin
 	rm -f .input.spin.trail
 	spin -a -X .input.spin
-	gcc -w ${CFLAGS} -DSAFETY -o pan pan.c
+	gcc -O2 -w ${CFLAGS} -DSAFETY -o pan pan.c
 	./pan -v -c1 -X -m10000000 -w20
 	cp .input.spin $@.spin.input
 	-cp .input.spin.trail $@.spin.input.trail
@@ -150,7 +156,7 @@ run: pan
 	./pan -a -v -c1 -X -m10000000 -w20
 
 pan: pan.c
-	gcc -w ${CFLAGS} -o pan pan.c
+	gcc -O2 -w ${CFLAGS} -o pan pan.c
 
 pan.c: pan.ltl ${SPINFILE}
 	cat .input.define > .input.spin
diff --git a/formal-model/urcu/urcu.spin b/formal-model/urcu/urcu.spin
index d1aff29..630971f 100644
--- a/formal-model/urcu/urcu.spin
+++ b/formal-model/urcu/urcu.spin
@@ -264,6 +264,16 @@ inline wait_init_done()
 
 #ifdef TEST_SIGNAL
 
+inline wait_for_sighand_exec()
+{
+	sighand_exec = 0;
+	do
+	:: sighand_exec == 0 -> skip;
+	:: else -> break;
+	od;
+}
+
+#ifdef TOO_BIG_STATE_SPACE
 inline wait_for_sighand_exec()
 {
 	sighand_exec = 0;
@@ -277,6 +287,7 @@ inline wait_for_sighand_exec()
 		fi;
 	od;
 }
+#endif
 
 #else
 
-- 
2.34.1