projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up check code
[model-checker.git]
/
model.cc
diff --git
a/model.cc
b/model.cc
index 2fa54d6e9ba1e76be577ec0625f6138ee7d1c5d4..1e730d794baca5dc99387053bb98125b3756193a 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-218,7
+218,8
@@
void ModelChecker::execute_sleep_set() {
for(unsigned int i=0;i<get_num_threads();i++) {
thread_id_t tid=int_to_id(i);
Thread *thr=get_thread(tid);
for(unsigned int i=0;i<get_num_threads();i++) {
thread_id_t tid=int_to_id(i);
Thread *thr=get_thread(tid);
- if ( scheduler->get_enabled(thr) == THREAD_SLEEP_SET ) {
+ if ( scheduler->get_enabled(thr) == THREAD_SLEEP_SET &&
+ thr->get_pending() == NULL ) {
thr->set_state(THREAD_RUNNING);
scheduler->next_thread(thr);
Thread::swap(&system_context, thr);
thr->set_state(THREAD_RUNNING);
scheduler->next_thread(thr);
Thread::swap(&system_context, thr);
@@
-271,8
+272,10
@@
bool ModelChecker::next_execution()
pending_rel_seqs->size());
pending_rel_seqs->size());
- if (isfinalfeasible() || (params.bound != 0 && priv->used_sequence_numbers > params.bound ) || DBG_ENABLED() )
+ if (isfinalfeasible() || (params.bound != 0 && priv->used_sequence_numbers > params.bound ) || DBG_ENABLED() ) {
+ checkDataRaces();
print_summary();
print_summary();
+ }
if ((diverge = get_next_backtrack()) == NULL)
return false;
if ((diverge = get_next_backtrack()) == NULL)
return false;
@@
-388,7
+391,7
@@
void ModelChecker::set_backtracking(ModelAction *act)
break;
/* Don't backtrack into a point where the thread is disabled or sleeping. */
break;
/* Don't backtrack into a point where the thread is disabled or sleeping. */
- if (node->
get_enabled_array()[i]
!=THREAD_ENABLED)
+ if (node->
enabled_status(tid)
!=THREAD_ENABLED)
continue;
/* Check if this has been explored already */
continue;
/* Check if this has been explored already */
@@
-971,7
+974,7
@@
bool ModelChecker::promises_expired() {
/** @return whether the current partial trace must be a prefix of a
* feasible trace. */
bool ModelChecker::isfeasibleprefix() {
/** @return whether the current partial trace must be a prefix of a
* feasible trace. */
bool ModelChecker::isfeasibleprefix() {
- return promises->size() == 0 && pending_rel_seqs->size() == 0;
+ return promises->size() == 0 && pending_rel_seqs->size() == 0
&& isfeasible()
;
}
/** @return whether the current partial trace is feasible. */
}
/** @return whether the current partial trace is feasible. */
@@
-1094,7
+1097,7
@@
void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf) {
ModelAction *act=*rit;
bool foundvalue = false;
for (int j = 0; j<act->get_node()->get_read_from_size(); j++) {
ModelAction *act=*rit;
bool foundvalue = false;
for (int j = 0; j<act->get_node()->get_read_from_size(); j++) {
- if (act->get_node()->get_read_from_at(
i
)==write) {
+ if (act->get_node()->get_read_from_at(
j
)==write) {
foundvalue = true;
break;
}
foundvalue = true;
break;
}
@@
-1388,7
+1391,7
@@
bool ModelChecker::mo_may_allow(const ModelAction *writer, const ModelAction *re
/* Iterate over all threads */
for (i = 0; i < thrd_lists->size(); i++) {
/* Iterate over all threads */
for (i = 0; i < thrd_lists->size(); i++) {
- ModelAction *write_after_read = NULL;
+
const
ModelAction *write_after_read = NULL;
/* Iterate over actions in thread, starting from most recent */
action_list_t *list = &(*thrd_lists)[i];
/* Iterate over actions in thread, starting from most recent */
action_list_t *list = &(*thrd_lists)[i];
@@
-1400,9
+1403,12
@@
bool ModelChecker::mo_may_allow(const ModelAction *writer, const ModelAction *re
break;
else if (act->is_write())
write_after_read = act;
break;
else if (act->is_write())
write_after_read = act;
+ else if (act->is_read()&&act->get_reads_from()!=NULL) {
+ write_after_read = act->get_reads_from();
+ }
}
}
-
- if (write_after_read && mo_graph->checkReachable(write_after_read, writer))
+
+ if (write_after_read &&
write_after_read!=writer &&
mo_graph->checkReachable(write_after_read, writer))
return false;
}
return false;
}
@@
-1833,7
+1839,7
@@
void ModelChecker::compute_promises(ModelAction *curr)
!act->same_thread(curr) &&
act->get_location() == curr->get_location() &&
promise->get_value() == curr->get_value()) {
!act->same_thread(curr) &&
act->get_location() == curr->get_location() &&
promise->get_value() == curr->get_value()) {
- curr->get_node()->set_promise(i);
+ curr->get_node()->set_promise(i
, act->is_rmw()
);
}
}
}
}
}
}
@@
-1855,6
+1861,16
@@
void ModelChecker::check_promises(thread_id_t tid, ClockVector *old_cv, ClockVec
}
}
}
}
+void ModelChecker::check_promises_thread_disabled() {
+ for (unsigned int i = 0; i < promises->size(); i++) {
+ Promise *promise = (*promises)[i];
+ if (promise->check_promise()) {
+ failed_promise = true;
+ return;
+ }
+ }
+}
+
/** Checks promises in response to addition to modification order for threads.
* Definitions:
* pthread is the thread that performed the read that created the promise
/** Checks promises in response to addition to modification order for threads.
* Definitions:
* pthread is the thread that performed the read that created the promise
@@
-1914,7
+1930,7
@@
void ModelChecker::mo_check_promises(thread_id_t tid, const ModelAction *write)
if (promise->has_sync_thread(tid))
continue;
if (promise->has_sync_thread(tid))
continue;
- if (mo_graph->checkReachable(promise->get_write(), write)) {
+ if (
promise->get_write()&&
mo_graph->checkReachable(promise->get_write(), write)) {
if (promise->increment_threads(tid)) {
failed_promise = true;
return;
if (promise->increment_threads(tid)) {
failed_promise = true;
return;
@@
-2025,7
+2041,8
@@
void ModelChecker::build_reads_from_past(ModelAction *curr)
bool ModelChecker::sleep_can_read_from(ModelAction * curr, const ModelAction *write) {
while(true) {
Node *prevnode=write->get_node()->get_parent();
bool ModelChecker::sleep_can_read_from(ModelAction * curr, const ModelAction *write) {
while(true) {
Node *prevnode=write->get_node()->get_parent();
- bool thread_sleep=prevnode->get_enabled_array()[id_to_int(curr->get_tid())]==THREAD_SLEEP_SET;
+
+ bool thread_sleep=prevnode->enabled_status(curr->get_tid())==THREAD_SLEEP_SET;
if (write->is_release()&&thread_sleep)
return true;
if (!write->is_rmw()) {
if (write->is_release()&&thread_sleep)
return true;
if (!write->is_rmw()) {