#include "snapshot-interface.h"
#include "plugins.h"
-static void param_defaults(struct model_params *params)
+void param_defaults(struct model_params *params)
{
params->verbose = !!DBG_ENABLED();
params->uninitvalue = 0;
}
}
-/** The model_main function contains the main model checking loop. */
-static void model_main()
-{
- struct model_params params;
-
- param_defaults(¶ms);
- register_plugins();
-
- parse_options(¶ms, main_argc, main_argv);
-
- //Initialize race detector
- initRaceDetector();
-
- snapshot_stack_init();
-
- if (!model)
- model = new ModelChecker();
- model->setParams(params);
- install_trace_analyses(model->get_execution());
-
- 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.
/* Configure output redirection for the model-checker */
redirect_output();
- /* Let's jump in quickly and start running stuff */
- snapshot_system_init(10000, 1024, 1024, 40000, &model_main);
+ //Initialize snapshotting library and model checker object
+ if (!model) {
+ snapshot_system_init(10000, 1024, 1024, 40000);
+ model = new ModelChecker();
+ model->startChecker();
+ }
+
+ register_plugins();
+
+ //Parse command line options
+ model_params *params = model->getParams();
+ parse_options(params, main_argc, main_argv);
+
+
+ snapshot_stack_init();
+ install_trace_analyses(model->get_execution());
+
+ snapshot_record(0);
+ model->startMainThread();
+ DEBUG("Exiting\n");
}