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

diff --git a/model.h b/model.h
index 7116d54..0f93920 100644
--- a/model.h
+++ b/model.h
@@ -1,7 +1,84 @@
+/** @file model.h
+ *  @brief Core model checker. 
+ */
+
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-struct model_checker {
+#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 NodeStack;
+
+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)[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 next_thread_id;
+	int used_sequence_numbers;
+	int num_executions;
+
+	ModelAction * get_last_conflict(ModelAction *act);
+	void set_backtracking(ModelAction *act);
+	thread_id_t get_next_replay_thread();
+	ModelAction * get_next_backtrack();
+	void reset_to_initial_state();
+
+	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;
+	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;
+
 #endif /* __MODEL_H__ */