Add datarace support for atomics and calloc

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 7e7635cae3af792249b9561c0157eb168385bb2d..ea591a2e05ba5426c0e553b11cacfa609c0df078 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -2,12 +2,13 @@
 #define __FUNCNODE_H__
 
 #include "hashset.h"
+#include "hashfunction.h"
 #include "classlist.h"
 #include "threads-model.h"
 
 #define MAX_DIST 10
-typedef ModelList<FuncInst *> func_inst_list_mt;
 
+typedef ModelList<FuncInst *> func_inst_list_mt;
 typedef enum edge_type {
        IN_EDGE, OUT_EDGE, BI_EDGE
 } edge_type_t;
@@ -24,6 +25,7 @@ public:
        void set_new_exec_flag();
 
        void add_inst(ModelAction *act);
+       FuncInst * create_new_inst(ModelAction *act);
        FuncInst * get_inst(ModelAction *act);
 
        HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInstMap() { return &func_inst_map; }
@@ -67,7 +69,9 @@ private:
        uint32_t func_id;
        const char * func_name;
        ModelHistory * history;
-       Predicate * predicate_tree_entry;       // a dummy node whose children are the real entries
+       Predicate * predicate_tree_entry;       // A dummy node whose children are the real entries
+       Predicate * predicate_tree_exit;        // A dummy node
+
 
        uint32_t exit_count;
        uint32_t marker;
@@ -99,7 +103,7 @@ private:
        loc_set_t * write_locations;
 
        /* Keeps track of locations that have the same values written to */
-       HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
+       HashTable<uint64_t, loc_set_t *, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free, int64_hash> * val_loc_map;
 
        /* Keeps track of locations that may share the same value as key, deduced from val_loc_map */
        HashTable<void *, loc_set_t *, uintptr_t, 0> * loc_may_equal_map;