Get code to compile

[c11tester.git] / execution.cc

diff --git a/execution.cc b/execution.cc
index 5668fc36d27c643b3db137b7f9502d1e4cfdf5db..cfb0b0bc781be4e334f3549e0dae6ba91173f330 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -391,7 +391,7 @@ bool ModelExecution::process_mutex(ModelAction *curr)
                action_list_t *waiters = get_safe_ptr_action(&condvar_waiters_map, curr->get_location());
                //activate all the waiting threads
                for (sllnode<ModelAction *> * rit = waiters->begin();rit != NULL;rit=rit->getNext()) {
-                 scheduler->wake(get_thread(rit->getVal()));
+                       scheduler->wake(get_thread(rit->getVal()));
                }
                waiters->clear();
                break;
@@ -443,7 +443,7 @@ bool ModelExecution::process_fence(ModelAction *curr)
                sllnode<ModelAction *> * rit;
                /* Find X : is_read(X) && X --sb-> curr */
                for (rit = list->end();rit != NULL;rit=rit->getPrev()) {
-                 ModelAction *act = rit->getVal();
+                       ModelAction *act = rit->getVal();
                        if (act == curr)
                                continue;
                        if (act->get_tid() != curr->get_tid())
@@ -806,7 +806,7 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const ModelAction *
                action_list_t *list = &(*thrd_lists)[tid];
                sllnode<ModelAction *> * rit;
                for (rit = list->end();rit != NULL;rit=rit->getPrev()) {
-                 ModelAction *act = rit->getVal();
+                       ModelAction *act = rit->getVal();
 
                        /* Skip curr */
                        if (act == curr)
@@ -938,7 +938,7 @@ void ModelExecution::w_modification_order(ModelAction *curr)
                action_list_t *list = &(*thrd_lists)[i];
                sllnode<ModelAction*>* rit;
                for (rit = list->end();rit != NULL;rit=rit->getPrev()) {
-                 ModelAction *act = rit->getVal();
+                       ModelAction *act = rit->getVal();
                        if (act == curr) {
                                /*
                                 * 1) If RMW and it actually read from something, then we
@@ -1012,7 +1012,7 @@ bool ModelExecution::mo_may_allow(const ModelAction *writer, const ModelAction *
                action_list_t *list = &(*thrd_lists)[i];
                sllnode<ModelAction *>* rit;
                for (rit = list->end();rit != NULL;rit=rit->getPrev()) {
-                 ModelAction *act = rit->getVal();
+                       ModelAction *act = rit->getVal();
 
                        /* Don't disallow due to act == reader */
                        if (!reader->happens_before(act) || reader == act)
@@ -1102,10 +1102,10 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
                list->push_front(uninit);
                SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_wr_thrd_map, act->get_location());
                if (uninit_id >= (int)vec->size()) {
-                 int oldsize = (int) vec->size();
-                 vec->resize(uninit_id + 1);
-                 for(int i=oldsize; i<uninit_id+1; i++)
-                   new (&vec[i]) action_list_t(); 
+                       int oldsize = (int) vec->size();
+                       vec->resize(uninit_id + 1);
+                       for(int i=oldsize;i<uninit_id+1;i++)
+                               new (&vec[i]) action_list_t();
                }
                (*vec)[uninit_id].push_front(uninit);
        }
@@ -1119,10 +1119,10 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
        // Update obj_thrd_map, a per location, per thread, order of actions
        SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, act->get_location());
        if (tid >= (int)vec->size()) {
-         uint oldsize =vec->size();
-         vec->resize(priv->next_thread_id);
-         for(uint i=oldsize; i<priv->next_thread_id; i++)
-           new (&vec[i]) action_list_t(); 
+               uint oldsize =vec->size();
+               vec->resize(priv->next_thread_id);
+               for(uint i=oldsize;i<priv->next_thread_id;i++)
+                       new (&vec[i]) action_list_t();
        }
        (*vec)[tid].push_back(act);
        if (uninit)
@@ -1148,46 +1148,46 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
 
                SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, mutex_loc);
                if (tid >= (int)vec->size()) {
-                 uint oldsize = vec->size();
-                 vec->resize(priv->next_thread_id);
-                 for(uint i=oldsize; i<priv->next_thread_id; i++)
-                   new (&vec[i]) action_list_t(); 
+                       uint oldsize = vec->size();
+                       vec->resize(priv->next_thread_id);
+                       for(uint i=oldsize;i<priv->next_thread_id;i++)
+                               new (&vec[i]) action_list_t();
                }
                (*vec)[tid].push_back(act);
        }
 }
 
 void insertIntoActionList(action_list_t *list, ModelAction *act) {
-  sllnode<ModelAction*> * rit = list->end();
+       sllnode<ModelAction*> * rit = list->end();
        modelclock_t next_seq = act->get_seq_number();
        if (rit == NULL || (rit->getVal())->get_seq_number() == next_seq)
-         list->push_back(act);
+               list->push_back(act);
        else {
-         for(;rit != NULL;rit=rit->getPrev()) {
-           if ((rit->getVal())->get_seq_number() == next_seq) {
-             list->insertAfter(rit, act);
-             break;
-           }
-         }
+               for(;rit != NULL;rit=rit->getPrev()) {
+                       if ((rit->getVal())->get_seq_number() == next_seq) {
+                               list->insertAfter(rit, act);
+                               break;
+                       }
+               }
        }
 }
 
 void insertIntoActionListAndSetCV(action_list_t *list, ModelAction *act) {
-  sllnode<ModelAction*> * rit = list->end();
+       sllnode<ModelAction*> * rit = list->end();
        modelclock_t next_seq = act->get_seq_number();
        if (rit == NULL) {
                act->create_cv(NULL);
        } else if (rit->getVal()->get_seq_number() == next_seq) {
-         act->create_cv(rit->getVal());
-         list->push_back(act);
+               act->create_cv(rit->getVal());
+               list->push_back(act);
        } else {
-         for(;rit != NULL;rit=rit->getPrev()) {
-           if (rit->getVal()->get_seq_number() == next_seq) {
-             act->create_cv(rit->getVal());
-             list->insertAfter(rit, act);
-             break;
-           }
-         }
+               for(;rit != NULL;rit=rit->getPrev()) {
+                       if (rit->getVal()->get_seq_number() == next_seq) {
+                               act->create_cv(rit->getVal());
+                               list->insertAfter(rit, act);
+                               break;
+                       }
+               }
        }
 }
 
