X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=83db4d8f7c3985d72e1b7d151a259027db7fee55;hb=996d51da9229031b9d7841c2f3d3b7629db2cba9;hp=625d2726fe775921f981e5d666426eb85cb32148;hpb=d17f01373231c13da5ff530f9c633ba4277f9954;p=model-checker.git

diff --git a/model.h b/model.h
index 625d272..83db4d8 100644
--- a/model.h
+++ b/model.h
@@ -1,18 +1,85 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-struct model_checker {
-	struct scheduler *scheduler;
-	struct thread *system_thread;
+#include <list>
+#include <map>
+#include <cstddef>
+#include <ucontext.h>
 
-	/* "Private" fields */
-	int used_thread_id;
+#include "schedule.h"
+#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;
 };
 
-extern struct model_checker *model;
+class ModelChecker {
+public:
+	ModelChecker();
+	~ModelChecker();
+	class Scheduler *scheduler;
+
+	void set_system_context(ucontext_t *ctxt) { system_context = ctxt; }
+	ucontext_t * get_system_context(void) { return system_context; }
+
+	void set_current_action(ModelAction *act) { current_action = act; }
+	void check_current_action(void);
+	void print_summary(void);
+	Thread * schedule_next_thread();
+
+	int add_thread(Thread *t);
+	void remove_thread(Thread *t);
+	Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
+
+	int get_next_id();
+
+	int switch_to_master(ModelAction *act);
+
+	bool next_execution();
+private:
+	int used_thread_id;
+	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();
+	void reset_to_initial_state();
+
+	class ModelAction *current_action;
+	Backtrack *exploring;
+	thread_id_t nextThread;
+
+	ucontext_t *system_context;
+	action_list_t *action_trace;
+	std::map<thread_id_t, class Thread *> thread_map;
+	class TreeNode *rootNode, *currentNode;
+	std::list<class Backtrack *> backtrack_list;
+};
 
-void model_checker_init(void);
-void model_checker_add_system_thread(struct thread *t);
-void model_checker_assign_id(struct thread *t);
+extern ModelChecker *model;
 
 #endif /* __MODEL_H__ */