X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=history.cc;h=7fab503bc48e5056f4ec68ae260bfb35e73b9ebd;hb=7da037811c33ae78db573226a1c5a4907a967962;hp=3fe570b28e8c71f1334f195d4be23253a8efbe75;hpb=527eb9241e1b39b6ad4125a71b951d445d4e251e;p=c11tester.git diff --git a/history.cc b/history.cc index 3fe570b2..7fab503b 100644 --- a/history.cc +++ b/history.cc @@ -16,19 +16,18 @@ ModelHistory::ModelHistory() : func_counter(1), /* function id starts with 1 */ func_map(), func_map_rev(), - func_nodes() + func_nodes(), + last_action(NULL) { /* The following are snapshot data structures */ write_history = new HashTable(); 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_act_lists = new SnapVector< SnapList *>(); 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() @@ -46,21 +45,15 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) 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); @@ -69,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) { @@ -86,38 +78,15 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid) { uint32_t id = id_to_int(tid); - - 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); } @@ -172,36 +141,16 @@ 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); - - // Increment ref count for every action and reads_froms - act->incr_read_ref_count(); - if (act->is_read()) { - ModelAction * rf = act->get_reads_from(); - rf->incr_read_ref_count(); - } - 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 = ((NewFuzzer *)fuzzer)->get_selected_child_branch(tid); - func_node->set_predicate_tree_position(tid, selected_branch); - } - - if (act->is_write()) { + // Do nothing + } else if (act->is_write()) { + /* Predicate * curr_pred = func_node->get_predicate_tree_position(tid); FuncInst * curr_inst = func_node->get_inst(act); @@ -210,7 +159,11 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid) curr_pred = curr_pred->follow_write_child(curr_inst); } func_node->set_predicate_tree_position(tid, curr_pred); + */ } + + func_node->update_tree(act); + last_action = act; } /* Return the FuncNode given its func_id */ @@ -443,23 +396,8 @@ void ModelHistory::stop_waiting_for_node(thread_id_t self_id, } } -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(); @@ -468,9 +406,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) + if (last_action != NULL) { + if (last_action->get_seq_number() == curr_seq_number) return true; } @@ -582,15 +519,15 @@ void ModelHistory::print_func_node() 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()); + } +*/ } }