change the data structure for storing last read values. The old one 'loc_thrd_read_ma...

diff --git a/funcnode.cc b/funcnode.cc
index d45c8a8fe1136027a97027fcb029fe3f420c66ff..843e1c94a2d6616af8cd446df74dfee318d20a2e 100644 (file)
--- a/funcnode.cc
+++ b/funcnode.cc
@@ -3,7 +3,8 @@
 FuncNode::FuncNode() :
        func_inst_map(),
        inst_list(),
-       entry_insts()
+       entry_insts(),
+       read_locations()
 {}
 
 /* Check whether FuncInst with the same type, position, and location 
@@ -68,7 +69,8 @@ void FuncNode::add_entry_inst(FuncInst * inst)
        entry_insts.push_back(inst);
 }
 
-/* Store the values read by atomic read actions into loc_thrd_read_map */
+/* @param tid thread id
+ * Store the values read by atomic read actions into thrd_read_map */
 void FuncNode::store_read(ModelAction * act, uint32_t tid)
 {
        ASSERT(act);
@@ -76,18 +78,18 @@ void FuncNode::store_read(ModelAction * act, uint32_t tid)
        void * location = act->get_location();
        uint64_t read_from_val = act->get_reads_from_value();
 
-       ModelVector<uint64_t> * read_vals = loc_thrd_read_map.get(location);
-       if (read_vals == NULL) {
-               read_vals = new ModelVector<uint64_t>();
-               loc_thrd_read_map.put(location, read_vals);
-       }
+       if (thrd_read_map.size() <= tid)
+               thrd_read_map.resize(tid + 1);
 
-       if (read_vals->size() <= tid) {
-               read_vals->resize(tid + 1);
+       read_map_t * read_map = thrd_read_map[tid];
+       if (read_map == NULL) {
+               read_map = new read_map_t();
+               thrd_read_map[tid] = read_map;
        }
-       read_vals->at(tid) = read_from_val;
 
-       /* Store keys of loc_thrd_read_map into read_locations */
+       read_map->put(location, read_from_val);
+
+       /* Store the memory locations where atomic reads happen */
        bool push_loc = true;
        ModelList<void *>::iterator it;
        for (it = read_locations.begin(); it != read_locations.end(); it++) {
@@ -101,18 +103,46 @@ void FuncNode::store_read(ModelAction * act, uint32_t tid)
                read_locations.push_back(location);
 }
 
+uint64_t FuncNode::query_last_read(ModelAction * act, uint32_t tid)
+{
+       if (thrd_read_map.size() <= tid)
+               return 0xdeadbeef;
+
+       read_map_t * read_map = thrd_read_map[tid];
+       void * location = act->get_location();
+
+       /* last read value not found */
+       if ( !read_map->contains(location) )
+               return 0xdeadbeef;
+
+       uint64_t read_val = read_map->get(location);
+       return read_val;
+}
+
+/* @param tid thread id
+ * Reset read map for a thread. This function shall only be called
+ * when a thread exits a function
+ */
+void FuncNode::clear_read_map(uint32_t tid)
+{
+       ASSERT(thrd_read_map.size() > tid);
+       thrd_read_map[tid]->reset();
+}
+
 /* @param tid thread id
  * Print the values read by the last read actions per memory location
  */
 void FuncNode::print_last_read(uint32_t tid)
 {
+       ASSERT(thrd_read_map.size() > tid);
+       read_map_t * read_map = thrd_read_map[tid];
+
        ModelList<void *>::iterator it;
        for (it = read_locations.begin(); it != read_locations.end(); it++) {
-               ModelVector<uint64_t> * read_vals = loc_thrd_read_map.get(*it);
-               if (read_vals->size() <= tid)
+               if ( !read_map->contains(*it) )
                        break;
 
-               int64_t read_val = read_vals->at(tid);
+               uint64_t read_val = read_map->get(*it);
                model_print("last read of thread %d at %p: 0x%x\n", tid, *it, read_val);
        }
 }

diff --git a/funcnode.h b/funcnode.h
index 2a7061d6b810a4708fd4779f526f1bb37da64487..a87c0306db9284b9f746cfe27a72073baac659fb 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -5,6 +5,7 @@
 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:
@@ -24,6 +25,9 @@ public:
        void add_entry_inst(FuncInst * inst);
 
        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
@@ -33,9 +37,6 @@ private:
 
        /* 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_inst_map;
 
@@ -45,7 +46,7 @@ private:
        /* possible entry atomic actions in this function */
        func_inst_list_mt entry_insts;
 
-       /* Store the values read by atomic read actions per thread for each memory location */
-       HashTable<void *, ModelVector<uint64_t> *, uintptr_t, 4, model_malloc, model_calloc, model_free> loc_thrd_read_map;
+       /* 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;
 };