move work_list (thrd_func_list) from history.h to execution.h, and fix the memory...

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index ec90a5a4826a06d42a7cb3cff1599ec621a99c25..2ae49a1650b526697b239085f8421a862f3cfb90 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -3,24 +3,28 @@
 #include "action.h"
 #include "funcnode.h"
 
+#include "model.h"
+#include "execution.h"
+
 /** @brief Constructor */
 ModelHistory::ModelHistory() :
        func_counter(0), /* function id starts with 0 */
        func_map(),
-       func_atomics(),
-       work_list(2)    /* we have at least two threads */
+       func_atomics()
 {}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
 {
        uint32_t id = id_to_int(tid);
-       if ( work_list.size() <= id )
-               work_list.resize( id + 1 );
+       SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
+       if ( thrd_func_list->size() <= id )
+               thrd_func_list->resize( id + 1 );
 
-       func_id_list_t * func_list = work_list[id];
+       func_id_list_t * func_list = thrd_func_list->at(id);
        if (func_list == NULL) {
                func_list = new func_id_list_t();
-               work_list[id] = func_list;
+               thrd_func_list->at(id) = func_list;
        }
 
        func_list->push_back(func_id);
@@ -28,7 +32,9 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
 
 void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 {
-       func_id_list_t * func_list = work_list[ id_to_int(tid) ];
+       SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
+       func_id_list_t * func_list = thrd_func_list->at( id_to_int(tid) );
        uint32_t last_func_id = func_list->back();
 
        if (last_func_id == func_id) {
@@ -39,17 +45,20 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
        }
 }
 
-void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) {
+void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid)
+{
        /* return if thread i has not entered any function or has exited
           from all functions */
+       SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
        uint32_t id = id_to_int(tid);
-       if ( work_list.size() <= id )
+       if ( thrd_func_list->size() <= id )
                return;
-       else if (work_list[id] == NULL)
+       else if (thrd_func_list->at(id) == NULL)
                return;
 
        /* get the function id that thread i is currently in */
-       func_id_list_t * func_list = work_list[id];
+       func_id_list_t * func_list = thrd_func_list->at(id);
        uint32_t func_id = func_list->back();
 
        if ( func_atomics.size() <= func_id )
@@ -64,7 +73,8 @@ void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) {
        func_node->add_action(act);
 }
 
-void ModelHistory::print() {
+void ModelHistory::print()
+{
        for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
                FuncNode * funcNode = func_atomics[i];
                func_inst_list_t * inst_list = funcNode->get_inst_list();