func_map(),
func_map_rev(),
func_nodes(),
- write_history()
+ write_history(), // snapshot data structure
+ loc_func_nodes_map() // shapshot data structure
{}
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);
+ uint id = id_to_int(tid);
SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
- SnapVector< SnapList<func_inst_list_t *> *> *
- thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+ SnapVector< SnapList<action_list_t *> *> *
+ 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 );
- }
-
- SnapList<func_inst_list_t *> * 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_inst_lists == NULL) {
- func_inst_lists = new SnapList< func_inst_list_t *>();
- thrd_func_inst_lists->at(id) = func_inst_lists;
+ thrd_func_act_lists->resize( id + 1 );
+ for (uint i = oldsize; i < id + 1; i++) {
+ (*thrd_func_act_lists)[i] = new SnapList<action_list_t *>();
+ }
}
+ SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+
(*thrd_func_list)[id].push_back(func_id);
- func_inst_lists->push_back( new func_inst_list_t() );
+ func_act_lists->push_back( new action_list_t() );
if ( func_nodes.size() <= func_id )
resize_func_nodes( func_id + 1 );
{
uint32_t id = id_to_int(tid);
SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
- SnapVector< SnapList<func_inst_list_t *> *> *
- thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+ SnapVector< SnapList<action_list_t *> *> *
+ thrd_func_act_lists = model->get_execution()->get_thrd_func_act_lists();
- SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+ SnapList<action_list_t *> * 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->clear_read_map(tid);
-
- func_inst_list_t * curr_inst_list = func_inst_lists->back();
- func_node->link_insts(curr_inst_list);
+ //func_node->clear_read_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 2 times) so that more information can be gathered to infer nullity predicates.
+ */
+ func_node->incr_exit_count();
+ if (func_node->get_exit_count() >= 2) {
+ ModelList<action_list_t *> * 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);
(*thrd_func_list)[id].pop_back();
- func_inst_lists->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);
for (uint32_t id = old_size;id < new_size;id++) {
const char * func_name = func_map_rev[id];
- FuncNode * func_node = new FuncNode();
+ FuncNode * func_node = new FuncNode(this);
func_node->set_func_id(id);
func_node->set_func_name(func_name);
func_nodes[id] = func_node;
/* return if thread i has not entered any function or has exited
from all functions */
SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
- SnapVector< SnapList<func_inst_list_t *> *> *
- thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+ SnapVector< SnapList<action_list_t *> *> *
+ 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 )
/* get the function id that thread i is currently in */
uint32_t func_id = (*thrd_func_list)[id].back();
- SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+ SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+
+ if (act->is_write()) {
+ void * location = act->get_location();
+ uint64_t value = act->get_write_value();
+ add_to_write_history(location, value);
+
+ /* update FuncNodes */
+ SnapList<FuncNode *> * func_nodes = loc_func_nodes_map.get(location);
+ sllnode<FuncNode *> * it = NULL;
+ if (func_nodes != NULL)
+ it = func_nodes->begin();
+
+ for (; it != NULL; it = it->getNext()) {
+ FuncNode * func_node = it->getVal();
+ func_node->add_to_val_loc_map(value, location);
+ }
+ }
+
+ /* the following does not care about actions without a position */
+ if (func_id == 0 || act->get_position() == NULL)
+ return;
if ( func_nodes.size() <= func_id )
resize_func_nodes( func_id + 1 );
FuncNode * func_node = func_nodes[func_id];
- ASSERT (func_node != NULL);
- /* add corresponding FuncInst to func_node */
- FuncInst * inst = func_node->get_or_add_action(act);
+// if (act->is_read())
+// func_node->store_read(act, tid);
- if (inst == NULL)
- return;
+ /* add to curr_inst_list */
+ bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
+ if (!second_part_of_rmw) {
+ action_list_t * curr_act_list = func_act_lists->back();
+ ASSERT(curr_act_list != NULL);
- // if (inst->is_read())
- // func_node->store_read(act, tid);
+ ModelAction * last_act = NULL;
+ if (curr_act_list->size() != 0)
+ last_act = curr_act_list->back();
- if (inst->is_write())
- add_to_write_history(act->get_location(), act->get_write_value());
+ // do not add actions with the same sequence number twice
+ if (last_act != NULL && last_act->get_seq_number() == act->get_seq_number())
+ return;
- /* add to curr_inst_list */
- func_inst_list_t * curr_inst_list = func_inst_lists->back();
- ASSERT(curr_inst_list != NULL);
- curr_inst_list->push_back(inst);
+ curr_act_list->push_back(act);
+ func_node->add_inst(act);
+ }
}
/* return the FuncNode given its func_id */
FuncNode * ModelHistory::get_func_node(uint32_t func_id)
{
- if (func_nodes.size() <= func_id) // this node has not been added
+ if (func_nodes.size() <= func_id) // this node has not been added to func_nodes
return NULL;
return func_nodes[func_id];
}
+/*
uint64_t ModelHistory::query_last_read(void * location, thread_id_t tid)
{
SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
return last_read_val;
}
+*/
void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
{
- if ( !write_history.contains(location) )
- write_history.put(location, new write_set_t() );
+ value_set_t * write_set = write_history.get(location);
+
+ if (write_set == NULL) {
+ write_set = new value_set_t();
+ write_history.put(location, write_set);
+ }
- write_set_t * write_set = write_history.get(location);
write_set->add(write_val);
}
-void ModelHistory::print()
+void ModelHistory::add_to_loc_func_nodes_map(void * location, FuncNode * node)
+{
+ SnapList<FuncNode *> * func_node_list = loc_func_nodes_map.get(location);
+ if (func_node_list == NULL) {
+ func_node_list = new SnapList<FuncNode *>();
+ loc_func_nodes_map.put(location, func_node_list);
+ }
+
+ func_node_list->push_back(node);
+}
+
+void ModelHistory::set_new_exec_flag()
+{
+ for (uint i = 1; i < func_nodes.size(); i++) {
+ FuncNode * func_node = func_nodes[i];
+ func_node->set_new_exec_flag();
+ }
+}
+
+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<FuncInst*>* 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();
FuncInst *inst = *it;
model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
}
- */
+*/
}
}
projects / c11tester.git / blobdiff