X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=3716d78838ba26ab694ef6faca6d66aa283b1b04;hb=11265e873a6618952820f76da4d702a6485b4678;hp=2ffa22a1028a8008c1c60e52e8e9fee627fac766;hpb=9397658596cfa29f81242b5f06e80d1d9cdf6d14;p=c11tester.git diff --git a/model.cc b/model.cc index 2ffa22a1..3716d788 100644 --- a/model.cc +++ b/model.cc @@ -85,7 +85,7 @@ Thread * ModelChecker::schedule_next_thread() return t; } -/* +/** * get_next_replay_thread() - Choose the next thread in the replay sequence * * If we've reached the 'diverge' point, then we pick a thread from the @@ -154,7 +154,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act) action_list_t::reverse_iterator rit; for (rit = action_trace->rbegin(); rit != action_trace->rend(); rit++) { ModelAction *prev = *rit; - if (act->is_dependent(prev)) + if (act->is_synchronizing(prev)) return prev; } return NULL; @@ -265,7 +265,7 @@ void ModelChecker::print_summary(void) { printf("\n"); printf("Number of executions: %d\n", num_executions); - printf("Total nodes created: %d\n", Node::get_total_nodes()); + printf("Total nodes created: %d\n", node_stack->get_total_nodes()); scheduler->print();