X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.cc;h=c9c6ff6f06192cb318f8e5640ad4d84d5a522b54;hp=a5b437c512992793d6e550a90f2f3f497a5146da;hb=3d0d4dd1b66d946b225666769f4121c4867259be;hpb=0d3c4eca7d657d93c5a30681f22d9856847370f9 diff --git a/history.cc b/history.cc index a5b437c5..c9c6ff6f 100644 --- a/history.cc +++ b/history.cc @@ -14,6 +14,7 @@ /** @brief Constructor */ ModelHistory::ModelHistory() : func_counter(1), /* function id starts with 1 */ + last_seq_number(INIT_SEQ_NUMBER), func_map(), func_map_rev(), func_nodes() @@ -23,9 +24,10 @@ ModelHistory::ModelHistory() : loc_rd_func_nodes_map = new HashTable *, uintptr_t, 0>(); loc_wr_func_nodes_map = new HashTable *, uintptr_t, 0>(); loc_waiting_writes_map = new HashTable *, uintptr_t, 0>(); + thrd_func_list = new SnapVector(); + thrd_last_entered_func = new SnapVector(); thrd_waiting_write = new SnapVector(); thrd_wait_obj = new SnapVector(); - func_inst_act_maps = new HashTable *, int, 0>(128); } ModelHistory::~ModelHistory() @@ -38,32 +40,20 @@ ModelHistory::~ModelHistory() void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) { //model_print("thread %d entering func %d\n", tid, func_id); - ModelExecution * execution = model->get_execution(); uint id = id_to_int(tid); - SnapVector * thrd_func_list = execution->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_act_lists = execution->get_thrd_func_act_lists(); - SnapVector * thrd_last_entered_func = execution->get_thrd_last_entered_func(); - if ( thrd_func_list->size() <= id ) { uint oldsize = thrd_func_list->size(); thrd_func_list->resize( id + 1 ); - thrd_func_act_lists->resize( id + 1 ); for (uint i = oldsize;i < id + 1;i++) { // push 0 as a dummy function id to a void seg fault new (&(*thrd_func_list)[i]) func_id_list_t(); (*thrd_func_list)[i].push_back(0); - - (*thrd_func_act_lists)[i] = new SnapList(); thrd_last_entered_func->push_back(0); } } - SnapList * func_act_lists = (*thrd_func_act_lists)[id]; - func_act_lists->push_back( new action_list_t() ); - uint32_t last_entered_func_id = (*thrd_last_entered_func)[id]; (*thrd_last_entered_func)[id] = func_id; (*thrd_func_list)[id].push_back(func_id); @@ -72,8 +62,7 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) resize_func_nodes( func_id + 1 ); FuncNode * func_node = func_nodes[func_id]; - func_node->init_predicate_tree_position(tid); - func_node->init_inst_act_map(tid); + func_node->function_entry_handler(tid); /* Add edges between FuncNodes */ if (last_entered_func_id != 0) { @@ -82,49 +71,22 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) } /* Monitor the statuses of threads waiting for tid */ - monitor_waiting_thread(func_id, tid); + // monitor_waiting_thread(func_id, tid); } /* @param func_id a non-zero value */ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid) { - ModelExecution * execution = model->get_execution(); uint32_t id = id_to_int(tid); - SnapVector * thrd_func_list = execution->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_act_lists = execution->get_thrd_func_act_lists(); - - SnapList * func_act_lists = (*thrd_func_act_lists)[id]; uint32_t last_func_id = (*thrd_func_list)[id].back(); if (last_func_id == func_id) { FuncNode * func_node = func_nodes[func_id]; - func_node->set_predicate_tree_position(tid, NULL); - func_node->reset_inst_act_map(tid); - - action_list_t * curr_act_list = func_act_lists->back(); - - /* defer the processing of curr_act_list until the function has exits a few times - * (currently twice) so that more information can be gathered to infer nullity predicates. - */ - func_node->incr_exit_count(); - if (func_node->get_exit_count() >= 2) { - SnapList * action_list_buffer = func_node->get_action_list_buffer(); - while (action_list_buffer->size() > 0) { - action_list_t * act_list = action_list_buffer->back(); - action_list_buffer->pop_back(); - func_node->update_tree(act_list); - } - - func_node->update_tree(curr_act_list); - } else - func_node->get_action_list_buffer()->push_front(curr_act_list); + func_node->function_exit_handler(tid); (*thrd_func_list)[id].pop_back(); - func_act_lists->pop_back(); } else { - 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); + ASSERT(false); } //model_print("thread %d exiting func %d\n", tid, func_id); } @@ -147,18 +109,13 @@ void ModelHistory::resize_func_nodes(uint32_t new_size) void ModelHistory::process_action(ModelAction *act, thread_id_t tid) { - ModelExecution * execution = model->get_execution(); - SnapVector * thrd_func_list = execution->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_act_lists = execution->get_thrd_func_act_lists(); - uint32_t thread_id = id_to_int(tid); /* Return if thread tid has not entered any function that contains atomics */ if ( thrd_func_list->size() <= thread_id ) return; /* Monitor the statuses of threads waiting for tid */ - monitor_waiting_thread_counter(tid); + // monitor_waiting_thread_counter(tid); /* Every write action should be processed, including * nonatomic writes (which have no position) */ @@ -184,38 +141,14 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid) if (func_id == 0 || act->get_position() == NULL) return; - SnapList * 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(); - - if (skip_action(act, curr_act_list)) + if (skip_action(act)) return; - /* 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); - - Fuzzer * fuzzer = model->get_execution()->getFuzzer(); - Predicate * selected_branch = fuzzer->get_selected_child_branch(tid); - func_node->set_predicate_tree_position(tid, selected_branch); - } - - if (act->is_write()) { - Predicate * curr_pred = func_node->get_predicate_tree_position(tid); - FuncInst * curr_inst = func_node->get_inst(act); - - if (curr_pred) { - // Follow child - curr_pred = curr_pred->get_single_child(curr_inst); - } - func_node->set_predicate_tree_position(tid, curr_pred); - } + func_node->update_tree(act); + last_seq_number = act->get_seq_number(); } /* Return the FuncNode given its func_id */ @@ -235,7 +168,6 @@ FuncNode * ModelHistory::get_func_node(uint32_t func_id) FuncNode * ModelHistory::get_curr_func_node(thread_id_t tid) { int thread_id = id_to_int(tid); - SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); uint32_t func_id = (*thrd_func_list)[thread_id].back(); if (func_id != 0) { @@ -376,7 +308,7 @@ void ModelHistory::check_waiting_write(ModelAction * write_act) 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); + ((NewFuzzer *)model->get_execution()->getFuzzer())->notify_paused_thread(thread); } index++; @@ -398,7 +330,7 @@ WaitObj * ModelHistory::getWaitObj(thread_id_t tid) } void ModelHistory::add_waiting_thread(thread_id_t self_id, -thread_id_t waiting_for_id, FuncNode * target_node, int dist) + thread_id_t waiting_for_id, FuncNode * target_node, int dist) { WaitObj * self_wait_obj = getWaitObj(self_id); self_wait_obj->add_waiting_for(waiting_for_id, target_node, dist); @@ -423,10 +355,11 @@ void ModelHistory::remove_waiting_thread(thread_id_t tid) } self_wait_obj->clear_waiting_for(); + delete iter; } void ModelHistory::stop_waiting_for_node(thread_id_t self_id, -thread_id_t waiting_for_id, FuncNode * target_node) + thread_id_t waiting_for_id, FuncNode * target_node) { WaitObj * self_wait_obj = getWaitObj(self_id); bool thread_removed = self_wait_obj->remove_waiting_for_node(waiting_for_id, target_node); @@ -443,28 +376,13 @@ thread_id_t waiting_for_id, FuncNode * target_node) // model_print("\tthread %d waits for nobody, wake up\n", self_id); ModelExecution * execution = model->get_execution(); Thread * thread = execution->get_thread(self_id); - execution->getFuzzer()->notify_paused_thread(thread); + ((NewFuzzer *)execution->getFuzzer())->notify_paused_thread(thread); } } } -SnapVector * ModelHistory::getThrdInstActMap(uint32_t func_id) +bool ModelHistory::skip_action(ModelAction * act) { - ASSERT(func_id != 0); - - SnapVector * maps = func_inst_act_maps->get(func_id); - if (maps == NULL) { - maps = new SnapVector(); - func_inst_act_maps->put(func_id, maps); - } - - return maps; -} - -bool ModelHistory::skip_action(ModelAction * act, SnapList * 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(); @@ -473,11 +391,8 @@ bool ModelHistory::skip_action(ModelAction * act, SnapList * curr return true; /* Skip actions with the same sequence number */ - if (curr_act_list->size() != 0) { - ModelAction * last_act = curr_act_list->back(); - if (last_act->get_seq_number() == curr_seq_number) - return true; - } + if (last_seq_number != INIT_SEQ_NUMBER && last_seq_number == curr_seq_number) + return true; /* Skip actions that are paused by fuzzer (sequence number is 0) */ if (curr_seq_number == 0) @@ -516,7 +431,11 @@ void ModelHistory::monitor_waiting_thread(uint32_t func_id, thread_id_t tid) stop_waiting_for_node(waited_by_id, tid, target); } } + + delete node_iter; } + + delete tid_iter; } void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid) @@ -541,10 +460,12 @@ void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid) // 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); + ((NewFuzzer *)execution->getFuzzer())->notify_paused_thread(thread); } } } + + delete tid_iter; } /* Reallocate some snapshotted memories when new executions start */ @@ -578,18 +499,18 @@ void ModelHistory::print_func_node() /* function id starts with 1 */ 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()); - - mllnode* it; - for (it = entry_insts->begin();it != NULL;it=it->getNext()) { - FuncInst *inst = it->getVal(); - model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position()); - } - */ + func_inst_list_mt * entry_insts = func_node->get_entry_insts(); + model_print("function %s has entry actions\n", func_node->get_func_name()); + + mllnode* it; + for (it = entry_insts->begin();it != NULL;it=it->getNext()) { + FuncInst *inst = it->getVal(); + model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position()); + } +*/ } }