From f96ba3364c806a329bd88749dee15b89cf92f4eb Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 14 Oct 2009 09:19:37 -0400 Subject: [PATCH] update Signed-off-by: Mathieu Desnoyers --- ticketlock-testwait/Makefile | 4 +++- ticketlock-testwait/mem-progress.spin | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ticketlock-testwait/Makefile b/ticketlock-testwait/Makefile index c41afd3..4ab707d 100644 --- 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 c503fba..8329f6b 100644 --- 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; -- 2.34.1