X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=8b5d33b23e64f0c090633a498b330a9fd208eca4;hp=b31b20a8ed2f02446fd1c4fbea5965c65b2b6979;hb=055fb927ea688ec513508b0821e331558eea40d1;hpb=b3bc21e0aea3e724b129c9e06c75eca68f7b208e

diff --git a/mutex.cc b/mutex.cc
index b31b20a8..8b5d33b2 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,25 +1,39 @@
 #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() :
-	owner(0), islocked(false)
+mutex::mutex(int type)
 {
+	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);
 
+	// For recursive mutex
+	state.type = type;
+	state.lock_count = 0;
 }
-	
-void mutex::lock() {
-  model->switch_to_master(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
+
+void mutex::lock()
+{
+	model->switch_thread(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_thread(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_thread(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
 }
 
 }