projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused functions
[c11tester.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index 0bb627d293b03a27d29673b3a95b1b3e136093c2..8b5d33b23e64f0c090633a498b330a9fd208eca4 100644
(file)
--- a/
mutex.cc
+++ b/
mutex.cc
@@
-1,33
+1,39
@@
-#include
<mutex>
+#include
"mutex.h"
#include "model.h"
#include "model.h"
+#include "execution.h"
#include "threads-model.h"
#include "clockvector.h"
#include "action.h"
#include "threads-model.h"
#include "clockvector.h"
#include "action.h"
-namespace
std
{
+namespace
cdsc
{
-mutex::mutex()
+mutex::mutex(
int type
)
{
{
- state.
islocked = false
;
+ state.
locked = NULL
;
thread_id_t tid = thread_current()->get_id();
state.alloc_tid = tid;
thread_id_t tid = thread_current()->get_id();
state.alloc_tid = tid;
- state.alloc_clock = model->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()
{
void mutex::lock()
{
- model->switch_t
o_master
(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
+ model->switch_t
hread
(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
}
}
-
+
bool mutex::try_lock()
{
bool mutex::try_lock()
{
- return model->switch_t
o_master
(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
+ return model->switch_t
hread
(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
}
void mutex::unlock()
{
}
void mutex::unlock()
{
- model->switch_t
o_master
(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
+ model->switch_t
hread
(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
}
}
}
}