snapshot: make other file-scope functions static

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 274a2d928102f9d2348114e5085f4781f69fe0b6..3716d78838ba26ab694ef6faca6d66aa283b1b04 100644 (file)
--- 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;
@@ -211,7 +211,8 @@ void ModelChecker::check_current_action(void)
                return;
        }
 
-       curr = node_stack->explore_action(curr, get_parent_action(curr->get_tid()));
+       curr = node_stack->explore_action(curr);
+       curr->create_cv(get_parent_action(curr->get_tid()));
 
        /* Assign 'creation' parent */
        if (curr->get_type() == THREAD_CREATE) {
@@ -264,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();