@@ -1210,10 +1210,10 @@ void ModelExecution::add_normal_write_to_lists(ModelAction *act)
        // Update obj_thrd_map, a per location, per thread, order of actions
        SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, act->get_location());
        if (tid >= (int)vec->size()) {
-         uint oldsize =vec->size();
-         vec->resize(priv->next_thread_id);
-         for(uint i=oldsize; i<priv->next_thread_id; i++)
-           new (&vec[i]) action_list_t();
+               uint oldsize =vec->size();
+               vec->resize(priv->next_thread_id);
+               for(uint i=oldsize;i<priv->next_thread_id;i++)
+                       new (&vec[i]) action_list_t();
        }
        insertIntoActionList(&(*vec)[tid],act);
 
@@ -1227,10 +1227,10 @@ void ModelExecution::add_write_to_lists(ModelAction *write) {
        SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_wr_thrd_map, write->get_location());
        int tid = id_to_int(write->get_tid());
        if (tid >= (int)vec->size()) {
-         uint oldsize =vec->size();
-         vec->resize(priv->next_thread_id);
-         for(uint i=oldsize; i<priv->next_thread_id; i++)
-           new (&vec[i]) action_list_t();
+               uint oldsize =vec->size();
+               vec->resize(priv->next_thread_id);
+               for(uint i=oldsize;i<priv->next_thread_id;i++)
+                       new (&vec[i]) action_list_t();
        }
        (*vec)[tid].push_back(write);
 }
