X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=fa751783dcc4418ddc8087e7ee5b24d566c412a5;hp=d5ec40fff402df19093d68975c8a8914c0fa7567;hb=7d107019dd0d32d0803fb802fc318a57101707a1;hpb=9d9b9121ffed4c7406275da34b055040ea5090a9

diff --git a/mutex.cc b/mutex.cc
index d5ec40ff..fa751783 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,4 +1,4 @@
-#include <mutex>
+#include "mutex.h"
 
 #include "model.h"
 #include "execution.h"
@@ -6,29 +6,34 @@
 #include "clockvector.h"
 #include "action.h"
 
-namespace std {
+namespace cdsc {
 
-mutex::mutex()
+mutex::mutex(int type)
 {
 	state.locked = NULL;
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	state.alloc_tid = tid;
-	state.alloc_clock = model->get_execution()->get_cv(tid)->getClock(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));
+	model->switch_thread(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
 }
-	
+
 bool mutex::try_lock()
 {
-	return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
+	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));
+	model->switch_thread(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
 }
 
 }