X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=fcdc69fd9cf510fc1681e05c4b0edc346a4b0e31;hb=ad9f8597027acf647e4fc3a0b22ac3312d291878;hp=a4751099cfdf6f7eda943e3b832e705acaaa68d8;hpb=b5518c866ccd232fa79a2911ce5c6bcaa2110076;p=c11tester.git

diff --git a/model.h b/model.h
index a4751099..fcdc69fd 100644
--- a/model.h
+++ b/model.h
@@ -6,7 +6,6 @@
 #define __MODEL_H__
 
 #include <list>
-#include <map>
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
@@ -14,56 +13,68 @@
 #include "schedule.h"
 #include "mymemory.h"
 #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();
 
-	/** 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; }
+	ucontext_t * get_system_context() { return &system_context; }
+
+	/** Prints an execution summary with trace information. */
+	void print_summary();
 
-	void check_current_action(void);
-	void print_summary(void);
 	Thread * schedule_next_thread();
 
-	int add_thread(Thread *t);
+	void 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();
 	modelclock_t get_next_seq_num();
 
+	/** @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;
 	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
@@ -71,40 +82,64 @@ private:
 	 * @param act The ModelAction created by the user-thread action
 	 */
 	void set_current_action(ModelAction *act) { current_action = act; }
+	void check_current_action();
+
+	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);
 	ModelAction * get_parent_action(thread_id_t tid);
 	ModelAction * get_last_seq_cst(const void *location);
 	void build_reads_from_past(ModelAction *curr);
-	void process_rmw(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;
 	thread_id_t nextThread;
 
-	ucontext_t *system_context;
+	ucontext_t system_context;
 	action_list_t *action_trace;
-	std::map<int, Thread *> *thread_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. */
-	std::map<const void *, action_list_t> *obj_map;
+	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
 
-	std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
+	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+	std::vector<Promise *> * promises;
 	std::vector<ModelAction *> *thrd_last_action;
 	NodeStack *node_stack;
 	ModelAction *next_backtrack;
-	CycleGraph * cyclegraph;
+
+	/**
+	 * @brief The modification order graph
+	 *
+	 * A direceted acyclic graph recording observations of the modification
+	 * order on all the atomic objects in the system. This graph should
+	 * never contain any cycles, as that represents a violation of the
+	 * memory model (total ordering). This graph really consists of many
+	 * disjoint (unconnected) subgraphs, each graph corresponding to a
+	 * separate ordering on a distinct object.
+	 *
+	 * Note that the edges in this graph actually represent the "ordered
+	 * after" relation, such that <tt>a --> b</tt> means <tt>a</tt> was
+	 * ordered after <tt>b</tt>, or in the traditional sense of
+	 * modification order, <tt>b --mo--> a</tt>.
+	 */
+	CycleGraph *mo_graph;
+
+	bool failed_promise;
 };
 
 extern ModelChecker *model;