X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=e6dc06ddd97c2aef7d7c7dd17ae71854162ffb5e;hp=ab961f840b03613492a4da2b8585453bbe6b2847;hb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a

diff --git a/model.h b/model.h
index ab961f84..e6dc06dd 100644
--- a/model.h
+++ b/model.h
@@ -1,26 +1,27 @@
 /** @file model.h
- *  @brief Core model checker. 
+ *  @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;
 
 /** @brief The central structure for model-checking */
 class ModelChecker {
@@ -29,7 +30,7 @@ public:
 	~ModelChecker();
 
 	/** The scheduler to use: tracks the running/ready Threads */
-	class Scheduler *scheduler;
+	Scheduler *scheduler;
 
 	/** Stores the context for the main model-checking system thread (call
 	 * once)
@@ -40,35 +41,38 @@ public:
 	/** @returns the context for the main model-checking system thread */
 	ucontext_t * get_system_context(void) { return system_context; }
 
-	/**
-	 * 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; }
 	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)[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);
-
+	ClockVector * get_cv(thread_id_t tid);
 	bool next_execution();
+	bool isfeasible();
+	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
 	MEMALLOC
 private:
 	int next_thread_id;
-	int used_sequence_numbers;
+	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();
@@ -78,21 +82,31 @@ private:
 	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 print_list(action_list_t *list);
-
+	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, 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;