Version that finds the bug of iris

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 9969c016a35927531ea03647fffa885ca659fc0d..afd1f1d1752d9d4a0fde35ccef3d91c99ae572f2 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -19,7 +19,7 @@ ModelHistory::ModelHistory() :
        func_nodes()
 {
        /* The following are snapshot data structures */
-       write_history = new HashTable<void *, value_set_t *, uintptr_t, 4>();
+       write_history = new HashTable<void *, value_set_t *, uintptr_t, 0>();
        loc_rd_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
        loc_wr_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
        loc_waiting_writes_map = new HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0>();
@@ -153,8 +153,6 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
                thrd_func_act_lists = execution->get_thrd_func_act_lists();
 
        uint32_t thread_id = id_to_int(tid);
-       uint32_t func_id = (*thrd_func_list)[thread_id].back();
-
        /* Return if thread tid has not entered any function that contains atomics */
        if ( thrd_func_list->size() <= thread_id )
                return;
@@ -179,32 +177,29 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
                check_waiting_write(act);
        }
 
+       uint32_t func_id = (*thrd_func_list)[thread_id].back();
+
        /* The following does not care about actions that are not inside
         * any function that contains atomics or actions without a position */
        if (func_id == 0 || act->get_position() == NULL)
                return;
 
        SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[thread_id];
+
        /* The list of actions that thread tid has taken in its current function */
        action_list_t * curr_act_list = func_act_lists->back();
-       ASSERT(curr_act_list != NULL);
 
        if (skip_action(act, curr_act_list))
                return;
 
-       FuncNode * func_node = func_nodes[func_id];
-
        /* Add to curr_inst_list */
        curr_act_list->push_back(act);
+
+       FuncNode * func_node = func_nodes[func_id];
        func_node->add_inst(act);
 
        if (act->is_read()) {
                func_node->update_inst_act_map(tid, act);
-
-               // Update predicate tree position
-               Fuzzer * fuzzer = execution->getFuzzer();
-               Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
-               func_node->set_predicate_tree_position(tid, selected_branch);
        }
 }
 
@@ -330,7 +325,6 @@ void ModelHistory::check_waiting_write(ModelAction * write_act)
        void * location = write_act->get_location();
        uint64_t value = write_act->get_write_value();
        SnapVector<ConcretePredicate *> * concrete_preds = loc_waiting_writes_map->get(location);
-       SnapVector<ConcretePredicate *> to_remove = SnapVector<ConcretePredicate *>();
        if (concrete_preds == NULL)
                return;
 
@@ -342,7 +336,7 @@ void ModelHistory::check_waiting_write(ModelAction * write_act)
                /* Check if the written value satisfies every predicate expression */
                for (uint i = 0; i < concrete_exprs->size(); i++) {
                        struct concrete_pred_expr concrete = (*concrete_exprs)[i];
-                       bool equality;
+                       bool equality = false;
                        switch (concrete.token) {
                                case EQUALITY:
                                        equality = (value == concrete.value);
@@ -362,22 +356,16 @@ void ModelHistory::check_waiting_write(ModelAction * write_act)
                }
 
                if (satisfy_predicate) {
-                       to_remove.push_back(concrete_pred);
+                       /* Wake up threads */
+                       thread_id_t tid = concrete_pred->get_tid();
+                       Thread * thread = model->get_thread(tid);
+
+                       //model_print("** thread %d is woken up\n", thread->get_id());
+                       model->get_execution()->getFuzzer()->notify_paused_thread(thread);
                }
 
                index++;
        }
-
-       for (uint i = 0; i < to_remove.size(); i++) {
-               ConcretePredicate * concrete_pred = to_remove[i];
-
-               /* Wake up threads */
-               thread_id_t tid = concrete_pred->get_tid();
-               Thread * thread = model->get_thread(tid);
-
-               model_print("** thread %d is woken up\n", thread->get_id());
-               model->get_execution()->getFuzzer()->notify_paused_thread(thread);
-       }
 }
 
 WaitObj * ModelHistory::getWaitObj(thread_id_t tid)
@@ -460,6 +448,8 @@ SnapVector<inst_act_map_t *> * ModelHistory::getThrdInstActMap(uint32_t func_id)
 
 bool ModelHistory::skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list)
 {
+       ASSERT(curr_act_list != NULL);
+
        bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
        modelclock_t curr_seq_number = act->get_seq_number();
 
@@ -514,11 +504,10 @@ void ModelHistory::monitor_waiting_thread(uint32_t func_id, thread_id_t tid)
        }
 }
 
-void monitor_waiting_thread_counter(thread_id_t tid)
+void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid)
 {
        WaitObj * wait_obj = getWaitObj(tid);
        thrd_id_set_t * waited_by = wait_obj->getWaitedBy();
-       SnapVector<thread_id_t> expire_threads;
 
        // Thread tid has taken an action, update the counter for threads waiting for tid
        thrd_id_set_iter * tid_iter = waited_by->iterator();
@@ -528,8 +517,17 @@ void monitor_waiting_thread_counter(thread_id_t tid)
 
                bool expire = other_wait_obj->incr_counter(tid);
                if (expire) {
-                       // TODO: complete
-                       expire_threads.push_back(tid);
+//                     model_print("thread %d stops waiting for thread %d\n", waited_by_id, tid);
+                       wait_obj->remove_waited_by(waited_by_id);
+                       other_wait_obj->remove_waiting_for(tid);
+
+                       thrd_id_set_t * other_waiting_for = other_wait_obj->getWaitingFor();
+                       if ( other_waiting_for->isEmpty() ) {
+                               // model_print("\tthread %d waits for nobody, wake up\n", self_id);
+                               ModelExecution * execution = model->get_execution();
+                               Thread * thread = execution->get_thread(waited_by_id);
+                               execution->getFuzzer()->notify_paused_thread(thread);
+                       }
                }
        }
 }
@@ -566,6 +564,8 @@ void ModelHistory::print_func_node()
        for (uint32_t i = 1; i < func_nodes.size(); i++) {
                FuncNode * func_node = func_nodes[i];
 
+               func_node->print_predicate_tree();
+/*
                func_inst_list_mt * entry_insts = func_node->get_entry_insts();
                model_print("function %s has entry actions\n", func_node->get_func_name());
 
@@ -574,6 +574,7 @@ void ModelHistory::print_func_node()
                        FuncInst *inst = it->getVal();
                        model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                }
+               */
        }
 }