projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update readme
[c11tester.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index d5ec40fff402df19093d68975c8a8914c0fa7567..fa751783dcc4418ddc8087e7ee5b24d566c412a5 100644
(file)
--- a/
mutex.cc
+++ b/
mutex.cc
@@
-1,4
+1,4
@@
-#include
<mutex>
+#include
"mutex.h"
#include "model.h"
#include "execution.h"
#include "model.h"
#include "execution.h"
@@
-6,29
+6,34
@@
#include "clockvector.h"
#include "action.h"
#include "clockvector.h"
#include "action.h"
-namespace
std
{
+namespace
cdsc
{
-mutex::mutex()
+mutex::mutex(
int type
)
{
state.locked = NULL;
{
state.locked = NULL;
- thread_id_t tid = thread_current
()->get
_id();
+ thread_id_t tid = thread_current_id();
state.alloc_tid = tid;
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()
{
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));
}
}
}
}