X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.cc;h=9371b89676846d13d310412fb9ac4840c61862fb;hp=0283911b6eea07e57c7b7266fe3c80fc2d755595;hb=822674ef74d355637bc3ab2dda6fb63322a1f367;hpb=e2b556e7bb8b156ff1fe75e5d4c254bb3fc240c6 diff --git a/model.cc b/model.cc index 0283911..9371b89 100644 --- a/model.cc +++ b/model.cc @@ -20,11 +20,12 @@ ModelChecker *model; /** @brief Constructor */ ModelChecker::ModelChecker(struct model_params params) : /* Initialize default scheduler */ + params(params), scheduler(new Scheduler()), num_executions(0), num_feasible_executions(0), - params(params), diverge(NULL), + earliest_diverge(NULL), action_trace(new action_list_t()), thread_map(new HashTable()), obj_map(new HashTable()), @@ -32,20 +33,19 @@ ModelChecker::ModelChecker(struct model_params params) : obj_thrd_map(new HashTable, uintptr_t, 4 >()), promises(new std::vector()), futurevalues(new std::vector()), - lazy_sync_with_release(new HashTable()), + pending_acq_rel_seq(new std::vector()), thrd_last_action(new std::vector(1)), node_stack(new NodeStack()), mo_graph(new CycleGraph()), failed_promise(false), too_many_reads(false), - asserted(false) + asserted(false), + bad_synchronization(false) { /* Allocate this "size" on the snapshotting heap */ priv = (struct model_snapshot_members *)calloc(1, sizeof(*priv)); /* First thread created will have id INITIAL_THREAD_ID */ priv->next_thread_id = INITIAL_THREAD_ID; - - lazy_sync_size = &priv->lazy_sync_size; } /** @brief Destructor */ @@ -64,7 +64,7 @@ ModelChecker::~ModelChecker() delete (*promises)[i]; delete promises; - delete lazy_sync_with_release; + delete pending_acq_rel_seq; delete thrd_last_action; delete node_stack; @@ -82,6 +82,7 @@ void ModelChecker::reset_to_initial_state() node_stack->reset_execution(); failed_promise = false; too_many_reads = false; + bad_synchronization = false; reset_asserted(); snapshotObject->backTrackBeforeStep(0); } @@ -98,6 +99,12 @@ int ModelChecker::get_num_threads() return priv->next_thread_id; } +/** @return The currently executing Thread. */ +Thread * ModelChecker::get_current_thread() +{ + return scheduler->get_current_thread(); +} + /** @return a sequence number for a new ModelAction */ modelclock_t ModelChecker::get_next_seq_num() { @@ -138,6 +145,9 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr) ModelAction *next = node_stack->get_next()->get_action(); if (next == diverge) { + if (earliest_diverge == NULL || *diverge < *earliest_diverge) + earliest_diverge=diverge; + Node *nextnode = next->get_node(); /* Reached divergence point */ if (nextnode->increment_promise()) { @@ -157,8 +167,12 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr) Node *node = nextnode->get_parent(); tid = node->get_next_backtrack(); node_stack->pop_restofstack(1); + if (diverge==earliest_diverge) { + earliest_diverge=node->get_action(); + } } DEBUG("*** Divergence point ***\n"); + diverge = NULL; } else { tid = next->get_tid(); @@ -180,8 +194,20 @@ bool ModelChecker::next_execution() DBG(); num_executions++; - if (isfinalfeasible()) + + if (isfinalfeasible()) { + printf("Earliest divergence point since last feasible execution:\n"); + if (earliest_diverge) + earliest_diverge->print(false); + else + printf("(Not set)\n"); + + earliest_diverge = NULL; num_feasible_executions++; + } + + DEBUG("Number of acquires waiting on pending release sequences: %lu\n", + pending_acq_rel_seq->size()); if (isfinalfeasible() || DBG_ENABLED()) print_summary(); @@ -248,8 +274,6 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act) * * @param the ModelAction to find backtracking points for. */ - - void ModelChecker::set_backtracking(ModelAction *act) { Thread *t = get_thread(act); @@ -277,6 +301,20 @@ void ModelChecker::set_backtracking(ModelAction *act) if (node->has_been_explored(tid)) continue; + /* See if fairness allows */ + if (model->params.fairwindow != 0 && !node->has_priority(tid)) { + bool unfair=false; + for(int t=0;tget_num_threads();t++) { + thread_id_t tother=int_to_id(t); + if (node->is_enabled(tother) && node->has_priority(tother)) { + unfair=true; + break; + } + } + if (unfair) + continue; + } + /* Cache the latest backtracking point */ if (!priv->next_backtrack || *prev > *priv->next_backtrack) priv->next_backtrack = prev; @@ -324,7 +362,7 @@ bool ModelChecker::process_read(ModelAction *curr, bool second_part_of_rmw) bool r_status = false; if (!second_part_of_rmw) { - check_recency(curr); + check_recency(curr, reads_from); r_status = r_modification_order(curr, reads_from); } @@ -364,8 +402,10 @@ bool ModelChecker::process_read(ModelAction *curr, bool second_part_of_rmw) * * The unlock operation has to re-enable all of the threads that are * waiting on the lock. + * + * @return True if synchronization was updated; false otherwise */ -void ModelChecker::process_mutex(ModelAction *curr) { +bool ModelChecker::process_mutex(ModelAction *curr) { std::mutex *mutex = (std::mutex *)curr->get_location(); struct std::mutex_state *state = mutex->get_state(); switch (curr->get_type()) { @@ -387,8 +427,10 @@ void ModelChecker::process_mutex(ModelAction *curr) { state->islocked = true; ModelAction *unlock = get_last_unlock(curr); //synchronize with the previous unlock statement - if (unlock != NULL) + if (unlock != NULL) { curr->synchronize_with(unlock); + return true; + } break; } case ATOMIC_UNLOCK: { @@ -398,7 +440,7 @@ void ModelChecker::process_mutex(ModelAction *curr) { action_list_t *waiters = lock_waiters_map->get_safe_ptr(curr->get_location()); //activate all the waiting threads for (action_list_t::iterator rit = waiters->begin(); rit != waiters->end(); rit++) { - scheduler->add_thread(get_thread((*rit)->get_tid())); + scheduler->wake(get_thread(*rit)); } waiters->clear(); break; @@ -406,6 +448,7 @@ void ModelChecker::process_mutex(ModelAction *curr) { default: ASSERT(0); } + return false; } /** @@ -433,6 +476,64 @@ bool ModelChecker::process_write(ModelAction *curr) return updated_mod_order || updated_promises; } +/** + * @brief Process the current action for thread-related activity + * + * Performs current-action processing for a THREAD_* ModelAction. Proccesses + * may include setting Thread status, completing THREAD_FINISH/THREAD_JOIN + * synchronization, etc. This function is a no-op for non-THREAD actions + * (e.g., ATOMIC_{READ,WRITE,RMW,LOCK}, etc.) + * + * @param curr The current action + * @return True if synchronization was updated or a thread completed + */ +bool ModelChecker::process_thread_action(ModelAction *curr) +{ + bool updated = false; + + switch (curr->get_type()) { + case THREAD_CREATE: { + Thread *th = (Thread *)curr->get_location(); + th->set_creation(curr); + break; + } + case THREAD_JOIN: { + Thread *waiting, *blocking; + waiting = get_thread(curr); + blocking = (Thread *)curr->get_location(); + if (!blocking->is_complete()) { + blocking->push_wait_list(curr); + scheduler->sleep(waiting); + } else { + do_complete_join(curr); + updated = true; /* trigger rel-seq checks */ + } + break; + } + case THREAD_FINISH: { + Thread *th = get_thread(curr); + while (!th->wait_list_empty()) { + ModelAction *act = th->pop_wait_list(); + Thread *wake = get_thread(act); + scheduler->wake(wake); + do_complete_join(act); + updated = true; /* trigger rel-seq checks */ + } + th->complete(); + updated = true; /* trigger rel-seq checks */ + break; + } + case THREAD_START: { + check_promises(NULL, curr->get_cv()); + break; + } + default: + break; + } + + return updated; +} + /** * Initialize the current action by performing one or more of the following * actions, as appropriate: merging RMWR and RMWC/RMW actions, stepping forward @@ -451,10 +552,14 @@ ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr) if (curr->is_rmwc() || curr->is_rmw()) { newcurr = process_rmw(curr); delete curr; - compute_promises(newcurr); + + if (newcurr->is_rmw()) + compute_promises(newcurr); return newcurr; } + curr->set_seq_number(get_next_seq_num()); + newcurr = node_stack->explore_action(curr, scheduler->get_enabled()); if (newcurr) { /* First restore type and order in case of RMW operation */ @@ -467,18 +572,19 @@ ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr) /* Discard duplicate ModelAction; use action from NodeStack */ delete curr; - /* If we have diverged, we need to reset the clock vector. */ - if (diverge == NULL) - newcurr->create_cv(get_parent_action(newcurr->get_tid())); + /* Always compute new clock vector */ + newcurr->create_cv(get_parent_action(newcurr->get_tid())); } else { newcurr = curr; + + /* Always compute new clock vector */ + newcurr->create_cv(get_parent_action(newcurr->get_tid())); /* * Perform one-time actions when pushing new ModelAction onto * NodeStack */ - curr->create_cv(get_parent_action(curr->get_tid())); - if (curr->is_write()) - compute_promises(curr); + if (newcurr->is_write()) + compute_promises(newcurr); } return newcurr; } @@ -490,7 +596,6 @@ ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr) * @param curr is the ModelAction to check whether it is enabled. * @return a bool that indicates whether the action is enabled. */ - bool ModelChecker::check_action_enabled(ModelAction *curr) { if (curr->is_lock()) { std::mutex * lock = (std::mutex *)curr->get_location(); @@ -524,10 +629,10 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) bool second_part_of_rmw = curr->is_rmwc() || curr->is_rmw(); if (!check_action_enabled(curr)) { - //we'll make the execution look like we chose to run this action - //much later...when a lock is actually available to relese + /* Make the execution look like we chose to run this action + * much later, when a lock is actually available to release */ get_current_thread()->set_pending(curr); - remove_thread(get_current_thread()); + scheduler->sleep(get_current_thread()); return get_next_thread(NULL); } @@ -542,44 +647,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) build_reads_from_past(curr); curr = newcurr; - /* Thread specific actions */ - switch (curr->get_type()) { - case THREAD_CREATE: { - Thread *th = (Thread *)curr->get_location(); - th->set_creation(curr); - break; - } - case THREAD_JOIN: { - Thread *waiting, *blocking; - waiting = get_thread(curr); - blocking = (Thread *)curr->get_location(); - if (!blocking->is_complete()) { - blocking->push_wait_list(curr); - scheduler->sleep(waiting); - } else { - do_complete_join(curr); - } - break; - } - case THREAD_FINISH: { - Thread *th = get_thread(curr); - while (!th->wait_list_empty()) { - ModelAction *act = th->pop_wait_list(); - Thread *wake = get_thread(act); - scheduler->wake(wake); - do_complete_join(act); - } - th->complete(); - break; - } - case THREAD_START: { - check_promises(NULL, curr->get_cv()); - break; - } - default: - break; - } - + /* Initialize work_queue with the "current action" work */ work_queue_t work_queue(1, CheckCurrWorkEntry(curr)); while (!work_queue.empty()) { @@ -589,17 +657,24 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) switch (work.type) { case WORK_CHECK_CURR_ACTION: { ModelAction *act = work.action; - bool updated = false; + bool update = false; /* update this location's release seq's */ + bool update_all = false; /* update all release seq's */ + + if (process_thread_action(curr)) + update_all = true; + if (act->is_read() && process_read(act, second_part_of_rmw)) - updated = true; + update = true; if (act->is_write() && process_write(act)) - updated = true; + update = true; - if (act->is_mutex_op()) - process_mutex(act); + if (act->is_mutex_op() && process_mutex(act)) + update_all = true; - if (updated) + if (update_all) + work_queue.push_back(CheckRelSeqWorkEntry(NULL)); + else if (update) work_queue.push_back(CheckRelSeqWorkEntry(act->get_location())); break; } @@ -612,13 +687,15 @@ Thread * ModelChecker::check_current_action(ModelAction *curr) bool updated = false; if (act->is_read()) { - if (r_modification_order(act, act->get_reads_from())) + const ModelAction *rf = act->get_reads_from(); + if (rf != NULL && r_modification_order(act, rf)) updated = true; } if (act->is_write()) { if (w_modification_order(act)) updated = true; } + mo_graph->commitChanges(); if (updated) work_queue.push_back(CheckRelSeqWorkEntry(act->get_location())); @@ -677,11 +754,14 @@ bool ModelChecker::promises_expired() { /** @return whether the current partial trace must be a prefix of a * feasible trace. */ bool ModelChecker::isfeasibleprefix() { - return promises->size() == 0 && *lazy_sync_size == 0; + return promises->size() == 0 && pending_acq_rel_seq->size() == 0; } /** @return whether the current partial trace is feasible. */ bool ModelChecker::isfeasible() { + if (DBG_ENABLED() && mo_graph->checkForRMWViolation()) + DEBUG("Infeasible: RMW violation\n"); + return !mo_graph->checkForRMWViolation() && isfeasibleotherthanRMW(); } @@ -695,10 +775,12 @@ bool ModelChecker::isfeasibleotherthanRMW() { DEBUG("Infeasible: failed promise\n"); if (too_many_reads) DEBUG("Infeasible: too many reads\n"); + if (bad_synchronization) + DEBUG("Infeasible: bad synchronization ordering\n"); if (promises_expired()) DEBUG("Infeasible: promises expired\n"); } - return !mo_graph->checkForCycles() && !failed_promise && !too_many_reads && !promises_expired(); + return !mo_graph->checkForCycles() && !failed_promise && !too_many_reads && !bad_synchronization && !promises_expired(); } /** Returns whether the current completed trace is feasible. */ @@ -732,23 +814,21 @@ ModelAction * ModelChecker::process_rmw(ModelAction *act) { * * If so, we decide that the execution is no longer feasible. */ -void ModelChecker::check_recency(ModelAction *curr) { +void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf) { if (params.maxreads != 0) { + if (curr->get_node()->get_read_from_size() <= 1) return; - //Must make sure that execution is currently feasible... We could //accidentally clear by rolling back if (!isfeasible()) return; - std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); int tid = id_to_int(curr->get_tid()); /* Skip checks */ if ((int)thrd_lists->size() <= tid) return; - action_list_t *list = &(*thrd_lists)[tid]; action_list_t::reverse_iterator rit = list->rbegin(); @@ -767,17 +847,18 @@ void ModelChecker::check_recency(ModelAction *curr) { ModelAction *act = *rit; if (!act->is_read()) return; - if (act->get_reads_from() != curr->get_reads_from()) + + if (act->get_reads_from() != rf) return; if (act->get_node()->get_read_from_size() <= 1) return; } - for (int i = 0; iget_node()->get_read_from_size(); i++) { //Get write const ModelAction * write = curr->get_node()->get_read_from_at(i); + //Need a different write - if (write==curr->get_reads_from()) + if (write==rf) continue; /* Test to see whether this is a feasible write to read from*/ @@ -887,7 +968,6 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf * @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()); @@ -901,10 +981,10 @@ void ModelChecker::post_r_modification_order(ModelAction *curr, const ModelActio action_list_t::reverse_iterator rit; ModelAction *lastact = NULL; - /* Find last action that happens after curr */ + /* Find last action that happens after curr that is either not curr or a rmw */ for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *act = *rit; - if (curr->happens_before(act)) { + if (curr->happens_before(act) && (curr != act || curr->is_rmw())) { lastact = act; } else break; @@ -912,12 +992,25 @@ void ModelChecker::post_r_modification_order(ModelAction *curr, const ModelActio /* Include at most one act per-thread that "happens before" curr */ if (lastact != NULL) { - if (lastact->is_read()) { + if (lastact==curr) { + //Case 1: The resolved read is a RMW, and we need to make sure + //that the write portion of the RMW mod order after rf + + mo_graph->addEdge(rf, lastact); + } else if (lastact->is_read()) { + //Case 2: The resolved read is a normal read and the next + //operation is a read, and we need to make sure the value read + //is mod ordered after rf + const ModelAction *postreadfrom = lastact->get_reads_from(); if (postreadfrom != NULL&&rf != postreadfrom) mo_graph->addEdge(rf, postreadfrom); - } else if (rf != lastact) { - mo_graph->addEdge(rf, lastact); + } else { + //Case 3: The resolved read is a normal read and the next + //operation is a write, and we need to make sure that the + //write is mod ordered after rf + if (lastact!=rf) + mo_graph->addEdge(rf, lastact); } break; } @@ -1027,7 +1120,6 @@ bool ModelChecker::w_modification_order(ModelAction *curr) /** Arbitrary reads from the future are not allowed. Section 29.3 * part 9 places some constraints. This method checks one result of constraint * constraint. Others require compiler support. */ - bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader) { if (!writer->is_rmw()) return true; @@ -1069,24 +1161,36 @@ bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, con */ bool ModelChecker::release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const { - if (!rf) { - /* read from future: need to settle this later */ - return false; /* incomplete */ - } + /* Only check for release sequences if there are no cycles */ + if (mo_graph->checkForCycles()) + return false; - ASSERT(rf->is_write()); + while (rf) { + ASSERT(rf->is_write()); + + if (rf->is_release()) + release_heads->push_back(rf); + if (!rf->is_rmw()) + break; /* End of RMW chain */ - if (rf->is_release()) - release_heads->push_back(rf); - if (rf->is_rmw()) { - /* We need a RMW action that is both an acquire and release to stop */ /** @todo Need to be smarter here... In the linux lock * example, this will run to the beginning of the program for * every acquire. */ + /** @todo The way to be smarter here is to keep going until 1 + * thread has a release preceded by an acquire and you've seen + * both. */ + + /* acq_rel RMW is a sufficient stopping condition */ if (rf->is_acquire() && rf->is_release()) return true; /* complete */ - return release_seq_head(rf->get_reads_from(), release_heads); + + rf = rf->get_reads_from(); + }; + if (!rf) { + /* read from future: need to settle this later */ + return false; /* incomplete */ } + if (rf->is_release()) return true; /* complete */ @@ -1124,7 +1228,8 @@ bool ModelChecker::release_seq_head(const ModelAction *rf, rel_heads_list_t *rel bool future_ordered = false; ModelAction *last = get_last_action(int_to_id(i)); - if (last && rf->happens_before(last)) + if (last && (rf->happens_before(last) || + last->get_type() == THREAD_FINISH)) future_ordered = true; for (rit = list->rbegin(); rit != list->rend(); rit++) { @@ -1185,10 +1290,7 @@ void ModelChecker::get_release_seq_heads(ModelAction *act, rel_heads_list_t *rel complete = release_seq_head(rf, release_heads); if (!complete) { /* add act to 'lazy checking' list */ - action_list_t *list; - list = lazy_sync_with_release->get_safe_ptr(act->get_location()); - list->push_back(act); - (*lazy_sync_size)++; + pending_acq_rel_seq->push_back(act); } } @@ -1199,7 +1301,7 @@ void ModelChecker::get_release_seq_heads(ModelAction *act, rel_heads_list_t *rel * modification order information is present at the time an action occurs. * * @param location The location/object that should be checked for release - * sequence resolutions + * sequence resolutions. A NULL value means to check all locations. * @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 @@ -1207,34 +1309,40 @@ void ModelChecker::get_release_seq_heads(ModelAction *act, rel_heads_list_t *rel */ bool ModelChecker::resolve_release_sequences(void *location, work_queue_t *work_queue) { - action_list_t *list; - list = lazy_sync_with_release->getptr(location); - if (!list) - return false; - bool updated = false; - action_list_t::iterator it = list->begin(); - while (it != list->end()) { + std::vector::iterator it = pending_acq_rel_seq->begin(); + while (it != pending_acq_rel_seq->end()) { ModelAction *act = *it; + + /* Only resolve sequences on the given location, if provided */ + if (location && act->get_location() != location) { + it++; + continue; + } + const ModelAction *rf = act->get_reads_from(); rel_heads_list_t release_heads; bool complete; complete = release_seq_head(rf, &release_heads); for (unsigned int i = 0; i < release_heads.size(); i++) { if (!act->has_synchronized_with(release_heads[i])) { - updated = true; - act->synchronize_with(release_heads[i]); + if (act->synchronize_with(release_heads[i])) + updated = true; + else + set_bad_synchronization(); } } if (updated) { + /* Re-check all pending release sequences */ + work_queue->push_back(CheckRelSeqWorkEntry(NULL)); /* 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(); - for (; (*it) != act; it++) { - ModelAction *propagate = *it; + action_list_t::reverse_iterator rit = action_trace->rbegin(); + for (; (*rit) != act; rit++) { + ModelAction *propagate = *rit; if (act->happens_before(propagate)) { propagate->synchronize_with(act); /* Re-check 'propagate' for mo_graph edges */ @@ -1242,10 +1350,9 @@ bool ModelChecker::resolve_release_sequences(void *location, work_queue_t *work_ } } } - if (complete) { - it = list->erase(it); - (*lazy_sync_size)--; - } else + if (complete) + it = pending_acq_rel_seq->erase(it); + else it++; } @@ -1367,16 +1474,20 @@ bool ModelChecker::resolve_promises(ModelAction *write) Promise *promise = (*promises)[promise_index]; if (write->get_node()->get_promise(i)) { ModelAction *read = promise->get_action(); - read->read_from(write); if (read->is_rmw()) { mo_graph->addRMWEdge(write, read); } + read->read_from(write); //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); + //Make sure the promise's value matches the write's value + ASSERT(promise->get_value() == write->get_value()); + + delete(promise); promises->erase(promises->begin() + promise_index); resolved = true; } else @@ -1510,6 +1621,33 @@ static void print_list(action_list_t *list) printf("---------------------------------------------------------------------\n"); } +#if SUPPORT_MOD_ORDER_DUMP +void ModelChecker::dumpGraph(char *filename) { + char buffer[200]; + sprintf(buffer, "%s.dot",filename); + FILE *file=fopen(buffer, "w"); + fprintf(file, "digraph %s {\n",filename); + mo_graph->dumpNodes(file); + ModelAction ** thread_array=(ModelAction **)model_calloc(1, sizeof(ModelAction *)*get_num_threads()); + + for (action_list_t::iterator it = action_trace->begin(); it != action_trace->end(); it++) { + ModelAction *action=*it; + if (action->is_read()) { + fprintf(file, "N%u [label=\"%u, T%u\"];\n", action->get_seq_number(),action->get_seq_number(), action->get_tid()); + fprintf(file, "N%u -> N%u[label=\"rf\", color=red];\n", action->get_seq_number(), action->get_reads_from()->get_seq_number()); + } + if (thread_array[action->get_tid()] != NULL) { + fprintf(file, "N%u -> N%u[label=\"sb\", color=blue];\n", thread_array[action->get_tid()]->get_seq_number(), action->get_seq_number()); + } + + thread_array[action->get_tid()]=action; + } + fprintf(file,"}\n"); + model_free(thread_array); + fclose(file); +} +#endif + void ModelChecker::print_summary() { printf("\n"); @@ -1522,6 +1660,8 @@ void ModelChecker::print_summary() char buffername[100]; sprintf(buffername, "exec%04u", num_executions); mo_graph->dumpGraphToFile(buffername); + sprintf(buffername, "graph%04u", num_executions); + dumpGraph(buffername); #endif if (!isfinalfeasible()) @@ -1545,7 +1685,6 @@ void ModelChecker::add_thread(Thread *t) * Removes a thread from the scheduler. * @param the thread to remove. */ - void ModelChecker::remove_thread(Thread *t) { scheduler->remove_thread(t); @@ -1556,7 +1695,10 @@ void ModelChecker::remove_thread(Thread *t) * context). This switch is made with the intention of exploring a particular * model-checking action (described by a ModelAction object). Must be called * from a user-thread context. - * @param act The current action that will be explored. Must not be NULL. + * + * @param act The current action that will be explored. May be NULL only if + * trace is exiting via an assertion (see ModelChecker::set_assert and + * ModelChecker::has_asserted). * @return Return status from the 'swap' call (i.e., success/fail, 0/-1) */ int ModelChecker::switch_to_master(ModelAction *act) @@ -1583,6 +1725,7 @@ bool ModelChecker::take_step() { priv->nextThread = check_current_action(priv->current_action); priv->current_action = NULL; + if (curr->is_blocked() || curr->is_complete()) scheduler->remove_thread(curr); } else {