/* First thread created will have id INITIAL_THREAD_ID */
next_thread_id(INITIAL_THREAD_ID),
used_sequence_numbers(0),
-
num_executions(0),
current_action(NULL),
diverge(NULL),
if (next == diverge) {
Node *nextnode = next->get_node();
/* Reached divergence point */
- if (nextnode->increment_read_from()) {
+ if (nextnode->increment_promises()) {
+ /* The next node will try to satisfy a different set of promises. */
+ tid = next->get_tid();
+ node_stack->pop_restofstack(2);
+ } else if (nextnode->increment_read_from()) {
/* The next node will read from a different value. */
tid = next->get_tid();
node_stack->pop_restofstack(2);
/* Build may_read_from set */
if (curr->is_read())
build_reads_from_past(curr);
+ if (curr->is_write())
+ compute_promises(curr);
}
}
}
} else if (curr->is_write()) {
w_modification_order(curr);
+ resolve_promises(curr);
}
th->set_return_value(value);
Node *currnode = curr->get_node();
Node *parnode = currnode->get_parent();
- if (!parnode->backtrack_empty()||!currnode->readsfrom_empty()||!currnode->futurevalues_empty())
+ if (!parnode->backtrack_empty()||!currnode->readsfrom_empty()||!currnode->futurevalues_empty()||!currnode->promises_empty())
if (!next_backtrack || *curr > *next_backtrack)
next_backtrack = curr;
return get_parent_action(tid)->get_cv();
}
+
+/** Resolve promises. */
+
+void ModelChecker::resolve_promises(ModelAction *write) {
+ for(unsigned int i=0;i<promises->size();i++) {
+ Promise * promise=(*promises)[i];
+ if (write->get_node()->get_promise(i)) {
+ ModelAction * read=promise->get_action();
+ read->read_from(write);
+ r_modification_order(read, write);
+ }
+ }
+}
+
+void ModelChecker::compute_promises(ModelAction *curr) {
+ for(unsigned int i=0;i<promises->size();i++) {
+ Promise * promise=(*promises)[i];
+ const ModelAction * act=promise->get_action();
+ if (!act->happens_before(curr)&&
+ act->is_read()&&
+ !act->is_synchronizing(curr)&&
+ !act->same_thread(curr)&&
+ promise->get_value()==curr->get_value()) {
+ curr->get_node()->set_promise(i);
+ }
+ }
+}
+
/** Checks promises in response to change in ClockVector Threads. */
void ModelChecker::check_promises(ClockVector *old_cv, ClockVector * merge_cv) {
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *act = *rit;
-
+
/* Only consider 'write' actions */
if (!act->is_write())
continue;