Approach 2

[c11tester.git] / mutex.cc

diff --git a/mutex.cc b/mutex.cc
index 44f64ff764b3c0c80a2c789d4f5bfcff40a7ef1e..10fb5e3248b0550dd8b18afea34164380306ff23 100644 (file)
--- a/mutex.cc
+++ b/mutex.cc
@@ -8,12 +8,17 @@
 
 namespace cdsc {
 
-mutex::mutex()
+mutex::mutex(int type)
 {
        state.locked = NULL;
        thread_id_t tid = thread_current()->get_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()