#include "action.h"
#include "nodestack.h"
#include "schedule.h"
+#include "snapshot-interface.h"
#include "common.h"
#define INITIAL_THREAD_ID 0
-class Backtrack {
-public:
- Backtrack(ModelAction *d, action_list_t *t) {
- diverge = d;
- actionTrace = t;
- iter = actionTrace->begin();
- }
- ModelAction * get_diverge() { return diverge; }
- action_list_t * get_trace() { return actionTrace; }
- void advance_state() { iter++; }
- ModelAction * get_state() {
- return iter == actionTrace->end() ? NULL : *iter;
- }
-private:
- ModelAction *diverge;
- action_list_t *actionTrace;
- /* points to position in actionTrace as we replay */
- action_list_t::iterator iter;
-};
-
ModelChecker *model;
-void free_action_list(action_list_t *list)
-{
- action_list_t::iterator it;
- for (it = list->begin(); it != list->end(); it++)
- delete (*it);
- delete list;
-}
-
+/** @brief Constructor */
ModelChecker::ModelChecker()
:
/* Initialize default scheduler */
diverge(NULL),
nextThread(THREAD_ID_T_NONE),
action_trace(new action_list_t()),
+ thread_map(new std::map<int, class Thread *>),
+ obj_thrd_map(new std::map<void *, std::vector<action_list_t> >()),
+ thrd_last_action(new std::vector<ModelAction *>(1)),
node_stack(new NodeStack()),
next_backtrack(NULL)
{
}
+/** @brief Destructor */
ModelChecker::~ModelChecker()
{
std::map<int, class Thread *>::iterator it;
- for (it = thread_map.begin(); it != thread_map.end(); it++)
+ for (it = thread_map->begin(); it != thread_map->end(); it++)
delete (*it).second;
- thread_map.clear();
+ delete thread_map;
+ delete obj_thrd_map;
delete action_trace;
-
+ delete thrd_last_action;
delete node_stack;
delete scheduler;
}
+/**
+ * Restores user program to initial state and resets all model-checker data
+ * structures.
+ */
void ModelChecker::reset_to_initial_state()
{
DEBUG("+++ Resetting to initial state +++\n");
- std::map<int, class Thread *>::iterator it;
- for (it = thread_map.begin(); it != thread_map.end(); it++)
- delete (*it).second;
- thread_map.clear();
- delete action_trace;
- action_trace = new action_list_t();
node_stack->reset_execution();
current_action = NULL;
next_thread_id = INITIAL_THREAD_ID;
used_sequence_numbers = 0;
nextThread = 0;
next_backtrack = NULL;
- /* scheduler reset ? */
+ snapshotObject->backTrackBeforeStep(0);
}
+/** @returns a thread ID for a new Thread */
thread_id_t ModelChecker::get_next_id()
{
return next_thread_id++;
}
+/** @returns the number of user threads created during this execution */
+int ModelChecker::get_num_threads()
+{
+ return next_thread_id;
+}
+
+/** @returns a sequence number for a new ModelAction */
int ModelChecker::get_next_seq_num()
{
return ++used_sequence_numbers;
}
+/**
+ * Performs the "scheduling" for the model-checker. That is, it checks if the
+ * model-checker has selected a "next thread to run" and returns it, if
+ * available. This function should be called from the Scheduler routine, where
+ * the Scheduler falls back to a default scheduling routine if needed.
+ *
+ * @return The next thread chosen by the model-checker. If the model-checker
+ * makes no selection, retuns NULL.
+ */
Thread * ModelChecker::schedule_next_thread()
{
Thread *t;
if (nextThread == THREAD_ID_T_NONE)
return NULL;
- t = thread_map[id_to_int(nextThread)];
+ t = (*thread_map)[id_to_int(nextThread)];
ASSERT(t != NULL);
return t;
}
-/*
- * get_next_replay_thread() - Choose the next thread in the replay sequence
+/**
+ * Choose the next thread in the replay sequence.
*
- * If we've reached the 'diverge' point, then we pick a thread from the
- * backtracking set.
- * Otherwise, we simply return the next thread in the sequence.
+ * If the replay sequence has reached the 'diverge' point, returns a thread
+ * from the backtracking set. Otherwise, simply returns the next thread in the
+ * sequence that is being replayed.
*/
thread_id_t ModelChecker::get_next_replay_thread()
{
return tid;
}
+/**
+ * Queries the model-checker for more executions to explore and, if one
+ * exists, resets the model-checker state to execute a new execution.
+ *
+ * @return If there are more executions to explore, return true. Otherwise,
+ * return false.
+ */
bool ModelChecker::next_execution()
{
DBG();
action_list_t::reverse_iterator rit;
for (rit = action_trace->rbegin(); rit != action_trace->rend(); rit++) {
ModelAction *prev = *rit;
- if (act->is_dependent(prev))
+ if (act->is_synchronizing(prev))
return prev;
}
return NULL;
Node *currnode;
ModelAction *curr = this->current_action;
+ ModelAction *tmp;
current_action = NULL;
if (!curr) {
DEBUG("trying to push NULL action...\n");
return;
}
- curr = node_stack->explore_action(curr);
+ tmp = node_stack->explore_action(curr);
+ if (tmp) {
+ /* Discard duplicate ModelAction */
+ delete curr;
+ curr = tmp;
+ } else {
+ curr->create_cv(get_parent_action(curr->get_tid()));
+ }
+
+ /* Assign 'creation' parent */
+ if (curr->get_type() == THREAD_CREATE) {
+ Thread *th = (Thread *)curr->get_location();
+ th->set_creation(curr);
+ }
+
nextThread = get_next_replay_thread();
currnode = curr->get_node();
next_backtrack = curr;
set_backtracking(curr);
- this->action_trace->push_back(curr);
+
+ add_action_to_lists(curr);
+}
+
+
+/**
+ * Adds an action to the per-object, per-thread action vector.
+ * @param act is the ModelAction to add.
+ */
+
+void ModelChecker::add_action_to_lists(ModelAction *act)
+{
+ action_trace->push_back(act);
+
+ std::vector<action_list_t> *vec = &(*obj_thrd_map)[act->get_location()];
+ if (id_to_int(act->get_tid()) >= (int)vec->size())
+ vec->resize(next_thread_id);
+ (*vec)[id_to_int(act->get_tid())].push_back(act);
+
+ (*thrd_last_action)[id_to_int(act->get_tid())] = act;
+}
+
+ModelAction * ModelChecker::get_last_action(thread_id_t tid)
+{
+ int nthreads = get_num_threads();
+ if ((int)thrd_last_action->size() < nthreads)
+ thrd_last_action->resize(nthreads);
+ return (*thrd_last_action)[id_to_int(tid)];
+}
+
+ModelAction * ModelChecker::get_parent_action(thread_id_t tid)
+{
+ ModelAction *parent = get_last_action(tid);
+ if (!parent)
+ parent = get_thread(tid)->get_creation();
+ return parent;
}
void ModelChecker::print_summary(void)
{
printf("\n");
printf("Number of executions: %d\n", num_executions);
- printf("Total nodes created: %d\n", Node::get_total_nodes());
+ printf("Total nodes created: %d\n", node_stack->get_total_nodes());
scheduler->print();
int ModelChecker::add_thread(Thread *t)
{
- thread_map[id_to_int(t->get_id())] = t;
+ (*thread_map)[id_to_int(t->get_id())] = t;
scheduler->add_thread(t);
return 0;
}
projects / model-checker.git / blobdiff