- HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
- HashSet<void *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_locations;
+ /* 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 a location to FuncNodes that may read from it */
+ HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_rd_func_nodes_map;
+
+ /* Map a location to FuncNodes that may write to it */
+ HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
+
+ 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> * 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);
+