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 ce747351d09d328708d5410874f77eb40725df1e..44f64ff764b3c0c80a2c789d4f5bfcff40a7ef1e 100644
(file)
--- a/
mutex.cc
+++ b/
mutex.cc
@@
-1,27
+1,34
@@
#include "mutex.h"
#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 cdsc {
-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);
+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);
}
}
-
-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()
{
- 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_to_master(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_to_master(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
}
}
}
}