X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=8d79eb56a43ef36fe02dfc5ec4b6463f719b0126;hp=64d052fcbf9b5cab928b3ebfbb62554aa7e42939;hb=ca8ff397344fe054228da40ca7009ba5756e7d1a;hpb=a9aac0d43e0e24354af4163cd3161036586f029a

diff --git a/model.h b/model.h
index 64d052fc..8d79eb56 100644
--- a/model.h
+++ b/model.h
@@ -1,112 +1,99 @@
+/** @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 "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);
+#include "action.h"
 
-	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;
-};
-
-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;
-};
+/* Forward declaration */
+class NodeStack;
 
+/** @brief The central structure for model-checking */
 class ModelChecker {
 public:
 	ModelChecker();
 	~ModelChecker();
-	class Scheduler *scheduler;
-	Thread *system_thread;
 
-	void add_system_thread(Thread *t);
+	/** The scheduler to use: tracks the running/ready Threads */
+	class Scheduler *scheduler;
 
+	/** Stores the context for the main model-checking system thread (call
+	 * once)
+	 * @param ctxt The system context structure
+	 */
+	void set_system_context(ucontext_t *ctxt) { system_context = ctxt; }
+
+	/** @returns the context for the main model-checking system thread */
+	ucontext_t * get_system_context(void) { return system_context; }
+
+	/**
+	 * Stores the ModelAction for the current thread action.  Call this
+	 * immediately before switching from user- to system-context to pass
+	 * data between them.
+	 * @param act The ModelAction created by the user-thread action
+	 */
 	void set_current_action(ModelAction *act) { current_action = act; }
 	void check_current_action(void);
-	void print_trace(void);
+	void print_summary(void);
 	Thread * schedule_next_thread();
 
 	int add_thread(Thread *t);
-	Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
+	void remove_thread(Thread *t);
+	Thread * get_thread(thread_id_t tid) { return (*thread_map)[id_to_int(tid)]; }
 
-	int get_next_id();
+	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();
+	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);
 
-	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<thread_id_t, 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;
 
-int thread_switch_to_master(ModelAction *act);
-
 #endif /* __MODEL_H__ */