factor out codes for FuncInst class

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index e0560bad79df58a452ad0c9f566ead7e160e773c..c896511ebc5033545890f50d926eee2296ba7eed 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -1,30 +1,43 @@
 #include <inttypes.h>
 #include "history.h"
 #include "action.h"
+#include "funcnode.h"
 
+#include "model.h"
+#include "execution.h"
+
+/** @brief Constructor */
 ModelHistory::ModelHistory() :
-       func_id(1),     /* function id starts with 1 */
+       func_counter(0), /* function id starts with 0 */
        func_map(),
-       func_history(),
-       work_list()
+       func_map_rev(),
+       func_atomics()
 {}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
 {
-       if ( !work_list.contains(tid) ) {
-               // This thread has not been pushed to work_list
-               SnapList<uint32_t> * func_list = new SnapList<uint32_t>();
-               func_list->push_back(func_id);
-               work_list.put(tid, func_list);
-       } else {
-               SnapList<uint32_t> * func_list = work_list.get(tid);
-               func_list->push_back(func_id);
+       //model_print("thread %d entering func %d\n", tid, func_id);
+       uint32_t id = id_to_int(tid);
+       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 = thrd_func_list->at(id);
+
+       if (func_list == NULL) {
+               func_list = new func_id_list_t();
+               thrd_func_list->at(id) = func_list;
        }
+
+       func_list->push_back(func_id);
 }
 
 void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 {
-       SnapList<uint32_t> * func_list = work_list.get(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) {
@@ -33,4 +46,55 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
                model_print("trying to exit with a wrong function id\n");
                model_print("--- last_func: %d, func_id: %d\n", last_func_id, func_id);
        }
+       //model_print("thread %d exiting func %d\n", tid, func_id);
+}
+
+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 ( thrd_func_list->size() <= id )
+               return;
+       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 = thrd_func_list->at(id);
+       uint32_t func_id = func_list->back();
+
+       if ( func_atomics.size() <= func_id )
+               func_atomics.resize( func_id + 1 );
+
+       FuncNode * func_node = func_atomics[func_id];
+       if (func_node == NULL) {
+               const char * func_name = func_map_rev[func_id];
+               func_node = new FuncNode();
+               func_node->set_func_id(func_id);
+               func_node->set_func_name(func_name);
+
+               func_atomics[func_id] = func_node;
+       }
+
+       func_node->add_action(act);
+}
+
+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();
+
+               if (funcNode == NULL)
+                       continue;
+
+               model_print("function %s has following actions\n", funcNode->get_func_name());
+               func_inst_list_t::iterator it;
+               for (it = inst_list->begin(); it != inst_list->end(); it++) {
+                       FuncInst *inst = *it;
+                       model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
+               }
+       }
 }