Add a collision list for FuncInsts with the same source line number

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 2ad4c1a90c53b33f959d8830213b81019b5e685e..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>();
@@ -200,11 +200,6 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
 
        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)
@@ -520,7 +508,6 @@ 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();
@@ -530,6 +517,7 @@ void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid)
 
                bool expire = other_wait_obj->incr_counter(tid);
                if (expire) {
+//                     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);
 
@@ -576,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());
 
@@ -584,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());
                }
+               */
        }
 }