move write_history to funcnode.cc was a mistake

diff --git a/funcnode.cc b/funcnode.cc
index 2da1f66d200df993f16989e1f258a03cfd502286..abc94a5d1d9749f804c6baf3f21d79e1e50453dd 100644 (file)
--- a/funcnode.cc
+++ b/funcnode.cc
@@ -5,9 +5,7 @@ FuncNode::FuncNode() :
        func_inst_map(),
        inst_list(),
        entry_insts(),
-       thrd_read_map(),
-       write_history(),
-       write_locations()
+       thrd_read_map()
 {}
 
 /* Check whether FuncInst with the same type, position, and location
@@ -156,19 +154,6 @@ void FuncNode::clear_read_map(uint32_t tid)
        thrd_read_map[tid]->reset();
 }
 
-void FuncNode::add_to_write_history(void * location, uint64_t write_val)
-{
-       write_set_t * write_set = write_history.get(location);
-
-       if (write_set == NULL) {
-               write_set = new write_set_t();
-               write_history.put(location, write_set);
-       }
-
-       write_set->add(write_val);
-       write_locations.add(location);
-}
-
 void FuncNode::generate_predicate(FuncInst *func_inst)
 {
        
@@ -192,32 +177,3 @@ void FuncNode::print_last_read(uint32_t tid)
        }
 */
 }
-
-void FuncNode::print_write()
-{
-       HSIterator<void *, uintptr_t, 4, model_malloc, model_calloc, model_free> * iter;
-       HSIterator<uint64_t, uint64_t, 0, model_malloc, model_calloc, model_free> * write_iter;
-       iter = write_locations.iterator();
-
-       if (write_locations.getSize() > 10) {
-               while (iter->hasNext()) {
-                       void * location = iter->next();
-                       write_set_t * write_set = write_history.get(location);
-
-//                     model_print("location: %p contains %d writes\n", location, write_set->getSize());
-                       if (write_set->getSize() > 5) {
-                               model_print("location %p has writes: ", location);
-                               write_iter = write_set->iterator();
-
-                               while (write_iter->hasNext()) {
-                                       uint64_t val = write_iter->next();
-                                       model_print("%lx ", val);
-                               }
-                               model_print("\n");
-                       }
-               }
-       } else {
-               model_print("\n");
-       }
-       delete iter;
-}

diff --git a/funcnode.h b/funcnode.h
index b8562d3ed368852f2f289661ced175f84e5a39a9..d2bc3cf2f7ae079597a5e380f7746d01015a4db1 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -8,7 +8,6 @@
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
 typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
-typedef HashSet<uint64_t, uint64_t, 0, model_malloc, model_calloc, model_free> write_set_t;
 
 class FuncNode {
 public:
@@ -32,13 +31,10 @@ public:
        uint64_t query_last_read(void * location, uint32_t tid);
        void clear_read_map(uint32_t tid);
 
-       void add_to_write_history(void * location, uint64_t write_val);
-
        /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
        void generate_predicate(FuncInst * func_inst);
 
        void print_last_read(uint32_t tid);
-       void print_write();
 
        MEMALLOC
 private:
@@ -59,8 +55,6 @@ private:
        /* Store the values read by atomic read actions per memory location for each thread */
        ModelVector<read_map_t *> thrd_read_map;
 
-       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
-       HashSet<void *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_locations;
 };
 
 #endif /* __FUNCNODE_H__ */

diff --git a/history.cc b/history.cc
index 3d6599b4bc00703ae5b12dc4cbb60b65cd8d7e39..820f3df38b48fe3960bcb60839da17f2ca1505a5 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -13,7 +13,9 @@ ModelHistory::ModelHistory() :
        func_counter(1),        /* function id starts with 1 */
        func_map(),
        func_map_rev(),
-       func_nodes()
+       func_nodes(),
+       write_history(),
+       write_locations()
 {}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
@@ -153,13 +155,21 @@ uint64_t ModelHistory::query_last_read(void * location, thread_id_t tid)
        return last_read_val;
 }
 
-void ModelHistory::print_write()
+void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
 {
-       for (uint32_t i = 1; i < func_nodes.size(); i++) {
-               FuncNode * func_node = func_nodes[i];
-               model_print("function id: %d, name: %s --- ", i, func_node->get_func_name());
-               func_node->print_write();
+       write_set_t * write_set = write_history.get(location);
+
+       if (write_set == NULL) {
+               write_set = new write_set_t();
+               write_history.put(location, write_set);
        }
+
+       write_set->add(write_val);
+       write_locations.add(location);
+}
+
+void ModelHistory::print_write()
+{
 }
 
 void ModelHistory::print_func_node()

diff --git a/history.h b/history.h
index 0179d10bf260df94ff6bc63df30e911c767f797d..f562c0f1ea30a0d04e8682f19de5fd5d4b485426 100644 (file)
--- a/history.h
+++ b/history.h
@@ -45,6 +45,9 @@ private:
        ModelVector<const char *> func_map_rev;
 
        ModelVector<FuncNode *> func_nodes;
+
+       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
+       HashSet<void *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_locations;
 };
 
 #endif /* __HISTORY_H__ */