X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.cc;h=c1c9edf5ae16bf9f4bd47b53333512e6e571ab31;hp=cb2df7a4659185bd1313db26004b91497477ebe2;hb=9f4ad85b11b8995690bb13097c5515bcd44f3a09;hpb=ea1b819b2f1abb0142267f0543b8d7c946658083 diff --git a/history.cc b/history.cc index cb2df7a4..c1c9edf5 100644 --- a/history.cc +++ b/history.cc @@ -13,61 +13,64 @@ ModelHistory::ModelHistory() : func_counter(1), /* function id starts with 1 */ func_map(), func_map_rev(), - func_nodes() + 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 * thrd_func_list = model->get_execution()->get_thrd_func_list(); SnapVector< SnapList *> * thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists(); if ( thrd_func_list->size() <= id ) { + uint oldsize = thrd_func_list->size(); thrd_func_list->resize( id + 1 ); + 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); + } + 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); - if (func_list == NULL) { - func_list = new func_id_list_t(); - thrd_func_list->at(id) = func_list; - } - if (func_inst_lists == NULL) { func_inst_lists = new SnapList< func_inst_list_t *>(); thrd_func_inst_lists->at(id) = func_inst_lists; } - func_list->push_back(func_id); + (*thrd_func_list)[id].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 * 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); - - uint32_t last_func_id = func_list->back(); + uint32_t last_func_id = (*thrd_func_list)[id].back(); if (last_func_id == func_id) { - /* clear read map upon exiting functions */ FuncNode * func_node = func_nodes[func_id]; func_node->clear_read_map(tid); func_inst_list_t * curr_inst_list = func_inst_lists->back(); func_node->link_insts(curr_inst_list); - func_list->pop_back(); + (*thrd_func_list)[id].pop_back(); func_inst_lists->pop_back(); } else { model_print("trying to exit with a wrong function id\n"); @@ -83,7 +86,7 @@ void ModelHistory::resize_func_nodes(uint32_t new_size) if ( old_size < new_size ) func_nodes.resize(new_size); - for (uint32_t id = old_size; id < new_size; id++) { + 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); @@ -96,23 +99,21 @@ 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 * thrd_func_list = model->get_execution()->get_thrd_func_list(); SnapVector< SnapList *> * thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_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); + uint32_t func_id = (*thrd_func_list)[id].back(); SnapList * func_inst_lists = thrd_func_inst_lists->at(id); - uint32_t func_id = func_list->back(); - - if ( func_nodes.size() <= func_id ) + if (func_id == 0) + return; + else if ( func_nodes.size() <= func_id ) resize_func_nodes( func_id + 1 ); FuncNode * func_node = func_nodes[func_id]; @@ -127,6 +128,9 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid) if (inst->is_read()) func_node->store_read(act, tid); + if (inst->is_write()) + add_to_write_history(act->get_location(), act->get_write_value()); + /* add to curr_inst_list */ func_inst_list_t * curr_inst_list = func_inst_lists->back(); ASSERT(curr_inst_list != NULL); @@ -142,21 +146,54 @@ FuncNode * ModelHistory::get_func_node(uint32_t func_id) return func_nodes[func_id]; } -void ModelHistory::print() +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); + + ASSERT( thrd_func_list->size() > id ); + uint32_t func_id = (*thrd_func_list)[id].back(); + FuncNode * func_node = func_nodes[func_id]; + + 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); + + 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_func_node() { /* function id starts with 1 */ - for (uint32_t i = 1;i < func_nodes.size();i++) { + for (uint32_t i = 1; i < func_nodes.size(); i++) { FuncNode * func_node = func_nodes[i]; func_inst_list_mt * entry_insts = func_node->get_entry_insts(); model_print("function %s has entry actions\n", func_node->get_func_name()); - func_inst_list_mt::iterator it; - for (it = entry_insts->begin();it != entry_insts->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(); @@ -166,6 +203,6 @@ void ModelHistory::print() FuncInst *inst = *it; model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position()); } - */ +*/ } }