move modelhistory code back

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 283c248f90cf0238e4d728e7c305c2ad2235aed4..0a25caf530828ad7955cadfcc574d4443ee0a675 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) {
@@ -110,7 +108,7 @@ 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 (func_id == 0)
                return;
@@ -118,9 +116,8 @@ 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;
 
@@ -133,13 +130,22 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
        /* add to curr_inst_list */
        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);
 }
 
 /* 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];