X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=574ed21a041f934c411992b9aa73f94d624b06a6;hp=2093bf4b19cb31579d2b5e1040bcdb3ce55eb63c;hb=bbf356ecc0554af1ecff878e305055ac1673d75e;hpb=c0ba8bc46e9c15214d0fce2d3f8f984b11636683

diff --git a/model.h b/model.h
index 2093bf4b..574ed21a 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,13 +13,15 @@
 #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;
 
 /** @brief The central structure for model-checking */
 class ModelChecker {
@@ -46,7 +47,7 @@ public:
 
 	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();
@@ -55,6 +56,8 @@ public:
 	int switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid);
 	bool next_execution();
+	bool isfeasible();
+	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
 	MEMALLOC
 private:
@@ -75,29 +78,37 @@ 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 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;
-	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;