When an atomic read action cannot read from a desired write, make this thread sleep...

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index 5f5e731840a647e73e70490b72b314d83d865fe7..0a51e6404826bda5407cbf41be96b8635051f5df 100644 (file)
--- a/history.h
+++ b/history.h
@@ -7,7 +7,6 @@
 #include "hashset.h"
 #include "threads-model.h"
 
-
 class ModelHistory {
 public:
        ModelHistory();
@@ -27,11 +26,12 @@ public:
 
        ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
        FuncNode * get_func_node(uint32_t func_id);
-       uint64_t query_last_read(void * location, thread_id_t tid);
 
        void add_to_write_history(void * location, uint64_t write_val);
-       HashTable<void *, write_set_t *, uintptr_t, 4> * getWriteHistory() { return &write_history; }
+       HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return &write_history; }
+       void add_to_loc_func_nodes_map(void * location, FuncNode * node);
 
+       void set_new_exec_flag();
        void print_write();
        void print_func_node();
 
@@ -39,15 +39,18 @@ public:
 private:
        uint32_t func_counter;
 
-       /* map function names to integer ids */
+       /* 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 */
+
+       /* Map integer ids to function names */
        ModelVector<const char *> func_map_rev;
 
        ModelVector<FuncNode *> func_nodes;
 
-       HashTable<void *, write_set_t *, uintptr_t, 4> write_history;
-       HashSet<void *, uintptr_t, 4> write_locations;
+       HashTable<void *, value_set_t *, uintptr_t, 4> write_history;
+
+       /* Map a location to FuncNodes that may read from it */
+       HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 4> loc_func_nodes_map;
 };
 
 #endif /* __HISTORY_H__ */