X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.cc;h=0a25caf530828ad7955cadfcc574d4443ee0a675;hp=7452c5c1916b310d3eff2684830cb80eff2148f2;hb=4752e48158e7c5c90472214c366b0eaa1ec09a71;hpb=54210d33af73ae7c74f2d416ab0e7bd472379e12 diff --git a/history.cc b/history.cc index 7452c5c1..0a25caf5 100644 --- a/history.cc +++ b/history.cc @@ -10,61 +10,67 @@ /** @brief Constructor */ ModelHistory::ModelHistory() : - func_counter(0), /* function id starts with 0 */ + func_counter(1), /* function id starts with 1 */ func_map(), func_map_rev(), - func_atomics() + func_nodes(), + write_history(), + write_locations() {} void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid) { //model_print("thread %d entering func %d\n", tid, func_id); - uint32_t id = id_to_int(tid); - SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists(); + uint id = id_to_int(tid); + SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); + SnapVector< SnapList *> * + thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists(); if ( thrd_func_list->size() <= id ) { + uint oldsize = thrd_func_list->size(); thrd_func_list->resize( id + 1 ); - thrd_func_inst_lists->resize( id + 1 ); - } - - func_id_list_t * func_list = thrd_func_list->at(id); - SnapList * func_inst_lists = thrd_func_inst_lists->at(id); + for (uint i = oldsize; i < id + 1; i++) { + new (&(*thrd_func_list)[i]) func_id_list_t(); + // push 0 as a dummy function id to a void seg fault + (*thrd_func_list)[i].push_back(0); + } - if (func_list == NULL) { - func_list = new func_id_list_t(); - thrd_func_list->at(id) = func_list; + thrd_func_act_lists->resize( id + 1 ); + for (uint i = oldsize; i < id + 1; i++) { + (*thrd_func_act_lists)[i] = new SnapList(); + } } - if (func_inst_lists == NULL) { - func_inst_lists = new SnapList< func_inst_list_t *>(); - thrd_func_inst_lists->at(id) = func_inst_lists; - } + SnapList * func_act_lists = (*thrd_func_act_lists)[id]; + + (*thrd_func_list)[id].push_back(func_id); + func_act_lists->push_back( new action_list_t() ); - func_list->push_back(func_id); - func_inst_lists->push_back( new func_inst_list_t() ); + if ( func_nodes.size() <= func_id ) + resize_func_nodes( func_id + 1 ); } +/* @param func_id a non-zero value */ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid) { uint32_t id = id_to_int(tid); - SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists(); - - func_id_list_t * func_list = thrd_func_list->at(id); - SnapList * func_inst_lists = thrd_func_inst_lists->at(id); + SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); + SnapVector< SnapList *> * + thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists(); - uint32_t last_func_id = func_list->back(); + 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) { - func_list->pop_back(); + FuncNode * func_node = func_nodes[func_id]; + func_node->clear_read_map(tid); - func_inst_list_t * curr_inst_list = func_inst_lists->back(); - link_insts(curr_inst_list); + // model_print("hello function %s and thread %d\n", func_node->get_func_name(), tid); + action_list_t * curr_act_list = func_act_lists->back(); + func_node->update_tree(curr_act_list); - func_inst_lists->pop_back(); + (*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); @@ -72,86 +78,136 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid) //model_print("thread %d exiting func %d\n", tid, func_id); } -void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) +void ModelHistory::resize_func_nodes(uint32_t new_size) +{ + uint32_t old_size = func_nodes.size(); + + if ( old_size < new_size ) + func_nodes.resize(new_size); + + for (uint32_t id = old_size;id < new_size;id++) { + const char * func_name = func_map_rev[id]; + FuncNode * func_node = new FuncNode(); + func_node->set_func_id(id); + func_node->set_func_name(func_name); + func_nodes[id] = func_node; + } +} + +void ModelHistory::process_action(ModelAction *act, thread_id_t tid) { /* return if thread i has not entered any function or has exited from all functions */ - SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); - SnapVector< SnapList *> * - thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists(); + SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); + SnapVector< SnapList *> * + thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists(); uint32_t id = id_to_int(tid); if ( thrd_func_list->size() <= id ) return; - else if (thrd_func_list->at(id) == NULL) - return; /* get the function id that thread i is currently in */ - func_id_list_t * func_list = thrd_func_list->at(id); - SnapList * func_inst_lists = thrd_func_inst_lists->at(id); + uint32_t func_id = (*thrd_func_list)[id].back(); + SnapList * func_act_lists = (*thrd_func_act_lists)[id]; - uint32_t func_id = func_list->back(); + if (func_id == 0) + return; + else if ( func_nodes.size() <= func_id ) + resize_func_nodes( func_id + 1 ); - if ( func_atomics.size() <= func_id ) - func_atomics.resize( func_id + 1 ); + FuncNode * func_node = func_nodes[func_id]; - FuncNode * func_node = func_atomics[func_id]; - if (func_node == NULL) { - const char * func_name = func_map_rev[func_id]; - func_node = new FuncNode(); - func_node->set_func_id(func_id); - func_node->set_func_name(func_name); + /* do not care about actions without a position */ + if (act->get_position() == NULL) + return; - func_atomics[func_id] = func_node; - } + if (act->is_read()) + func_node->store_read(act, tid); - FuncInst * inst = func_node->get_or_add_action(act); - if (inst != NULL) { - func_inst_list_t * curr_inst_list = func_inst_lists->back(); + if (act->is_write()) + add_to_write_history(act->get_location(), act->get_write_value()); - ASSERT(curr_inst_list != NULL); - curr_inst_list->push_back(inst); - } + /* add to curr_inst_list */ + action_list_t * curr_act_list = func_act_lists->back(); + ASSERT(curr_act_list != NULL); + + ModelAction * last_act; + if (curr_act_list->size() != 0) + last_act = curr_act_list->back(); + + /* do not add actions with the same sequence number twice */ + if (last_act != NULL && last_act->get_seq_number() == act->get_seq_number()) + return; + + curr_act_list->push_back(act); } -/* Link FuncInsts in a list - add one FuncInst to another's predecessors and successors */ -void ModelHistory::link_insts(func_inst_list_t * inst_list) +/* return the FuncNode given its func_id */ +FuncNode * ModelHistory::get_func_node(uint32_t func_id) { - if (inst_list == NULL) - return; + if (func_nodes.size() <= func_id) // this node has not been added to func_nodes + return NULL; - func_inst_list_t::iterator it = inst_list->begin(); - func_inst_list_t::iterator prev = inst_list->end(); - it++; + return func_nodes[func_id]; +} - while (it != inst_list->end()) { - prev = it; - prev--; +uint64_t ModelHistory::query_last_read(void * location, thread_id_t tid) +{ + SnapVector * thrd_func_list = model->get_execution()->get_thrd_func_list(); + uint32_t id = id_to_int(tid); - FuncInst * prev_inst = *prev; - FuncInst * curr_inst = *it; + ASSERT( thrd_func_list->size() > id ); + uint32_t func_id = (*thrd_func_list)[id].back(); + FuncNode * func_node = func_nodes[func_id]; - prev_inst->add_succ(curr_inst); - curr_inst->add_pred(prev_inst); + uint64_t last_read_val = 0xdeadbeef; + if (func_node != NULL) { + last_read_val = func_node->query_last_read(location, tid); + } + + return last_read_val; +} + +void ModelHistory::add_to_write_history(void * location, uint64_t write_val) +{ + write_set_t * write_set = write_history.get(location); - it++; + if (write_set == NULL) { + write_set = new write_set_t(); + write_history.put(location, write_set); } + + write_set->add(write_val); + write_locations.add(location); +} + +void ModelHistory::print_write() +{ } -void ModelHistory::print() +void ModelHistory::print_func_node() { - for (uint32_t i = 0; i < func_atomics.size(); i++ ) { - FuncNode * funcNode = func_atomics[i]; - func_inst_list_mt * inst_list = funcNode->get_inst_list(); + /* function id starts with 1 */ + for (uint32_t i = 1; i < func_nodes.size(); i++) { + FuncNode * func_node = func_nodes[i]; - if (funcNode == NULL) - continue; + func_inst_list_mt * entry_insts = func_node->get_entry_insts(); + model_print("function %s has entry actions\n", func_node->get_func_name()); - model_print("function %s has following actions\n", funcNode->get_func_name()); - func_inst_list_mt::iterator it; - for (it = inst_list->begin(); it != inst_list->end(); it++) { - FuncInst *inst = *it; + 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 * inst_list = funcNode->get_inst_list(); + + model_print("function %s has following actions\n", funcNode->get_func_name()); + func_inst_list_mt::iterator it; + for (it = inst_list->begin(); it != inst_list->end(); it++) { + FuncInst *inst = *it; + model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position()); + } +*/ } }