change func_atomics and work_list to vectors

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index ca52209d6ff17b5a95ebe29a6cfaecb546e2de89..f757a5d75dfa4ecd84fd8704402240c02e44b5c1 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -2,29 +2,41 @@
 #include "history.h"
 #include "action.h"
 
+HistoryNode::HistoryNode(ModelAction *act) :
+       action(act)
+{
+       ASSERT(act);
+       this->position = act->get_position();
+}
+
+/** @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_atomics(),
+       work_list(2)    /* we have at least two threads */
 {}
 
 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("entering function: %d\n", func_id);
+
+       uint32_t id = id_to_int(tid);
+       if ( work_list.size() <= id )
+               work_list.resize( id + 1 );
+
+       func_id_list_t * func_list = work_list[id];
+       if (func_list == NULL) {
+               func_list = new func_id_list_t();
+               work_list[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);
+       func_id_list_t * func_list = work_list[ id_to_int(tid) ];
        uint32_t last_func_id = func_list->back();
 
        if (last_func_id == func_id) {
@@ -33,4 +45,49 @@ 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("exiting function: %d\n", 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 */
+       uint32_t id = id_to_int(tid);
+       if ( work_list.size() <= id )
+               return;
+       else if (work_list[id] == NULL)
+               return;
+
+       /* get the function id that thread i is currently in */
+       func_id_list_t * func_list = work_list[id];
+       uint32_t func_id = func_list->back();
+
+       if ( func_atomics.size() <= func_id )
+               func_atomics.resize( func_id + 1 );
+
+       action_mlist_t * atomic_list = func_atomics[func_id];
+       if (atomic_list == NULL) {
+               atomic_list = new action_mlist_t();
+               func_atomics[func_id] = atomic_list;
+       }
+
+       atomic_list->push_back(act);
+
+       model_print("func id: %d, added atomic acts: %d\n", func_id, act->get_type());
+}
+
+void ModelHistory::print() {
+       for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
+               action_mlist_t * atomic_list = func_atomics[i];
+
+               if (atomic_list == NULL)
+                       continue;
+
+               model_print("function with id: %d has following actions\n", i);
+               action_mlist_t::iterator it;
+               for (it = atomic_list->begin(); it != atomic_list->end(); it++) {
+                       const ModelAction *act = *it;
+                       act->print();
+               }
+       }
 }