USER_O=userprog.o
USER_H=libthreads.h libatomic.h
- MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc threads.cc tree.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc
- MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o tree.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o
- MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o librace.o action.o nodestack.o clockvector.o main.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h librace.h action.h nodestack.h clockvector.h
++MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc
++MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o
++MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h
+
+SHMEM_CC=snapshot.cc malloc.c mymemory.cc
+SHMEM_O=snapshot.o malloc.o mymemory.o
+SHMEM_H=snapshot.h snapshotimp.h mymemory.h
CPPFLAGS=-Wall -g
-LDFLAGS=-ldl
+LDFLAGS=-ldl -lrt
all: $(BIN)
$(BIN): $(USER_O) $(LIB_SO)
- $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) $(CPPFLAGS)
+ $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME)
# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
- $(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
+ $(CXX) -shared -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
+
+malloc.o: malloc.c
+ $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
+
+mymemory.o: mymemory.h snapshotimp.h mymemory.cc
+ $(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
+
+snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
+ $(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
$(MODEL_O): $(MODEL_CC) $(MODEL_H)
$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
#include "model.h"
#include "action.h"
- #include "tree.h"
+ #include "nodestack.h"
#include "schedule.h"
+#include "snapshot-interface.h"
+#undef DEBUG
#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;
- }
-
ModelChecker::ModelChecker()
:
/* Initialize default scheduler */
num_executions(0),
current_action(NULL),
- exploring(NULL),
+ diverge(NULL),
nextThread(THREAD_ID_T_NONE),
action_trace(new action_list_t()),
- rootNode(new TreeNode()),
- currentNode(rootNode)
+ node_stack(new NodeStack()),
+ next_backtrack(NULL)
{
}
ModelChecker::~ModelChecker()
{
- std::map<int, class Thread *>::iterator it;
+ std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
for (it = thread_map.begin(); it != thread_map.end(); it++)
delete (*it).second;
thread_map.clear();
- free_action_list(action_trace);
+ delete action_trace;
+ delete node_stack;
delete scheduler;
- delete rootNode;
}
void ModelChecker::reset_to_initial_state()
{
DEBUG("+++ Resetting to initial state +++\n");
- std::map<int, class Thread *>::iterator it;
+ std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< 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();
- currentNode = rootNode;
+ node_stack->reset_execution();
current_action = NULL;
next_thread_id = INITIAL_THREAD_ID;
used_sequence_numbers = 0;
nextThread = 0;
+ next_backtrack = NULL;
/* scheduler reset ? */
}
thread_id_t tid;
/* Have we completed exploring the preselected path? */
- if (exploring == NULL)
+ if (diverge == NULL)
return THREAD_ID_T_NONE;
/* Else, we are trying to replay an execution */
- exploring->advance_state();
-
- ASSERT(exploring->get_state() != NULL);
+ next = node_stack->get_next()->get_action();
- next = exploring->get_state();
+ if (next == diverge) {
+ Node *node = next->get_node();
- if (next == exploring->get_diverge()) {
- TreeNode *node = next->get_treenode();
-
- /* Reached divergence point; discard our current 'exploring' */
- DEBUG("*** Discard 'Backtrack' object ***\n");
- tid = node->getNextBacktrack();
- delete exploring;
- exploring = NULL;
+ /* Reached divergence point */
+ DEBUG("*** Divergence point ***\n");
+ tid = node->get_next_backtrack();
+ diverge = NULL;
} else {
tid = next->get_tid();
}
num_executions++;
print_summary();
- if ((exploring = model->get_next_backtrack()) == NULL)
+ if ((diverge = model->get_next_backtrack()) == NULL)
return false;
if (DBG_ENABLED()) {
printf("Next execution will diverge at:\n");
- exploring->get_diverge()->print();
- print_list(exploring->get_trace());
+ diverge->print();
}
model->reset_to_initial_state();
void ModelChecker::set_backtracking(ModelAction *act)
{
ModelAction *prev;
- TreeNode *node;
+ Node *node;
Thread *t = get_thread(act->get_tid());
prev = get_last_conflict(act);
if (prev == NULL)
return;
- node = prev->get_treenode();
+ node = prev->get_node();
- while (t && !node->is_enabled(t))
+ while (!node->is_enabled(t))
t = t->get_parent();
/* Check if this has been explored already */
- if (node->hasBeenExplored(t->get_id()))
+ if (node->has_been_explored(t->get_id()))
return;
+
+ if (!next_backtrack || *prev > *next_backtrack)
+ next_backtrack = prev;
+
/* If this is a new backtracking point, mark the tree */
- if (node->setBacktrack(t->get_id()) != 0)
+ if (!node->set_backtrack(t->get_id()))
return;
-
DEBUG("Setting backtrack: conflict = %d, instead tid = %d\n",
prev->get_tid(), t->get_id());
if (DBG_ENABLED()) {
prev->print();
act->print();
}
-
- Backtrack *back = new Backtrack(prev, action_trace);
- backtrack_list.push_back(back);
}
- Backtrack * ModelChecker::get_next_backtrack()
+ ModelAction * ModelChecker::get_next_backtrack()
{
- Backtrack *next;
- if (backtrack_list.empty())
- return NULL;
- next = backtrack_list.back();
- backtrack_list.pop_back();
+ ModelAction *next = next_backtrack;
+ next_backtrack = NULL;
return next;
}
void ModelChecker::check_current_action(void)
{
+ Node *currnode;
+
ModelAction *curr = this->current_action;
current_action = NULL;
if (!curr) {
return;
}
+ curr = node_stack->explore_action(curr);
nextThread = get_next_replay_thread();
- curr->set_node(currentNode);
+
+ currnode = curr->get_node();
+
+ if (!currnode->backtrack_empty())
+ if (!next_backtrack || *curr > *next_backtrack)
+ next_backtrack = curr;
+
set_backtracking(curr);
- currentNode = currentNode->explore_child(curr);
this->action_trace->push_back(curr);
}
{
printf("\n");
printf("Number of executions: %d\n", num_executions);
- printf("Total nodes created: %d\n", TreeNode::getTotalNodes());
+ printf("Total nodes created: %d\n", Node::get_total_nodes());
scheduler->print();
print_list(action_trace);
printf("\n");
-
}
void ModelChecker::print_list(action_list_t *list)
#include <list>
#include <map>
+#include <vector>
#include <cstddef>
#include <ucontext.h>
#include "schedule.h"
+#include "mymemory.h"
+#include <utility>
#include "libthreads.h"
#include "libatomic.h"
#include "threads.h"
#include "action.h"
/* Forward declaration */
- class TreeNode;
- class Backtrack;
+ class NodeStack;
class ModelChecker {
public:
int switch_to_master(ModelAction *act);
bool next_execution();
+ MEMALLOC
private:
int next_thread_id;
int used_sequence_numbers;
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
thread_id_t get_next_replay_thread();
- Backtrack * get_next_backtrack();
+ ModelAction * get_next_backtrack();
void reset_to_initial_state();
void print_list(action_list_t *list);
- class ModelAction *current_action;
- Backtrack *exploring;
+ ModelAction *current_action;
+ ModelAction *diverge;
thread_id_t nextThread;
ucontext_t *system_context;
action_list_t *action_trace;
- std::map<int, class Thread *> thread_map;
+ std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
- class TreeNode *rootNode, *currentNode;
- std::list<class Backtrack *, MyAlloc< class Backtrack * > > backtrack_list;
+ class NodeStack *node_stack;
+ ModelAction *next_backtrack;
};
extern ModelChecker *model;
projects / model-checker.git / commitdiff