augment hashtable with keyset

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index df6fff6856ad484013f6386950a869b4727e8607..a484f497458ee078270aa2cd52ccc2a20c551c1a 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -161,16 +161,6 @@ static void install_trace_analyses(ModelExecution *execution)
        }
 }
 
-/** The model_main function contains the main model checking loop. */
-static void model_main()
-{
-       snapshot_record(0);
-       model->run();
-       delete model;
-
-       DEBUG("Exiting\n");
-}
-
 /**
  * Main function.  Just initializes snapshotting library and the
  * snapshotting library calls the model_main function.
@@ -199,6 +189,7 @@ int main(int argc, char **argv)
        if (!model) {
                snapshot_system_init(10000, 1024, 1024, 40000);
                model = new ModelChecker();
+               model->startChecker();
        }
 
        register_plugins();
@@ -213,7 +204,7 @@ int main(int argc, char **argv)
        snapshot_stack_init();
        install_trace_analyses(model->get_execution());
 
-       //Start everything up
-       modelchecker_started = true;
-       startExecution(&model_main);
+       snapshot_record(0);
+       model->startMainThread();
+       DEBUG("Exiting\n");
 }