eliminate redundancy

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index caf86cedb46a46b2d72cc542c2598057d0b98fa2..cdb642fd3fefd50a8a121a6400ce5f53279b20fd 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -10,7 +10,7 @@
 
 /** @brief Constructor */
 ModelHistory::ModelHistory() :
-       func_counter(0), /* function id starts with 0 */
+       func_counter(0),        /* function id starts with 0 */
        func_map(),
        func_map_rev(),
        func_atomics()
@@ -22,7 +22,7 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
        uint32_t id = id_to_int(tid);
        SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
        SnapVector< SnapList<func_inst_list_t *> *> *
-                       thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+               thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
 
        if ( thrd_func_list->size() <= id ) {
                thrd_func_list->resize( id + 1 );
@@ -52,7 +52,7 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
        uint32_t id = id_to_int(tid);
        SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
        SnapVector< SnapList<func_inst_list_t *> *> *
-                       thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+               thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
 
        func_id_list_t * func_list = thrd_func_list->at(id);
        SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
@@ -79,7 +79,7 @@ void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid)
           from all functions */
        SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
        SnapVector< SnapList<func_inst_list_t *> *> *
-                       thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+               thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
 
        uint32_t id = id_to_int(tid);
        if ( thrd_func_list->size() <= id )
@@ -149,7 +149,7 @@ void ModelHistory::link_insts(func_inst_list_t * inst_list)
 
 void ModelHistory::print()
 {
-       for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
+       for (uint32_t i = 0;i < func_atomics.size();i++ ) {
                FuncNode * funcNode = func_atomics[i];
                if (funcNode == NULL)
                        continue;
@@ -158,20 +158,20 @@ void ModelHistory::print()
 
                model_print("function %s has entry actions\n", funcNode->get_func_name());
                func_inst_list_mt::iterator it;
-               for (it = entry_insts->begin(); it != entry_insts->end(); it++) {
+               for (it = entry_insts->begin();it != entry_insts->end();it++) {
                        FuncInst *inst = *it;
                        model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                }
 
 /*
-               func_inst_list_mt * inst_list = funcNode->get_inst_list();
-
-               model_print("function %s has following actions\n", funcNode->get_func_name());
-               func_inst_list_mt::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());
-               }
-*/
+                func_inst_list_mt * inst_list = funcNode->get_inst_list();
+
+                model_print("function %s has following actions\n", funcNode->get_func_name());
+                func_inst_list_mt::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());
+                }
+ */
        }
 }