X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mutex.cc;h=145000548be4665f7f8a2cfb4fb657c2ab9a5382;hb=3f77119600ac3aa246258dec2776056d09f8e4e0;hp=91b0b9a33f8a4109d82e9334f127534b1d6ec137;hpb=a4090d03cc1a5f5bca8f10986d74b76a9bb45371;p=model-checker.git diff --git a/mutex.cc b/mutex.cc index 91b0b9a..1450005 100644 --- a/mutex.cc +++ b/mutex.cc @@ -3,6 +3,7 @@ #include "model.h" #include "threads-model.h" #include "clockvector.h" +#include "action.h" namespace std { mutex::mutex() { @@ -17,8 +18,7 @@ void mutex::lock() { } bool mutex::try_lock() { - model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this)); - return thread_current()->get_return_value(); + return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this)); } void mutex::unlock() {