fix mutex_trylock bug

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index 2cf93f8a6480cc22b339a9fffbfb5b12019cd625..431f978ea3f54e1053e682aadece744b9ed0ca44 100644 (file)
--- a/history.h
+++ b/history.h
@@ -6,6 +6,8 @@
 #include "hashtable.h"
 #include "threads-model.h"
 
+#define INIT_SEQ_NUMBER 0xffffffff
+
 class ModelHistory {
 public:
        ModelHistory();
@@ -28,7 +30,7 @@ public:
        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, 4> * getWriteHistory() { return write_history; }
+       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);
@@ -38,10 +40,11 @@ public:
        void remove_waiting_write(thread_id_t tid);
        void check_waiting_write(ModelAction * write_act);
        SnapVector<ConcretePredicate *> * getThrdWaitingWrite() { return thrd_waiting_write; }
-       thrd_id_set_t * getWaitingFor(thread_id_t tid);
-       WaitObj * getWaitObj(thread_id_t tid);
 
-       SnapVector<inst_act_map_t *> * getThrdInstActMap(uint32_t func_id);
+       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 set_new_exec_flag();
        void dump_func_node_graph();
@@ -51,6 +54,7 @@ public:
        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;
@@ -61,7 +65,7 @@ private:
        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, 4> * write_history;
+       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;
@@ -70,15 +74,22 @@ private:
        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;
 
-       /* A run-time map from FuncInst to ModelAction per each thread, per each FuncNode.
-        * Manipulated by FuncNode, and needed by NewFuzzer */
-       HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0> * func_inst_act_maps;
+       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);
 
-       bool skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list);
 };
 
 #endif /* __HISTORY_H__ */