X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=da3184e55a074823b2909bc653e1c2ba30b6b067;hp=b31b20a8ed2f02446fd1c4fbea5965c65b2b6979;hb=56bd79d6fa2953585375f72cf061355fecd2c725;hpb=16ef61e0af2f98a34acaa919077def37ece3b5bd

diff --git a/mutex.cc b/mutex.cc
index b31b20a8..da3184e5 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,25 +1,33 @@
-#include "mutex.h"
-#include "model.h"
+#include <mutex>
 
+#include "model.h"
+#include "threads-model.h"
+#include "clockvector.h"
+#include "action.h"
 
 namespace std {
-mutex::mutex() :
-	owner(0), islocked(false)
-{
 
+mutex::mutex()
+{
+	state.locked = NULL;
+	thread_id_t tid = thread_current()->get_id();
+	state.alloc_tid = tid;
+	state.alloc_clock = model->get_cv(tid)->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));
 }
 
 }