projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'new_fuzzer' of /home/git/random-fuzzer into new_fuzzer
[c11tester.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index d5ec40fff402df19093d68975c8a8914c0fa7567..44f64ff764b3c0c80a2c789d4f5bfcff40a7ef1e 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,7
+6,7
@@
#include "clockvector.h"
#include "action.h"
#include "clockvector.h"
#include "action.h"
-namespace
std
{
+namespace
cdsc
{
mutex::mutex()
{
mutex::mutex()
{
@@
-15,12
+15,12
@@
mutex::mutex()
state.alloc_tid = tid;
state.alloc_clock = model->get_execution()->get_cv(tid)->getClock(tid);
}
state.alloc_tid = tid;
state.alloc_clock = model->get_execution()->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()
{
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));