update

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

diff --git a/ticketlock-testwait/Makefile b/ticketlock-testwait/Makefile
index c41afd32e7f430089ce14634ed7ee6e8bc33dd59..4ab707d95d458b30e09a770ca29bdc9e84d8f46f 100644 (file)
--- a/ticketlock-testwait/Makefile
+++ b/ticketlock-testwait/Makefile
@@ -82,7 +82,9 @@ run: pan
        ./pan -a -v -c1 -X -m1000000 -w19
 
 run_weak_fair: pan_fair
-       ./pan_fair -a -f -v -c1 -X -m1000000 -w20
+       ./pan_fair -a -v -c1 -X -m1000000 -w20
+       #fairness
+       #./pan_fair -a -f -v -c1 -X -m1000000 -w20
 
 pan_fair: pan_fair.c
        gcc -w ${CFLAGS} -DNFAIR=4 -o pan_fair pan_fair.c

diff --git a/ticketlock-testwait/mem-progress.spin b/ticketlock-testwait/mem-progress.spin
index c503fbabbdd044c0c9034ef0ec43934da835f6be..8329f6b8cbfd18343672b51c02d62c5ff6d80142 100644 (file)
--- a/ticketlock-testwait/mem-progress.spin
+++ b/ticketlock-testwait/mem-progress.spin
@@ -40,6 +40,10 @@ byte refcount = 0;
 
 #define need_pause()   (_pid == 2)
 
+/*
+ * do_pause() disabled:
+ * get similar effect by disabling weak fairness.
+ */
 /*
  * Test weak fairness by either not pausing or cycling for any number of
  * steps, or forever.
@@ -106,10 +110,11 @@ proctype proc_B()
 
        do
        :: 1 ->
-               do_pause();
+progress_B:
+               //do_pause();
                spin_lock(lock, ticket);
                refcount = refcount + 1;
-               do_pause();
+               //do_pause();
                refcount = refcount - 1;
                spin_unlock(lock);
        od;