X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=0f93920fc83bc5cb29ffc7da618923b8f5a266c9;hb=7d2149ffbbc1a3514838d721a71bb0d4c81054b3;hp=b2bcb96f54a79513a6eb7c7890c796a4203f0299;hpb=612a0d9b6537c8c24bcbaed2cf23a73fff65f5f1;p=model-checker.git

diff --git a/model.h b/model.h
index b2bcb96..0f93920 100644
--- a/model.h
+++ b/model.h
@@ -1,39 +1,26 @@
+/** @file model.h
+ *  @brief Core model checker. 
+ */
+
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
 #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 {
-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;
-};
+class NodeStack;
 
 class ModelChecker {
 public:
@@ -51,33 +38,45 @@ public:
 
 	int add_thread(Thread *t);
 	void remove_thread(Thread *t);
-	Thread * get_thread(thread_id_t tid) { return thread_map[id_to_int(tid)]; }
+	Thread * get_thread(thread_id_t tid) { return (*thread_map)[id_to_int(tid)]; }
 
 	thread_id_t get_next_id();
+	int get_num_threads();
+	int get_next_seq_num();
 
 	int switch_to_master(ModelAction *act);
 
 	bool next_execution();
+
+	MEMALLOC
 private:
-	int used_thread_id;
+	int next_thread_id;
+	int used_sequence_numbers;
 	int num_executions;
 
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
-	thread_id_t advance_backtracking_state();
 	thread_id_t get_next_replay_thread();
-	Backtrack * get_next_backtrack();
+	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
 
-	class ModelAction *current_action;
-	Backtrack *exploring;
+	void add_action_to_lists(ModelAction *act);
+	ModelAction * get_last_action(thread_id_t tid);
+	ModelAction * get_parent_action(thread_id_t tid);
+
+	void print_list(action_list_t *list);
+
+	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;
-	class TreeNode *rootNode, *currentNode;
-	std::list<class Backtrack *> backtrack_list;
+	std::map<int, class Thread *> *thread_map;
+	std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
+	std::vector<ModelAction *> *thrd_last_action;
+	class NodeStack *node_stack;
+	ModelAction *next_backtrack;
 };
 
 extern ModelChecker *model;