X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=ad8760a28576aafecc17d05d9cb01b92e7df259d;hb=8a7dd35db7542ad66f87060cf637172249494e47;hp=e075ea254640e7f32c0392d027af60a308b329c2;hpb=443c3b5f3962dbd4d5607a11d9c41ececf854e2c;p=model-checker.git

diff --git a/model.h b/model.h
index e075ea2..ad8760a 100644
--- a/model.h
+++ b/model.h
@@ -1,12 +1,115 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-struct model_checker {
-	struct scheduler *scheduler;
+#include <list>
+#include <map>
+#include <cstddef>
+#include <ucontext.h>
+
+#include "schedule.h"
+#include "libthreads.h"
+#include "libatomic.h"
+#include "threads.h"
+#include "tree.h"
+
+#define VALUE_NONE -1
+
+typedef enum action_type {
+	THREAD_CREATE,
+	THREAD_YIELD,
+	THREAD_JOIN,
+	ATOMIC_READ,
+	ATOMIC_WRITE
+} action_type_t;
+
+typedef std::list<class ModelAction *> action_list_t;
+
+class ModelAction {
+public:
+	ModelAction(action_type_t type, memory_order order, void *loc, int value);
+	void print(void);
+
+	thread_id_t get_tid() { return tid; }
+	action_type get_type() { return type; }
+	memory_order get_mo() { return order; }
+	void * get_location() { return location; }
+
+	TreeNode * get_node() { return node; }
+	void set_node(TreeNode *n) { node = n; }
+private:
+	action_type type;
+	memory_order order;
+	void *location;
+	thread_id_t tid;
+	int value;
+	TreeNode *node;
 };
 
-extern struct model_checker *model;
+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 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);
+extern ModelChecker *model;
 
 #endif /* __MODEL_H__ */