X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=history.h;h=431f978ea3f54e1053e682aadece744b9ed0ca44;hb=d49c09078cfbb85f565cc59b83ec727bc08b72bf;hp=03a8985292aa65cd97a56dc00fa3213fa86ae762;hpb=25f190b7c3700b5bafe37ea57617ca0af91534d6;p=c11tester.git

diff --git a/history.h b/history.h
index 03a89852..431f978e 100644
--- a/history.h
+++ b/history.h
@@ -1,25 +1,12 @@
-#include "stl-model.h"
+#ifndef __HISTORY_H__
+#define __HISTORY_H__
+
 #include "common.h"
+#include "classlist.h"
 #include "hashtable.h"
 #include "threads-model.h"
 
-/* forward declaration */
-class ModelAction;
-
-typedef ModelList<const ModelAction *> action_mlist_t;
-typedef SnapList<uint32_t> func_id_list_t;
-
-class HistoryNode {
-public: 
-	HistoryNode(ModelAction *act);
-	~HistoryNode();
-
-	ModelAction * get_action() const { return action; }
-	const char * get_position() const { return position; }
-private:
-	ModelAction * const action;
-	const char * position;
-};
+#define INIT_SEQ_NUMBER 0xffffffff
 
 class ModelHistory {
 public:
@@ -29,26 +16,80 @@ public:
 	void enter_function(const uint32_t func_id, thread_id_t tid);
 	void exit_function(const uint32_t func_id, thread_id_t tid);
 
-        uint32_t get_func_counter() { return func_counter; }
-        void incr_func_counter() { func_counter++; }
+	uint32_t get_func_counter() { return func_counter; }
+	void incr_func_counter() { func_counter++; }
+
+	void resize_func_nodes(uint32_t max_func_id);
+	void process_action(ModelAction *act, thread_id_t tid);
+
+	HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
+	ModelVector<const char *> * getFuncMapRev() { return &func_map_rev; }
+
+	ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
+	FuncNode * get_func_node(uint32_t func_id);
+	FuncNode * get_curr_func_node(thread_id_t tid);
+
+	void update_write_history(void * location, uint64_t write_val);
+	HashTable<void *, value_set_t *, uintptr_t, 0> * getWriteHistory() { return write_history; }
+	void update_loc_rd_func_nodes_map(void * location, FuncNode * node);
+	void update_loc_wr_func_nodes_map(void * location, FuncNode * node);
+	SnapVector<FuncNode *> * getRdFuncNodes(void * location);
+	SnapVector<FuncNode *> * getWrFuncNodes(void * location);
 
-	void add_func_atomic(ModelAction *act, thread_id_t tid);
+	void add_waiting_write(ConcretePredicate * concrete);
+	void remove_waiting_write(thread_id_t tid);
+	void check_waiting_write(ModelAction * write_act);
+	SnapVector<ConcretePredicate *> * getThrdWaitingWrite() { return thrd_waiting_write; }
 
-        HashTable<const char *, uint32_t, uintptr_t, 4> * getFuncMap() { return &func_map; }
-	ModelVector< action_mlist_t * > * getFuncAtomics() { return &func_atomics; }
+	WaitObj * getWaitObj(thread_id_t tid);
+	void add_waiting_thread(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node, int dist);
+	void remove_waiting_thread(thread_id_t tid);
+	void stop_waiting_for_node(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node);
 
-	void print();
+	void set_new_exec_flag();
+	void dump_func_node_graph();
+	void print_func_node();
+	void print_waiting_threads();
+
+	MEMALLOC
 private:
 	uint32_t func_counter;
+	modelclock_t last_seq_number;
+
+	/* Map function names to integer ids */
+	HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
+
+	/* Map integer ids to function names */
+	ModelVector<const char *> func_map_rev;
+
+	ModelVector<FuncNode *> func_nodes;
+
+	/* Map a location to a set of values that have been written to it */
+	HashTable<void *, value_set_t *, uintptr_t, 0> * write_history;
 
-        /* map function names to integer ids */ 
-        HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
+	/* Map a location to FuncNodes that may read from it */
+	HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_rd_func_nodes_map;
 
-	ModelVector< action_mlist_t * > func_atomics;
+	/* Map a location to FuncNodes that may write to it */
+	HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
 
-	/* Work_list stores a list of function ids for each thread. 
-	 * Each element in work_list is intended to be used as a stack storing
-	 * the functions that thread i has entered and yet to exit from 
+	HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0> * loc_waiting_writes_map;
+
+	/* thrd_func_list stores a list of function ids for each thread.
+	 * Each element in thrd_func_list stores the functions that
+	 * thread i has entered and yet to exit from
 	 */
-	SnapVector< func_id_list_t * > work_list;
+	SnapVector<func_id_list_t> * thrd_func_list;
+	SnapVector<uint32_t> * thrd_last_entered_func;
+
+	/* The write values each paused thread is waiting for */
+	SnapVector<ConcretePredicate *> * thrd_waiting_write;
+	SnapVector<WaitObj *> * thrd_wait_obj;
+
+	bool skip_action(ModelAction * act);
+	void monitor_waiting_thread(uint32_t func_id, thread_id_t tid);
+	void monitor_waiting_thread_counter(thread_id_t tid);
+
 };
+
+#endif	/* __HISTORY_H__ */