projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add memmove and bzero
[c11tester.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index 91b0b9a33f8a4109d82e9334f127534b1d6ec137..fa751783dcc4418ddc8087e7ee5b24d566c412a5 100644
(file)
--- a/
mutex.cc
+++ b/
mutex.cc
@@
-1,28
+1,39
@@
-#include
<mutex>
+#include
"mutex.h"
#include "model.h"
#include "model.h"
+#include "execution.h"
#include "threads-model.h"
#include "clockvector.h"
#include "threads-model.h"
#include "clockvector.h"
+#include "action.h"
-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);
+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);
+
+ // 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));
}
}
}
}