return next;
}
-
/**
* Processes a read or rmw model action.
* @param curr is the read model action to process.
- * @param th is the thread
* @param second_part_of_rmw is boolean that is true is this is the second action of a rmw.
* @return True if processing this read updates the mo_graph.
*/
-
-bool ModelChecker::process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw) {
+bool ModelChecker::process_read(ModelAction *curr, bool second_part_of_rmw)
+{
uint64_t value;
- bool updated=false;
- while(true) {
+ bool updated = false;
+ while (true) {
const ModelAction *reads_from = curr->get_node()->get_read_from();
if (reads_from != NULL) {
mo_graph->startChanges();
value = reads_from->get_value();
+ bool r_status = false;
if (!second_part_of_rmw) {
check_recency(curr,false);
+ r_status = r_modification_order(curr, reads_from);
}
- bool r_status=r_modification_order(curr,reads_from);
- if (!second_part_of_rmw&&!isfeasible()&&(curr->get_node()->increment_read_from()||!curr->get_node()->future_value_empty())) {
+ if (!second_part_of_rmw&&!isfeasible()&&(curr->get_node()->increment_read_from()||curr->get_node()->increment_future_value())) {
mo_graph->rollbackChanges();
- too_many_reads=false;
+ too_many_reads = false;
continue;
}
Promise *valuepromise = new Promise(curr, value, expiration);
promises->push_back(valuepromise);
}
- th->set_return_value(value);
+ get_thread(curr)->set_return_value(value);
return updated;
}
}
+/**
+ * Process a write ModelAction
+ * @param curr The ModelAction to process
+ * @return True if the mo_graph was updated or promises were resolved
+ */
+bool ModelChecker::process_write(ModelAction *curr)
+{
+ bool updated_mod_order = w_modification_order(curr);
+ bool updated_promises = resolve_promises(curr);
+
+ if (promises->size() == 0) {
+ for (unsigned int i = 0; i<futurevalues->size(); i++) {
+ struct PendingFutureValue pfv = (*futurevalues)[i];
+ if (pfv.act->get_node()->add_future_value(pfv.value, pfv.expiration) &&
+ (!priv->next_backtrack || *pfv.act > *priv->next_backtrack))
+ priv->next_backtrack = pfv.act;
+ }
+ futurevalues->resize(0);
+ }
+
+ mo_graph->commitChanges();
+ get_thread(curr)->set_return_value(VALUE_NONE);
+ return updated_mod_order || updated_promises;
+}
+
/**
* This is the heart of the model checker routine. It performs model-checking
* actions corresponding to a given "current action." Among other processes, it
}
/* Thread specific actions */
- switch(curr->get_type()) {
+ switch (curr->get_type()) {
case THREAD_CREATE: {
Thread *th = (Thread *)curr->get_location();
th->set_creation(curr);
break;
}
- Thread *th = get_thread(curr);
+ work_queue_t work_queue(1, CheckCurrWorkEntry(curr));
- bool updated = false;
- if (curr->is_read()) {
- updated=process_read(curr, th, second_part_of_rmw);
- }
+ while (!work_queue.empty()) {
+ WorkQueueEntry work = work_queue.front();
+ work_queue.pop_front();
- if (curr->is_write()) {
- bool updated_mod_order=w_modification_order(curr);
- bool updated_promises=resolve_promises(curr);
- updated=updated_mod_order|updated_promises;
-
- if (promises->size()==0) {
- for(unsigned int i=0;i<futurevalues->size();i++) {
- struct PendingFutureValue pfv=(*futurevalues)[i];
- if (pfv.act->get_node()->add_future_value(pfv.value, pfv.expiration) &&
- (!priv->next_backtrack || *pfv.act > *priv->next_backtrack))
- priv->next_backtrack = pfv.act;
- }
- futurevalues->resize(0);
- }
+ switch (work.type) {
+ case WORK_CHECK_CURR_ACTION: {
+ ModelAction *act = work.action;
+ bool updated = false;
+ if (act->is_read() && process_read(act, second_part_of_rmw))
+ updated = true;
- mo_graph->commitChanges();
- th->set_return_value(VALUE_NONE);
- }
+ if (act->is_write() && process_write(act))
+ updated = true;
- if (updated)
- resolve_release_sequences(curr->get_location());
+ if (updated)
+ work_queue.push_back(CheckRelSeqWorkEntry(act->get_location()));
+ break;
+ }
+ case WORK_CHECK_RELEASE_SEQ:
+ resolve_release_sequences(work.location, &work_queue);
+ break;
+ case WORK_CHECK_MO_EDGES:
+ /** @todo Perform follow-up mo_graph checks */
+ default:
+ ASSERT(false);
+ break;
+ }
+ }
/* Add action to list. */
if (!second_part_of_rmw)
add_action_to_lists(curr);
check_curr_backtracking(curr);
-
+
set_backtracking(curr);
return get_next_thread(curr);
void ModelChecker::check_curr_backtracking(ModelAction * curr) {
Node *currnode = curr->get_node();
Node *parnode = currnode->get_parent();
-
+
if ((!parnode->backtrack_empty() ||
!currnode->read_from_empty() ||
!currnode->future_value_empty() ||
}
}
-
bool ModelChecker::promises_expired() {
for (unsigned int promise_index = 0; promise_index < promises->size(); promise_index++) {
Promise *promise = (*promises)[promise_index];
rit++;
}
- action_list_t::reverse_iterator ritcopy=rit;
+ action_list_t::reverse_iterator ritcopy = rit;
//See if we have enough reads from the same value
- int count=0;
+ int count = 0;
for (; count < params.maxreads; rit++,count++) {
if (rit==list->rend())
return;
return;
}
- for (int i=0;i<curr->get_node()->get_read_from_size();i++) {
+ for (int i = 0; i<curr->get_node()->get_read_from_size(); i++) {
//Get write
- const ModelAction * write=curr->get_node()->get_read_from_at(i);
+ const ModelAction * write = curr->get_node()->get_read_from_at(i);
//Need a different write
if (write==curr->get_reads_from())
continue;
/* Test to see whether this is a feasible write to read from*/
mo_graph->startChanges();
r_modification_order(curr, write);
- bool feasiblereadfrom=isfeasible();
+ bool feasiblereadfrom = isfeasible();
mo_graph->rollbackChanges();
if (!feasiblereadfrom)
continue;
- rit=ritcopy;
+ rit = ritcopy;
- bool feasiblewrite=true;
+ bool feasiblewrite = true;
//new we need to see if this write works for everyone
- for (int loop=count;loop>0;loop--,rit++) {
+ for (int loop = count; loop>0; loop--,rit++) {
ModelAction *act=*rit;
- bool foundvalue=false;
- for(int j=0;j<act->get_node()->get_read_from_size();j++) {
+ 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) {
- foundvalue=true;
+ foundvalue = true;
break;
}
}
if (!foundvalue) {
- feasiblewrite=false;
+ feasiblewrite = false;
break;
}
}
/* Include at most one act per-thread that "happens before" curr */
if (act->happens_before(curr)) {
- if (act->is_read()) {
+ if (act->is_write()) {
+ if (rf != act && act != curr) {
+ mo_graph->addEdge(act, rf);
+ added = true;
+ }
+ } else {
const ModelAction *prevreadfrom = act->get_reads_from();
if (prevreadfrom != NULL && rf != prevreadfrom) {
mo_graph->addEdge(prevreadfrom, rf);
added = true;
}
- } else if (rf != act) {
- mo_graph->addEdge(act, rf);
- added = true;
}
+
break;
}
}
if (thin_air_constraint_may_allow(curr, act)) {
if (isfeasible() ||
(curr->is_rmw() && act->is_rmw() && curr->get_reads_from()==act->get_reads_from() && isfeasibleotherthanRMW())) {
- struct PendingFutureValue pfv={curr->get_value(),curr->get_seq_number()+params.maxfuturedelay,act};
+ struct PendingFutureValue pfv = {curr->get_value(),curr->get_seq_number()+params.maxfuturedelay,act};
futurevalues->push_back(pfv);
}
}
if (!reader->is_rmw())
return true;
- for(const ModelAction *search=writer->get_reads_from();search!=NULL;search=search->get_reads_from()) {
+ for (const ModelAction *search = writer->get_reads_from(); search != NULL; search = search->get_reads_from()) {
if (search==reader)
return false;
- if (search->get_tid()==reader->get_tid()&&
+ if (search->get_tid() == reader->get_tid() &&
search->happens_before(reader))
break;
}
return true;
}
-
/**
* Finds the head(s) of the release sequence(s) containing a given ModelAction.
* The ModelAction under consideration is expected to be taking part in
* false otherwise
*/
bool ModelChecker::release_seq_head(const ModelAction *rf,
- std::vector<const ModelAction *> *release_heads) const
+ std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const
{
- ASSERT(rf->is_write());
if (!rf) {
/* read from future: need to settle this later */
return false; /* incomplete */
}
+
+ ASSERT(rf->is_write());
+
if (rf->is_release())
release_heads->push_back(rf);
if (rf->is_rmw()) {
* @see ModelChecker::release_seq_head
*/
void ModelChecker::get_release_seq_heads(ModelAction *act,
- std::vector<const ModelAction *> *release_heads)
+ std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads)
{
const ModelAction *rf = act->get_reads_from();
bool complete;
*
* @param location The location/object that should be checked for release
* sequence resolutions
- * @return True if any updates occurred (new synchronization, new mo_graph edges)
+ * @param work_queue The work queue to which to add work items as they are
+ * generated
+ * @return True if any updates occurred (new synchronization, new mo_graph
+ * edges)
*/
-bool ModelChecker::resolve_release_sequences(void *location)
+bool ModelChecker::resolve_release_sequences(void *location, work_queue_t *work_queue)
{
std::list<ModelAction *> *list;
list = lazy_sync_with_release->getptr(location);
while (it != list->end()) {
ModelAction *act = *it;
const ModelAction *rf = act->get_reads_from();
- std::vector<const ModelAction *> release_heads;
+ std::vector< const ModelAction *, MyAlloc<const ModelAction *> > release_heads;
bool complete;
complete = release_seq_head(rf, &release_heads);
for (unsigned int i = 0; i < release_heads.size(); i++) {
}
if (updated) {
+ /* Re-check act for mo_graph edges */
+ work_queue->push_back(MOEdgeWorkEntry(act));
+
/* propagate synchronization to later actions */
action_list_t::reverse_iterator it = action_trace->rbegin();
while ((*it) != act) {
ModelAction *propagate = *it;
- if (act->happens_before(propagate))
- /** @todo new mo_graph edges along with
- * this synchronization? */
+ if (act->happens_before(propagate)) {
propagate->synchronize_with(act);
+ /* Re-check 'propagate' for mo_graph edges */
+ work_queue->push_back(MOEdgeWorkEntry(propagate));
+ }
}
}
if (complete) {
return resolved;
}
-
-
/**
* Compute the set of promises that could potentially be satisfied by this
* action. Note that the set computation actually appears in the Node, not in
projects / model-checker.git / blobdiff