X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=b6099c69750b066d74d1d4a566834237edf3b097;hp=625d2726fe775921f981e5d666426eb85cb32148;hb=5e3720f6a6dccf2af670e4ab30660130f2a57c8f;hpb=d17f01373231c13da5ff530f9c633ba4277f9954

diff --git a/model.h b/model.h
index 625d272..b6099c6 100644
--- a/model.h
+++ b/model.h
@@ -1,18 +1,110 @@
+/** @file model.h
+ *  @brief Core model checker.
+ */
+
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-struct model_checker {
-	struct scheduler *scheduler;
-	struct thread *system_thread;
+#include <list>
+#include <vector>
+#include <cstddef>
+#include <ucontext.h>
 
-	/* "Private" fields */
-	int used_thread_id;
-};
+#include "schedule.h"
+#include "mymemory.h"
+#include "libthreads.h"
+#include "threads.h"
+#include "action.h"
+#include "clockvector.h"
+
+/* Forward declaration */
+class NodeStack;
+class CycleGraph;
+
+/** @brief The central structure for model-checking */
+class ModelChecker {
+public:
+	ModelChecker();
+	~ModelChecker();
+
+	/** The scheduler to use: tracks the running/ready Threads */
+	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; }
+
+	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->get(id_to_int(tid)); }
+
+	thread_id_t get_next_id();
+	int get_num_threads();
+	modelclock_t get_next_seq_num();
 
-extern struct model_checker *model;
+	int switch_to_master(ModelAction *act);
+	ClockVector * get_cv(thread_id_t tid);
+	bool next_execution();
+	bool isfeasible();
+
+	MEMALLOC
+private:
+	int next_thread_id;
+	modelclock_t used_sequence_numbers;
+	int num_executions;
+
+	/**
+	 * 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; }
+
+	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);
+	ModelAction * get_last_seq_cst(const void *location);
+	void build_reads_from_past(ModelAction *curr);
+	ModelAction * process_rmw(ModelAction * curr);
+	void r_modification_order(ModelAction * curr, const ModelAction *rf);
+	void w_modification_order(ModelAction * curr);
+
+
+	ModelAction *current_action;
+	ModelAction *diverge;
+	thread_id_t nextThread;
+
+	ucontext_t *system_context;
+	action_list_t *action_trace;
+	HashTable<int, Thread *, int> *thread_map;
+
+	/** Per-object list of actions. Maps an object (i.e., memory location)
+	 * to a trace of all actions performed on the object. */
+	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
+
+	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+	std::vector<ModelAction *> *thrd_last_action;
+	NodeStack *node_stack;
+	ModelAction *next_backtrack;
+	CycleGraph * cyclegraph;
+};
 
-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__ */