X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=0776db8eef5857b34c47bdbf3493194c9672097a;hp=51315d94bbf3081959c4c59d1d4c6af727f4a7ea;hb=c80409d09fd1c97f798b5952a113c463b9b36805;hpb=15190694fd79202132be5f6e056fa5c00893664e

diff --git a/mutex.cc b/mutex.cc
index 51315d94..0776db8e 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,25 +1,35 @@
 #include "mutex.h"
+
 #include "model.h"
+#include "execution.h"
+#include "threads-model.h"
+#include "clockvector.h"
+#include "action.h"
+
+namespace cdsc {
 
-namespace std {
-mutex::mutex() {
-	state.islocked=false;
-	thread_id_t tid=thread_current()->get_id();
-	state.alloc_tid=tid;
-	state.alloc_clock=model->get_cv(tid)->getClock(tid);
+mutex::mutex()
+{
+	state.locked = NULL;
+	thread_id_t tid = thread_current()->get_id();
+	state.alloc_tid = tid;
+	ClockVector *cv = model->get_execution()->get_cv(tid);
+	state.alloc_clock = cv  == NULL ? 0 : cv->getClock(tid);
 }
-	
-void mutex::lock() {
-  model->switch_to_master(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
+
+void mutex::lock()
+{
+	model->switch_to_master(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
 }
-	
-bool mutex::try_lock() {
-  model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
-  return thread_current()->get_return_value();
+
+bool mutex::try_lock()
+{
+	return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
 }
 
-void mutex::unlock() {
-  model->switch_to_master(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
+void mutex::unlock()
+{
+	model->switch_to_master(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
 }
 
 }