X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=766e3694c32fffbff9240a836a3ed896e3b41103;hb=32e654a5b04567bc88cd0746e14c8e4aec040375;hp=795c4a99fea347b1d610c62df8172c55c447f91d;hpb=03a2997dd18bfee9058c42019865eeb33262df21;p=model-checker.git diff --git a/model.cc b/model.cc index 795c4a9..766e369 100644 --- a/model.cc +++ b/model.cc @@ -21,6 +21,7 @@ ModelChecker::ModelChecker(struct model_params params) : /* Initialize default scheduler */ scheduler(new Scheduler()), num_executions(0), + num_feasible_executions(0), params(params), diverge(NULL), action_trace(new action_list_t()), @@ -174,6 +175,8 @@ bool ModelChecker::next_execution() DBG(); num_executions++; + if (isfinalfeasible()) + num_feasible_executions++; if (isfinalfeasible() || DBG_ENABLED()) print_summary(); @@ -259,34 +262,33 @@ ModelAction * ModelChecker::get_next_backtrack() 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); + check_recency(curr); + 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; } @@ -301,11 +303,36 @@ bool ModelChecker::process_read(ModelAction *curr, Thread * th, bool second_part 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; isize(); 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 @@ -359,7 +386,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) } /* Thread specific actions */ - switch(curr->get_type()) { + switch (curr->get_type()) { case THREAD_CREATE: { Thread *th = (Thread *)curr->get_location(); th->set_creation(curr); @@ -393,41 +420,43 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) break; } - Thread *th = get_thread(curr); + /* Add current action to lists before work_queue loop */ + if (!second_part_of_rmw) + add_action_to_lists(curr); - bool updated = false; - if (curr->is_read()) { - updated=process_read(curr, th, second_part_of_rmw); - } + work_queue_t work_queue(1, CheckCurrWorkEntry(curr)); - 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;isize();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); - } + while (!work_queue.empty()) { + WorkQueueEntry work = work_queue.front(); + work_queue.pop_front(); - mo_graph->commitChanges(); - th->set_return_value(VALUE_NONE); - } + 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; - if (updated) - resolve_release_sequences(curr->get_location()); + if (act->is_write() && process_write(act)) + updated = true; - /* Add action to list. */ - if (!second_part_of_rmw) - add_action_to_lists(curr); + 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; + } + } check_curr_backtracking(curr); - + set_backtracking(curr); return get_next_thread(curr); @@ -436,7 +465,7 @@ Thread * ModelChecker::check_current_action(ModelAction *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() || @@ -447,7 +476,6 @@ void ModelChecker::check_curr_backtracking(ModelAction * curr) { } } - bool ModelChecker::promises_expired() { for (unsigned int promise_index = 0; promise_index < promises->size(); promise_index++) { Promise *promise = (*promises)[promise_index]; @@ -503,7 +531,7 @@ ModelAction * ModelChecker::process_rmw(ModelAction *act) { * * If so, we decide that the execution is no longer feasible. */ -void ModelChecker::check_recency(ModelAction *curr, bool already_added) { +void ModelChecker::check_recency(ModelAction *curr) { if (params.maxreads != 0) { if (curr->get_node()->get_read_from_size() <= 1) return; @@ -524,16 +552,14 @@ void ModelChecker::check_recency(ModelAction *curr, bool already_added) { action_list_t::reverse_iterator rit = list->rbegin(); /* Skip past curr */ - if (already_added) { - for (; (*rit) != curr; rit++) - ; - /* go past curr now */ - rit++; - } + for (; (*rit) != curr; rit++) + ; + /* go past curr now */ + 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; @@ -546,9 +572,9 @@ void ModelChecker::check_recency(ModelAction *curr, bool already_added) { return; } - for (int i=0;iget_node()->get_read_from_size();i++) { + for (int i = 0; iget_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; @@ -556,27 +582,27 @@ void ModelChecker::check_recency(ModelAction *curr, bool already_added) { /* 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;jget_node()->get_read_from_size();j++) { + bool foundvalue = false; + for (int j = 0; jget_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; } } @@ -589,7 +615,18 @@ void ModelChecker::check_recency(ModelAction *curr, bool already_added) { } /** - * Updates the mo_graph with the constraints imposed from the current read. + * Updates the mo_graph with the constraints imposed from the current + * read. + * + * Basic idea is the following: Go through each other thread and find + * the lastest action that happened before our read. Two cases: + * + * (1) The action is a write => that write must either occur before + * the write we read from or be the write we read from. + * + * (2) The action is a read => the write that that action read from + * must occur before the write we read from or be the same write. + * * @param curr The current action. Must be a read. * @param rf The action that curr reads from. Must be a write. * @return True if modification order edges were added; false otherwise @@ -609,17 +646,22 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *act = *rit; - /* Include at most one act per-thread that "happens before" curr */ - if (act->happens_before(curr)) { - if (act->is_read()) { + /* + * Include at most one act per-thread that "happens + * before" curr. Don't consider reflexively. + */ + if (act->happens_before(curr) && act != curr) { + if (act->is_write()) { + if (rf != act) { + 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; } @@ -629,7 +671,22 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf return added; } -/** Updates the mo_graph with the constraints imposed from the current read. */ +/** This method fixes up the modification order when we resolve a + * promises. The basic problem is that actions that occur after the + * read curr could not property add items to the modification order + * for our read. + * + * So for each thread, we find the earliest item that happens after + * the read curr. This is the item we have to fix up with additional + * constraints. If that action is write, we add a MO edge between + * the Action rf and that action. If the action is a read, we add a + * MO edge between the Action rf, and whatever the read accessed. + * + * @param curr is the read ModelAction that we are fixing up MO edges for. + * @param rf is the write ModelAction that curr reads from. + * + */ + void ModelChecker::post_r_modification_order(ModelAction *curr, const ModelAction *rf) { std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); @@ -668,6 +725,23 @@ void ModelChecker::post_r_modification_order(ModelAction *curr, const ModelActio /** * Updates the mo_graph with the constraints imposed from the current write. + * + * Basic idea is the following: Go through each other thread and find + * the lastest action that happened before our write. Two cases: + * + * (1) The action is a write => that write must occur before + * the current write + * + * (2) The action is a read => the write that that action read from + * must occur before the current write. + * + * This method also handles two other issues: + * + * (I) Sequential Consistency: Making sure that if the current write is + * seq_cst, that it occurs after the previous seq_cst write. + * + * (II) Sending the write back to non-synchronizing reads. + * * @param curr The current action. Must be a write. * @return True if modification order edges were added; false otherwise */ @@ -681,7 +755,7 @@ bool ModelChecker::w_modification_order(ModelAction *curr) if (curr->is_seqcst()) { /* We have to at least see the last sequentially consistent write, so we are initialized. */ - ModelAction *last_seq_cst = get_last_seq_cst(curr->get_location()); + ModelAction *last_seq_cst = get_last_seq_cst(curr); if (last_seq_cst != NULL) { mo_graph->addEdge(last_seq_cst, curr); added = true; @@ -696,8 +770,12 @@ bool ModelChecker::w_modification_order(ModelAction *curr) for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *act = *rit; - /* Include at most one act per-thread that "happens before" curr */ - if (act->happens_before(curr)) { + /* + * Include at most one act per-thread that "happens + * before" curr. Only consider reflexively if curr is + * RMW. + */ + if (act->happens_before(curr) && (act != curr || curr->is_rmw())) { /* * Note: if act is RMW, just add edge: * act --mo--> curr @@ -725,7 +803,7 @@ bool ModelChecker::w_modification_order(ModelAction *curr) 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); } } @@ -747,10 +825,10 @@ bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, con 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; } @@ -758,7 +836,6 @@ bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, con 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 @@ -781,13 +858,15 @@ bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, con * false otherwise */ bool ModelChecker::release_seq_head(const ModelAction *rf, - std::vector *release_heads) const + std::vector< const ModelAction *, MyAlloc > *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()) { @@ -885,7 +964,7 @@ bool ModelChecker::release_seq_head(const ModelAction *rf, * @see ModelChecker::release_seq_head */ void ModelChecker::get_release_seq_heads(ModelAction *act, - std::vector *release_heads) + std::vector< const ModelAction *, MyAlloc > *release_heads) { const ModelAction *rf = act->get_reads_from(); bool complete; @@ -907,9 +986,12 @@ void ModelChecker::get_release_seq_heads(ModelAction *act, * * @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 *list; list = lazy_sync_with_release->getptr(location); @@ -921,7 +1003,7 @@ bool ModelChecker::resolve_release_sequences(void *location) while (it != list->end()) { ModelAction *act = *it; const ModelAction *rf = act->get_reads_from(); - std::vector release_heads; + std::vector< const ModelAction *, MyAlloc > release_heads; bool complete; complete = release_seq_head(rf, &release_heads); for (unsigned int i = 0; i < release_heads.size(); i++) { @@ -932,14 +1014,18 @@ bool ModelChecker::resolve_release_sequences(void *location) } 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) { @@ -990,18 +1076,21 @@ ModelAction * ModelChecker::get_last_action(thread_id_t tid) } /** - * Gets the last memory_order_seq_cst action (in the total global sequence) - * performed on a particular object (i.e., memory location). - * @param location The object location to check - * @return The last seq_cst action performed + * Gets the last memory_order_seq_cst write (in the total global sequence) + * performed on a particular object (i.e., memory location), not including the + * current action. + * @param curr The current ModelAction; also denotes the object location to + * check + * @return The last seq_cst write */ -ModelAction * ModelChecker::get_last_seq_cst(const void *location) +ModelAction * ModelChecker::get_last_seq_cst(ModelAction *curr) { + void *location = curr->get_location(); action_list_t *list = obj_map->get_safe_ptr(location); /* Find: max({i in dom(S) | seq_cst(t_i) && isWrite(t_i) && samevar(t_i, t)}) */ action_list_t::reverse_iterator rit; for (rit = list->rbegin(); rit != list->rend(); rit++) - if ((*rit)->is_write() && (*rit)->is_seqcst()) + if ((*rit)->is_write() && (*rit)->is_seqcst() && (*rit) != curr) return *rit; return NULL; } @@ -1042,7 +1131,11 @@ bool ModelChecker::resolve_promises(ModelAction *write) if (read->is_rmw()) { mo_graph->addRMWEdge(write, read); } + //First fix up the modification order for actions that happened + //before the read r_modification_order(read, write); + //Next fix up the modification order for actions that happened + //after the read. post_r_modification_order(read, write); promises->erase(promises->begin() + promise_index); resolved = true; @@ -1052,8 +1145,6 @@ bool ModelChecker::resolve_promises(ModelAction *write) 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 @@ -1113,7 +1204,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) bool initialized = false; if (curr->is_seqcst()) { - last_seq_cst = get_last_seq_cst(curr->get_location()); + last_seq_cst = get_last_seq_cst(curr); /* We have to at least see the last sequentially consistent write, so we are initialized. */ if (last_seq_cst != NULL) @@ -1183,9 +1274,15 @@ void ModelChecker::print_summary() { printf("\n"); printf("Number of executions: %d\n", num_executions); + printf("Number of feasible executions: %d\n", num_feasible_executions); printf("Total nodes created: %d\n", node_stack->get_total_nodes()); +#if SUPPORT_MOD_ORDER_DUMP scheduler->print(); + char buffername[100]; + sprintf(buffername, "exec%u",num_executions); + mo_graph->dumpGraphToFile(buffername); +#endif if (!isfinalfeasible()) printf("INFEASIBLE EXECUTION!\n");