X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=fa751783dcc4418ddc8087e7ee5b24d566c412a5;hp=6ef297a594d6b897110e7663c1f3753f859e0c3a;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=81ea453e58cbb85fddff3aa8919dfbc59c3140eb

diff --git a/mutex.cc b/mutex.cc
index 6ef297a5..fa751783 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,27 +1,39 @@
 #include "mutex.h"
+
 #include "model.h"
-#include "threads.h"
+#include "execution.h"
+#include "threads-model.h"
 #include "clockvector.h"
+#include "action.h"
+
+namespace cdsc {
+
+mutex::mutex(int type)
+{
+	state.locked = NULL;
+	thread_id_t tid = thread_current_id();
+	state.alloc_tid = tid;
+	ClockVector *cv = model->get_execution()->get_cv(tid);
+	state.alloc_clock = cv  == NULL ? 0 : cv->getClock(tid);
 
-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);
+	// 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));
 }
 
 }