Execute sig handler unconditionnally

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/formal-model/urcu/Makefile b/formal-model/urcu/Makefile
index dc36c25fa407d889aed4dd6d47211f0e1d68e6bc..8af320d0de8354a2409150206231c0e348178c00 100644 (file)
--- 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 d1aff29fee663d28249a9e608992781741d4e169..630971f0a280827157bfb19937d7bdbd1d181814 100644 (file)
--- 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