X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=4718c503f9eac77a106d9505d49aca410b741d5b;hb=10de861d3a9908e75b6f94283cc67b3f1b4d93ab;hp=1dc6a158d3aa63247d1051977fe734f1b9cf042f;hpb=9fcdad5ce4e6a253041894fd3e02061474e1af43;p=model-checker.git

diff --git a/model.h b/model.h
index 1dc6a15..4718c50 100644
--- a/model.h
+++ b/model.h
@@ -16,8 +16,7 @@
 #include "action.h"
 
 /* Forward declaration */
-class TreeNode;
-class Backtrack;
+class NodeStack;
 
 class ModelChecker {
 public:
@@ -52,20 +51,20 @@ private:
 	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 *, 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;