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]
/
promise.cc
diff --git
a/promise.cc
b/promise.cc
index 259ba058ddba82bbd8eaeb0b8559a24144cd087e..5197ed3a1e0376d1ea4f6060bcfa042f7cd4f0e9 100644
(file)
--- a/
promise.cc
+++ b/
promise.cc
@@
-11,10
+11,10
@@
bool Promise::increment_threads(thread_id_t tid) {
return false;
synced_thread[id]=true;
return false;
synced_thread[id]=true;
-
bool
* enabled=model->get_scheduler()->get_enabled();
+
enabled_type_t
* enabled=model->get_scheduler()->get_enabled();
for(unsigned int i=0;i<model->get_num_threads();i++) {
for(unsigned int i=0;i<model->get_num_threads();i++) {
- if (!synced_thread[id] &&
enabled[id]
)
+ if (!synced_thread[id] &&
(enabled[id] == THREAD_ENABLED)
)
return false;
}
return true;
return false;
}
return true;