bug fixes

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 7f38adc37e149403828d993676e366fb70bc653d..b4bbb70e926bfdba2610509f4cdfc8265b137e1d 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -162,7 +162,7 @@ void ModelChecker::print_bugs() const
                                                        bugs->size(),
                                                        bugs->size() > 1 ? "s" : "");
        for (unsigned int i = 0;i < bugs->size();i++)
                                                        bugs->size(),
                                                        bugs->size() > 1 ? "s" : "");
        for (unsigned int i = 0;i < bugs->size();i++)

-               (*bugs)[i]->print();
+               (*bugs)[i] -> print();

 }
 
 /**
 }
 
 /**


@@ -173,15 +173,15 @@ void ModelChecker::print_bugs() const
  */
 void ModelChecker::record_stats()
 {
  */
 void ModelChecker::record_stats()
 {

-       stats.num_total++;
+       stats.num_total ++;

        if (!execution->isfeasibleprefix())
        if (!execution->isfeasibleprefix())

-               stats.num_infeasible++;
+               stats.num_infeasible ++;

        else if (execution->have_bug_reports())
        else if (execution->have_bug_reports())

-               stats.num_buggy_executions++;
+               stats.num_buggy_executions ++;

        else if (execution->is_complete_execution())
        else if (execution->is_complete_execution())

-               stats.num_complete++;
+               stats.num_complete ++;

        else {
        else {

-               stats.num_redundant++;
+               stats.num_redundant ++;

 
                /**
                 * @todo We can violate this ASSERT() when fairness/sleep sets
 
                /**
                 * @todo We can violate this ASSERT() when fairness/sleep sets


@@ -262,15 +262,15 @@ bool ModelChecker::next_execution()
                return true;
        }
 // test code
                return true;
        }
 // test code

-       execution_number++;
+       execution_number ++;

        reset_to_initial_state();
        return false;
 }
 
 /** @brief Run trace analyses on complete trace */
 void ModelChecker::run_trace_analyses() {
        reset_to_initial_state();
        return false;
 }
 
 /** @brief Run trace analyses on complete trace */
 void ModelChecker::run_trace_analyses() {

-       for (unsigned int i = 0;i < trace_analyses.size();i++)
-               trace_analyses[i]->analyze(execution->get_action_trace());
+       for (unsigned int i = 0;i < trace_analyses.size();i ++)
+               trace_analyses[i] -> analyze(execution->get_action_trace());

 }
 
 /**
 }
 
 /**


@@ -373,7 +373,9 @@ void ModelChecker::do_restart()
 }
 
 void ModelChecker::startMainThread() {
 }
 
 void ModelChecker::startMainThread() {

-       init_thread->setContext();
+       init_thread->set_state(THREAD_RUNNING);
+       scheduler->set_current_thread(init_thread);
+       thread_startup();

 }
 
 /** @brief Run ModelChecker for the user program */
 }
 
 /** @brief Run ModelChecker for the user program */


@@ -383,7 +385,7 @@ void ModelChecker::run()
        char random_state[256];
        initstate(423121, random_state, sizeof(random_state));
 
        char random_state[256];
        initstate(423121, random_state, sizeof(random_state));
 

-       for(int exec = 0;exec < params.maxexecutions;exec++) {
+       for(int exec = 0;exec < params.maxexecutions;exec ++) {

                Thread * t = init_thread;
 
                do {
                Thread * t = init_thread;
 
                do {