projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into pldi13
[model-checker.git]
/
mutex.cc
diff --git
a/mutex.cc
b/mutex.cc
index 2cf6828af0ac679811d0fe7cac42d57502fe60d9..91b0b9a33f8a4109d82e9334f127534b1d6ec137 100644
(file)
--- a/
mutex.cc
+++ b/
mutex.cc
@@
-1,10
+1,15
@@
-#include "mutex.h"
-#include "model.h"
+#include <mutex>
+#include "model.h"
+#include "threads-model.h"
+#include "clockvector.h"
namespace std {
mutex::mutex() {
state.islocked=false;
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);
}
void mutex::lock() {
}
void mutex::lock() {