X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=86e0b1e7b05a8174a05d8a3f28dc7132432962d5;hb=0cb167b8fb332e4d9726badd0aa58e943bb4b459;hp=b59e29cea19b660935824eca736178183910c735;hpb=551ed6f7408e5376b3ea355997e378a1f2387e69;p=model-checker.git

diff --git a/model.h b/model.h
index b59e29c..86e0b1e 100644
--- a/model.h
+++ b/model.h
@@ -1,65 +1,115 @@
+/** @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 "action.h"
+#include "clockvector.h"
+#include "hashtable.h"
 
 /* Forward declaration */
 class NodeStack;
+class CycleGraph;
+class Promise;
+
+/**
+ * Model checker parameter structure. Holds run-time configuration options for
+ * the model checker.
+ */
+struct model_params {
+};
 
+/** @brief The central structure for model-checking */
 class ModelChecker {
 public:
-	ModelChecker();
+	ModelChecker(struct model_params params);
 	~ModelChecker();
-	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; }
 
-	void set_current_action(ModelAction *act) { current_action = act; }
 	void check_current_action(void);
-	void print_summary(void);
+
+	/** Prints an execution summary with trace information. */
+	void print_summary();
+
 	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 * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
 
 	thread_id_t get_next_id();
 	int get_num_threads();
-	int get_next_seq_num();
+	modelclock_t get_next_seq_num();
 
-	int switch_to_master(ModelAction *act);
+	/** @return The currently executing Thread. */
+	Thread * get_current_thread() { return scheduler->get_current_thread(); }
 
+	int switch_to_master(ModelAction *act);
+	ClockVector * get_cv(thread_id_t tid);
 	bool next_execution();
+	bool isfeasible();
+	bool isfinalfeasible();
+	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
+
+	void finish_execution();
 
 	MEMALLOC
 private:
+	/** The scheduler to use: tracks the running/ready Threads */
+	Scheduler *scheduler;
+
 	int next_thread_id;
-	int used_sequence_numbers;
+	modelclock_t used_sequence_numbers;
 	int num_executions;
 
+	const model_params params;
+
+	/**
+	 * 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; }
+
+	bool take_step();
+
 	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 resolve_promises(ModelAction *curr);
+	void compute_promises(ModelAction *curr);
 
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid);
-
-	void print_list(action_list_t *list);
+	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 post_r_modification_order(ModelAction * curr, const ModelAction *rf);
+	void r_modification_order(ModelAction * curr, const ModelAction *rf);
+	void w_modification_order(ModelAction * curr);
 
 	ModelAction *current_action;
 	ModelAction *diverge;
@@ -67,11 +117,19 @@ private:
 
 	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;
+	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<Promise *> * promises;
 	std::vector<ModelAction *> *thrd_last_action;
-	class NodeStack *node_stack;
+	NodeStack *node_stack;
 	ModelAction *next_backtrack;
+	CycleGraph * cyclegraph;
+	bool failed_promise;
 };
 
 extern ModelChecker *model;