bug fix

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index eb7bc7946cb7b6191d6dc2bbd660049332272be6..be6f406a4e3453b029247e8e23550deb9186cd99 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -5,38 +5,49 @@
 class ModelAction;
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
+typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
 
 class FuncNode {
 public:
        FuncNode();
        ~FuncNode();
 
-       FuncInst * get_or_add_action(ModelAction *act);
-
-       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInsts() { return &func_insts; }
-       func_inst_list_mt * get_inst_list() { return &inst_list; }
-
        uint32_t get_func_id() { return func_id; }
        const char * get_func_name() { return func_name; }
        void set_func_id(uint32_t id) { func_id = id; }
        void set_func_name(const char * name) { func_name = name; }
 
+       FuncInst * get_or_add_action(ModelAction *act);
+
+       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInstMap() { return &func_inst_map; }
+       func_inst_list_mt * get_inst_list() { return &inst_list; }
+       func_inst_list_mt * get_entry_insts() { return &entry_insts; }
+       void add_entry_inst(FuncInst * inst);
+       void link_insts(func_inst_list_t * inst_list);
+
+       void store_read(ModelAction * act, uint32_t tid);
+       uint64_t query_last_read(ModelAction * act, uint32_t tid);
+       void clear_read_map(uint32_t tid);
+
+       void print_last_read(uint32_t tid);
+
        MEMALLOC
 private:
        uint32_t func_id;
        const char * func_name;
 
-       /* Use source line number as the key of hashtable, to check if 
+       /* Use source line number as the key of hashtable, to check if
         * atomic operation with this line number has been added or not
-        *
-        * To do: cds_atomic_compare_exchange contains three atomic operations
-        * that are feeded with the same source line number by llvm pass
         */
-       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_insts;
+       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;
 
-       /* list of all atomic instructions in this function */
+       /* list of all atomic actions in this function */
        func_inst_list_mt inst_list;
 
-       /* possible entry (atomic) instructions in this function */
+       /* possible entry atomic actions in this function */
        func_inst_list_mt entry_insts;
+
+       /* Store the values read by atomic read actions per memory location for each thread */
+       ModelVector<read_map_t *> thrd_read_map;
+       ModelList<void *> read_locations;
 };