X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=dc6ef6add21045042ed42a29882e3ad9a38ac34e;hb=6c42e6f6e00d6283bce4e9086b111b4b78509ded;hp=5d74b8443543557b022b4fca51cf6cd64296c2e6;hpb=471e92c4bc5de8629d044a61eea5e1ff0670daad;p=c11tester.git

diff --git a/model.h b/model.h
index 5d74b844..dc6ef6ad 100644
--- a/model.h
+++ b/model.h
@@ -6,27 +6,34 @@
 #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();
 
 	/** The scheduler to use: tracks the running/ready Threads */
@@ -42,12 +49,15 @@ public:
 	ucontext_t * get_system_context(void) { return system_context; }
 
 	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();
@@ -56,6 +66,9 @@ public:
 	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);
 
 	MEMALLOC
 private:
@@ -63,6 +76,8 @@ private:
 	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
@@ -76,11 +91,18 @@ private:
 	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);
+	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;
@@ -88,16 +110,19 @@ private:
 
 	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;
+	bool failed_promise;
 };
 
 extern ModelChecker *model;