More code towards freeing old actions

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 5bee8ce6aac0c45e62c34d36c82113f8cdf6892e..17bc71c86a87783614ffe5200e68d54ff0fc12c1 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -20,10 +20,9 @@
 void param_defaults(struct model_params *params)
 {
        params->verbose = !!DBG_ENABLED();
-       params->uninitvalue = 0;
        params->maxexecutions = 10;
+       params->tracebound = 0;
        params->nofork = false;
-       params->threadsnocleanup = false;
 }
 
 static void print_usage(struct model_params *params)
@@ -37,7 +36,7 @@ static void print_usage(struct model_params *params)
                "Distributed under the GPLv2\n"
                "Written by Brian Norris and Brian Demsky\n"
                "\n"
-               "Usage: [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n"
+               "Usage: C11TESTER=[MODEL-CHECKER OPTIONS]\n"
                "\n"
                "MODEL-CHECKER OPTIONS can be any of the model-checker options listed below. Arguments\n"
                "provided after the `--' (the PROGRAM ARGS) are passed to the user program.\n"
@@ -48,21 +47,13 @@ static void print_usage(struct model_params *params)
                "                              0 is quiet; 1 shows valid executions; 2 is noisy;\n"
                "                              3 is noisier.\n"
                "                              Default: %d\n"
-               "-u, --uninitialized=VALUE   Return VALUE any load which may read from an\n"
-               "                              uninitialized atomic.\n"
-               "                              Default: %u\n"
                "-t, --analysis=NAME         Use Analysis Plugin.\n"
                "-o, --options=NAME          Option for previous analysis plugin.  \n"
                "-x, --maxexec=NUM           Maximum number of executions.\n"
                "                            Default: %u\n"
                "                            -o help for a list of options\n"
-               "-n                          No fork\n"
-#ifdef TLS
-               "-d                          Don't allow threads to cleanup\n"
-#endif
-               " --                         Program arguments follow.\n\n",
+               "-n                          No fork\n\n",
                params->verbose,
-               params->uninitvalue,
                params->maxexecutions);
        model_print("Analysis plugins:\n");
        for(unsigned int i=0;i<registeredanalysis->size();i++) {
@@ -88,11 +79,10 @@ bool install_plugin(char * name) {
 }
 
 void parse_options(struct model_params *params) {
-       const char *shortopts = "hdnt:o:u:x:v::";
+       const char *shortopts = "hnt:o:x:v::";
        const struct option longopts[] = {
                {"help", no_argument, NULL, 'h'},
                {"verbose", optional_argument, NULL, 'v'},
-               {"uninitialized", required_argument, NULL, 'u'},
                {"analysis", required_argument, NULL, 't'},
                {"options", required_argument, NULL, 'o'},
                {"maxexecutions", required_argument, NULL, 'x'},
@@ -106,17 +96,23 @@ void parse_options(struct model_params *params) {
        if (options == NULL)
                return;
        int argc = 1;
-       for(int index = 0;options[index]!=0;index++) {
+       int index;
+       for(index = 0;options[index]!=0;index++) {
                if (options[index] == ' ')
                        argc++;
        }
        argc++; //first parameter is executable name
+       char optcpy[index + 1];
+       memcpy(optcpy, options, index+1);
        char * argv[argc + 1];
        argv[0] = NULL;
-       argv[1] = options;
-       for(int index = 0, count = 2;options[index]!=0;index++) {
-               if (options[index]==' ')
-                       argv[count++] = &options[index];
+       argv[1] = optcpy;
+       int count = 2;
+       for(index = 0;optcpy[index]!=0;index++) {
+               if (optcpy[index] == ' ') {
+                       argv[count++] = &optcpy[index+1];
+                       optcpy[index] = 0;
+               }
        }
 
        while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) {
@@ -124,9 +120,6 @@ void parse_options(struct model_params *params) {
                case 'h':
                        print_usage(params);
                        break;
-               case 'd':
-                       params->threadsnocleanup = true;
-                       break;
                case 'n':
                        params->nofork = true;
                        break;
@@ -136,9 +129,6 @@ void parse_options(struct model_params *params) {
                case 'v':
                        params->verbose = optarg ? atoi(optarg) : 1;
                        break;
-               case 'u':
-                       params->uninitvalue = atoi(optarg);
-                       break;
                case 't':
                        if (install_plugin(optarg))
                                error = true;
@@ -163,8 +153,7 @@ void parse_options(struct model_params *params) {
                print_usage(params);
 }
 
-static void install_trace_analyses(ModelExecution *execution)
-{
+void install_trace_analyses(ModelExecution *execution) {
        ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
        for(unsigned int i=0;i<installedanalysis->size();i++) {
                TraceAnalysis * ta=(*installedanalysis)[i];
@@ -174,44 +163,3 @@ static void install_trace_analyses(ModelExecution *execution)
                ta->actionAtInstallation();
        }
 }
-
-/**
- * Main function.  Just initializes snapshotting library and the
- * snapshotting library calls the model_main function.
- */
-int main(int argc, char **argv)
-{
-       /*
-        * If this printf statement is removed, C11Tester will fail on an
-        * assert on some versions of glibc.  The first time printf is
-        * called, it allocated internal buffers.  We can't easily snapshot
-        * libc since we also use it.
-        */
-
-       printf("C11Tester\n"
-                                "Copyright (c) 2013 and 2019 Regents of the University of California. All rights reserved.\n"
-                                "Distributed under the GPLv2\n"
-                                "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
-
-
-       //Initialize snapshotting library and model checker object
-       if (!model) {
-               snapshot_system_init(10000, 1024, 1024, 40000);
-               model = new ModelChecker();
-               model->startChecker();
-       }
-
-       /* Configure output redirection for the model-checker */
-       redirect_output();
-       register_plugins();
-
-       //Stash command line options
-       model_params *params = model->getParams();
-       params->argc = argc;
-       params->argv = argv;
-
-       install_trace_analyses(model->get_execution());
-
-       model->startMainThread();
-       DEBUG("Exiting\n");
-}