projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge
[c11tester.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index d5ec40fff402df19093d68975c8a8914c0fa7567..0776db8eef5857b34c47bdbf3493194c9672097a 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,21
+6,22
@@
#include "clockvector.h"
#include "action.h"
#include "clockvector.h"
#include "action.h"
-namespace
std
{
+namespace
cdsc
{
mutex::mutex()
{
state.locked = NULL;
thread_id_t tid = thread_current()->get_id();
state.alloc_tid = tid;
mutex::mutex()
{
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);
}
}
-
+
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()
{
return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
bool mutex::try_lock()
{
return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));