@@ -1296,17 +1296,17 @@ ModelAction * ModelExecution::get_last_seq_cst_fence(thread_id_t tid, const Mode
        sllnode<ModelAction*>* rit = list->end();
 
        if (before_fence) {
-         for (;rit != NULL;rit=rit->getPrev())
-           if (rit->getVal() == before_fence)
-             break;
-         
-         ASSERT(rit->getVal() == before_fence);
-         rit=rit->getPrev();
+               for (;rit != NULL;rit=rit->getPrev())
+                       if (rit->getVal() == before_fence)
+                               break;
+
+               ASSERT(rit->getVal() == before_fence);
+               rit=rit->getPrev();
        }
 
        for (;rit != NULL;rit=rit->getPrev()) {
-         ModelAction *act = rit->getVal();
-         if (act->is_fence() && (tid == act->get_tid()) && act->is_seqcst())
+               ModelAction *act = rit->getVal();
+               if (act->is_fence() && (tid == act->get_tid()) && act->is_seqcst())
                        return act;
        }
        return NULL;
@@ -1328,8 +1328,8 @@ ModelAction * ModelExecution::get_last_unlock(ModelAction *curr) const
        /* Find: max({i in dom(S) | isUnlock(t_i) && samevar(t_i, t)}) */
        sllnode<ModelAction*>* rit;
        for (rit = list->end();rit != NULL;rit=rit->getPrev())
-         if (rit->getVal()->is_unlock() || rit->getVal()->is_wait())
-           return rit->getVal();
+               if (rit->getVal()->is_unlock() || rit->getVal()->is_wait())
+                       return rit->getVal();
        return NULL;
 }
 
@@ -1394,7 +1394,7 @@ SnapVector<ModelAction *> *  ModelExecution::build_may_read_from(ModelAction *cu
                action_list_t *list = &(*thrd_lists)[i];
                sllnode<ModelAction *> * rit;
                for (rit = list->end();rit != NULL;rit=rit->getPrev()) {
-                 ModelAction *act = rit->getVal();
+                       ModelAction *act = rit->getVal();
 
                        if (act == curr)
                                continue;
@@ -1459,7 +1459,7 @@ ModelAction * ModelExecution::get_uninitialized_action(ModelAction *curr) const
 
 static void print_list(action_list_t *list)
 {
-  sllnode<ModelAction*> *it;
+       sllnode<ModelAction*> *it;
 
        model_print("------------------------------------------------------------------------------------\n");
        model_print("#    t    Action type     MO       Location         Value               Rf  CV\n");
@@ -1468,7 +1468,7 @@ static void print_list(action_list_t *list)
        unsigned int hash = 0;
 
        for (it = list->begin();it != NULL;it=it->getNext()) {
-         const ModelAction *act = it->getVal();
+               const ModelAction *act = it->getVal();
                if (act->get_seq_number() > 0)
                        act->print();
                hash = hash^(hash<<3)^(it->getVal()->hash());
@@ -1488,7 +1488,7 @@ void ModelExecution::dumpGraph(char *filename)
        ModelAction **thread_array = (ModelAction **)model_calloc(1, sizeof(ModelAction *) * get_num_threads());
 
        for (sllnode<ModelAction*>* it = action_trace.begin();it != NULL;it=it->getNext()) {
-         ModelAction *act = it->getVal();
+               ModelAction *act = it->getVal();
                if (act->is_read()) {
                        mo_graph->dot_print_node(file, act);
                        mo_graph->dot_print_edge(file,
@@ -1512,7 +1512,7 @@ void ModelExecution::dumpGraph(char *filename)
 #endif
 
 /** @brief Prints an execution trace summary. */
-void ModelExecution::print_summary() 
+void ModelExecution::print_summary()
 {
 #if SUPPORT_MOD_ORDER_DUMP
        char buffername[100];