model: schedule appropriate fence backtracking points

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 64564012fa634f6281ee7d6834facd2ce4dc3da4..dc3f6f4dca002d6e763e5bbf25068260d3edc828 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,7 @@
 
 #include <unistd.h>
 
-#include <threads.h>
 #include "common.h"
-#include "threads-model.h"
 #include "output.h"
 
 #include "datarace.h"
@@ -15,7 +13,8 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-static void param_defaults(struct model_params * params) {
+static void param_defaults(struct model_params *params)
+{
        params->maxreads = 0;
        params->maxfuturedelay = 100;
        params->fairwindow = 0;
@@ -26,7 +25,8 @@ static void param_defaults(struct model_params * params) {
        params->verbose = 0;
 }
 
-static void print_usage(struct model_params *params) {
+static void print_usage(struct model_params *params)
+{
        /* Reset defaults before printing */
        param_defaults(params);
 
@@ -54,11 +54,12 @@ params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expir
        exit(EXIT_SUCCESS);
 }
 
-static void parse_options(struct model_params *params, int *argc, char ***argv) {
+static void parse_options(struct model_params *params, int argc, char **argv)
+{
        const char *shortopts = "hm:M:s:S:f:e:b:v";
        int opt;
        bool error = false;
-       while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+       while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
                switch (opt) {
                case 'h':
                        print_usage(params);
@@ -92,9 +93,15 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
                        break;
                }
        }
-       (*argv)[optind - 1] = (*argv)[0];
-       (*argc) -= (optind - 1);
-       (*argv) += (optind - 1);
+
+       /* Pass remaining arguments to user program */
+       params->argc = argc - (optind - 1);
+       params->argv = argv + (optind - 1);
+
+       /* Reset program name */
+       params->argv[0] = argv[0];
+
+       /* Reset (global) optind for potential use by user program */
        optind = 1;
 
        if (error)
@@ -105,25 +112,21 @@ int main_argc;
 char **main_argv;
 
 /** The model_main function contains the main model checking loop. */
-static void model_main() {
+static void model_main()
+{
        struct model_params params;
 
        param_defaults(&params);
 
-       parse_options(&params, &main_argc, &main_argv);
-
-       /* Pass remaining arguments to user program */
-       params.argc = main_argc;
-       params.argv = main_argv;
+       parse_options(&params, main_argc, main_argv);
 
        //Initialize race detector
        initRaceDetector();
 
-       //Create the singleton SnapshotStack object
-       snapshotObject = new SnapshotStack();
+       snapshot_stack_init();
 
        model = new ModelChecker(params);
-       snapshotObject->snapshotStep(0);
+       snapshot_record(0);
        model->run();
        delete model;
 
@@ -134,7 +137,8 @@ static void model_main() {
  * Main function.  Just initializes snapshotting library and the
  * snapshotting library calls the model_main function.
  */
-int main(int argc, char ** argv) {
+int main(int argc, char **argv)
+{
        main_argc = argc;
        main_argv = argv;
 
@@ -142,5 +146,5 @@ int main(int argc, char ** argv) {
        redirect_output();
 
        /* Let's jump in quickly and start running stuff */
-       initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
+       snapshot_system_init(10000, 1024, 1024, 4000, &model_main);
 }