Merge branch 'master' into branch-weiyu

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index a6d0c96f03168438b123364ed4da30c814945d1f..2dbc556e7424c6ea8eb46499afac0ce68ae1bcd5 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -21,7 +21,7 @@ ModelHistory::ModelHistory() :
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
 {
        //model_print("thread %d entering func %d\n", tid, func_id);
-       uint32_t id = id_to_int(tid);
+       uint id = id_to_int(tid);
        SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
        SnapVector< SnapList<action_list_t *> *> *
                thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists();
@@ -30,20 +30,18 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
                uint oldsize = thrd_func_list->size();
                thrd_func_list->resize( id + 1 );
                for (uint i = oldsize; i < id + 1; i++) {
-                       new(&(*thrd_func_list)[i]) func_id_list_t();
+                       new (&(*thrd_func_list)[i]) func_id_list_t();
                        // push 0 as a dummy function id to a void seg fault
                        (*thrd_func_list)[i].push_back(0);
                }
 
                thrd_func_act_lists->resize( id + 1 );
+               for (uint i = oldsize; i < id + 1; i++) {
+                       (*thrd_func_act_lists)[i] = new SnapList<action_list_t *>();
+               }
        }
 
-       SnapList<action_list_t *> * func_act_lists = thrd_func_act_lists->at(id);
-
-       if (func_act_lists == NULL) {
-               func_act_lists = new SnapList<action_list_t *>();
-               thrd_func_act_lists->at(id) = func_act_lists;
-       }
+       SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
 
        (*thrd_func_list)[id].push_back(func_id);
        func_act_lists->push_back( new action_list_t() );
@@ -60,7 +58,7 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
        SnapVector< SnapList<action_list_t *> *> *
                thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists();
 
-       SnapList<action_list_t *> * func_act_lists = thrd_func_act_lists->at(id);
+       SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
        uint32_t last_func_id = (*thrd_func_list)[id].back();
 
        if (last_func_id == func_id) {
@@ -68,7 +66,23 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
                func_node->clear_read_map(tid);
 
                action_list_t * curr_act_list = func_act_lists->back();
-               func_node->update_inst_tree(curr_act_list);
+
+               func_node->incr_exit_count();
+
+               /* defer the processing of curr_act_list until the function has exits a few times 
+                * (currently 2 times) so that more information can be gathered to infer nullity predicates.
+                */
+               if (func_node->get_exit_count() >= 2) {
+                       ModelList<action_list_t *> * action_list_buffer = func_node->get_action_list_buffer();
+                       while (action_list_buffer->size() > 0) {
+                               action_list_t * act_list = action_list_buffer->back();
+                               action_list_buffer->pop_back();
+                               func_node->update_tree(act_list);
+                       }
+
+                       func_node->update_tree(curr_act_list);
+               } else
+                       func_node->get_action_list_buffer()->push_front(curr_act_list);
 
                (*thrd_func_list)[id].pop_back();
                func_act_lists->pop_back();
@@ -88,7 +102,7 @@ void ModelHistory::resize_func_nodes(uint32_t new_size)
 
        for (uint32_t id = old_size;id < new_size;id++) {
                const char * func_name = func_map_rev[id];
-               FuncNode * func_node = new FuncNode();
+               FuncNode * func_node = new FuncNode(this);
                func_node->set_func_id(id);
                func_node->set_func_name(func_name);
                func_nodes[id] = func_node;
@@ -109,7 +123,10 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
 
        /* get the function id that thread i is currently in */
        uint32_t func_id = (*thrd_func_list)[id].back();
-       SnapList<action_list_t *> * func_act_lists = thrd_func_act_lists->at(id);
+       SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+
+       if (act->is_write())
+               add_to_write_history(act->get_location(), act->get_write_value());
 
        if (func_id == 0)
                return;
@@ -117,28 +134,39 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
                resize_func_nodes( func_id + 1 );
 
        FuncNode * func_node = func_nodes[func_id];
-       ASSERT (func_node != NULL);
 
-       /* do not care actions without a position */
+       /* do not care about actions without a position */
+
        if (act->get_position() == NULL)
                return;
 
        if (act->is_read())
                func_node->store_read(act, tid);
 
-       if (act->is_write())
-               add_to_write_history(act->get_location(), act->get_write_value());
-
        /* add to curr_inst_list */
-       action_list_t * curr_act_list = func_act_lists->back();
-       ASSERT(curr_act_list != NULL);
-       curr_act_list->push_back(act);
+
+       bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
+       if (!second_part_of_rmw) {
+               action_list_t * curr_act_list = func_act_lists->back();
+               ASSERT(curr_act_list != NULL);
+
+               ModelAction * last_act;
+               if (curr_act_list->size() != 0)
+                       last_act = curr_act_list->back();
+
+               // do not add actions with the same sequence number twice
+               if (last_act != NULL && last_act->get_seq_number() == act->get_seq_number())
+                       return;
+
+               curr_act_list->push_back(act);
+               func_node->add_inst(act);
+       }
 }
 
 /* return the FuncNode given its func_id  */
 FuncNode * ModelHistory::get_func_node(uint32_t func_id)
 {
-       if (func_nodes.size() <= func_id)       // this node has not been added
+       if (func_nodes.size() <= func_id)       // this node has not been added to func_nodes
                return NULL;
 
        return func_nodes[func_id];
@@ -174,6 +202,14 @@ void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
        write_locations.add(location);
 }
 
+void ModelHistory::set_new_exec_flag()
+{
+       for (uint i = 1; i < func_nodes.size(); i++) {
+               FuncNode * func_node = func_nodes[i];
+               func_node->set_new_exec_flag();
+       }
+}
+
 void ModelHistory::print_write()
 {
 }