X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.h;h=f06c2e44e46cb189c34d06f870063a75a0dcd772;hp=ee07ba4f17ef443e3a2594d69054edefcc8213c4;hb=ecd9104af35b2a0298042b13145767ef7382ac18;hpb=a4e6e66dfdeb8a5e792433c0cb90c01e6c0a3f92 diff --git a/history.h b/history.h index ee07ba4f..f06c2e44 100644 --- a/history.h +++ b/history.h @@ -1,10 +1,9 @@ #ifndef __HISTORY_H__ #define __HISTORY_H__ -#include "stl-model.h" #include "common.h" +#include "classlist.h" #include "hashtable.h" -#include "hashset.h" #include "threads-model.h" class ModelHistory { @@ -26,14 +25,31 @@ public: ModelVector * getFuncNodes() { return &func_nodes; } FuncNode * get_func_node(uint32_t func_id); + FuncNode * get_curr_func_node(thread_id_t tid); - void add_to_write_history(void * location, uint64_t write_val); - HashTable * getWriteHistory() { return &write_history; } - void add_to_loc_func_nodes_map(void * location, FuncNode * node); + void update_write_history(void * location, uint64_t write_val); + HashTable * 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 * getRdFuncNodes(void * location); + SnapVector * getWrFuncNodes(void * location); + + void add_waiting_write(ConcretePredicate * concrete); + void remove_waiting_write(thread_id_t tid); + void check_waiting_write(ModelAction * write_act); + SnapVector * getThrdWaitingWrite() { return thrd_waiting_write; } + + 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); + + SnapVector * getThrdInstActMap(uint32_t func_id); void set_new_exec_flag(); void dump_func_node_graph(); void print_func_node(); + void print_waiting_threads(); MEMALLOC private: @@ -47,13 +63,42 @@ private: ModelVector func_nodes; - HashTable write_history; + /* Map a location to a set of values that have been written to it */ + HashTable * write_history; /* Map a location to FuncNodes that may read from it */ - HashTable *, uintptr_t, 4> loc_func_nodes_map; + HashTable *, uintptr_t, 0> * loc_rd_func_nodes_map; + + /* Map a location to FuncNodes that may write to it */ + HashTable *, uintptr_t, 0> * loc_wr_func_nodes_map; + + HashTable *, uintptr_t, 0> * loc_waiting_writes_map; + + /* Keeps track of atomic actions that thread i has performed in some + * function. Index of SnapVector is thread id. SnapList simulates + * the call stack. + */ + SnapVector< SnapList *> * thrd_func_act_lists; + + /* 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 * thrd_func_list; + SnapVector * thrd_last_entered_func; + + /* The write values each paused thread is waiting for */ + SnapVector * thrd_waiting_write; + SnapVector * thrd_wait_obj; + + /* A run-time map from FuncInst to ModelAction per thread, per FuncNode. + * Manipulated by FuncNode, and needed by NewFuzzer */ + HashTable *, int, 0> * func_inst_act_maps; + + bool skip_action(ModelAction * act, SnapList * curr_act_list); + void monitor_waiting_thread(uint32_t func_id, thread_id_t tid); + void monitor_waiting_thread_counter(thread_id_t tid); - SnapVector thrd_last_entered_func; - void add_edges_between(FuncNode * prev_node, FuncNode * next_node); }; #endif /* __HISTORY_H__ */