remove old release sequences
[c11tester.git] / main.cc
diff --git a/main.cc b/main.cc
index 0d1fa1cc31bb93e3c8e740886f8464dc379d788d..4d308a81bc65bd36c8e7729c7389cc3cdf6e961c 100644 (file)
--- a/main.cc
+++ b/main.cc
 #include "model.h"
 #include "params.h"
 #include "snapshot-interface.h"
-#include "scanalysis.h"
-#include "plugins.h"
 
 static void param_defaults(struct model_params *params)
 {
        params->maxreads = 0;
-       params->maxfuturedelay = 6;
        params->fairwindow = 0;
        params->yieldon = false;
        params->yieldblock = false;
        params->enabledcount = 1;
        params->bound = 0;
-       params->maxfuturevalues = 0;
-       params->expireslop = 4;
        params->verbose = !!DBG_ENABLED();
        params->uninitvalue = 0;
        params->maxexecutions = 0;
@@ -36,7 +31,6 @@ static void param_defaults(struct model_params *params)
 
 static void print_usage(const char *program_name, struct model_params *params)
 {
-       ModelVector<TraceAnalysis *> * registeredanalysis=getRegisteredTraceAnalysis();
        /* Reset defaults before printing */
        param_defaults(params);
 
@@ -55,15 +49,6 @@ static void print_usage(const char *program_name, struct model_params *params)
 "-m, --liveness=NUM          Maximum times a thread can read from the same write\n"
 "                              while other writes exist.\n"
 "                              Default: %d\n"
-"-M, --maxfv=NUM             Maximum number of future values that can be sent to\n"
-"                              the same read.\n"
-"                              Default: %d\n"
-"-s, --maxfvdelay=NUM        Maximum actions that the model checker will wait for\n"
-"                              a write from the future past the expected number\n"
-"                              of actions.\n"
-"                              Default: %d\n"
-"-S, --fvslop=NUM            Future value expiration sloppiness.\n"
-"                              Default: %u\n"
 "-y, --yield                 Enable CHESS-like yield-based fairness support\n"
 "                              (requires thrd_yield() in test program).\n"
 "                              Default: %s\n"
@@ -92,49 +77,24 @@ static void print_usage(const char *program_name, struct model_params *params)
 " --                         Program arguments follow.\n\n",
                program_name,
                params->maxreads,
-               params->maxfuturevalues,
-               params->maxfuturedelay,
-               params->expireslop,
                params->yieldon ? "enabled" : "disabled",
                params->yieldblock ? "enabled" : "disabled",
                params->fairwindow,
                params->enabledcount,
                params->bound,
                params->verbose,
-    params->uninitvalue,
+               params->uninitvalue,
                params->maxexecutions);
-       model_print("Analysis plugins:\n");
-       for(unsigned int i=0;i<registeredanalysis->size();i++) {
-               TraceAnalysis * analysis=(*registeredanalysis)[i];
-               model_print("%s\n", analysis->name());
-       }
-       exit(EXIT_SUCCESS);
-}
-
-bool install_plugin(char * name) {
-       ModelVector<TraceAnalysis *> * registeredanalysis=getRegisteredTraceAnalysis();
-       ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
 
-       for(unsigned int i=0;i<registeredanalysis->size();i++) {
-               TraceAnalysis * analysis=(*registeredanalysis)[i];
-               if (strcmp(name, analysis->name())==0) {
-                       installedanalysis->push_back(analysis);
-                       return false;
-               }
-       }
-       model_print("Analysis %s Not Found\n", name);
-       return true;
+       exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int argc, char **argv)
 {
-       const char *shortopts = "hyYt:o:m:M:s:S:f:e:b:u:x:v::";
+       const char *shortopts = "hyYt:o:m:f:e:b:u:x:v::";
        const struct option longopts[] = {
                {"help", no_argument, NULL, 'h'},
                {"liveness", required_argument, NULL, 'm'},
-               {"maxfv", required_argument, NULL, 'M'},
-               {"maxfvdelay", required_argument, NULL, 's'},
-               {"fvslop", required_argument, NULL, 'S'},
                {"fairness", required_argument, NULL, 'f'},
                {"yield", no_argument, NULL, 'y'},
                {"yieldblock", no_argument, NULL, 'Y'},
@@ -157,12 +117,6 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'x':
                        params->maxexecutions = atoi(optarg);
                        break;
-               case 's':
-                       params->maxfuturedelay = atoi(optarg);
-                       break;
-               case 'S':
-                       params->expireslop = atoi(optarg);
-                       break;
                case 'f':
                        params->fairwindow = atoi(optarg);
                        break;
@@ -175,9 +129,6 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'm':
                        params->maxreads = atoi(optarg);
                        break;
-               case 'M':
-                       params->maxfuturevalues = atoi(optarg);
-                       break;
                case 'v':
                        params->verbose = optarg ? atoi(optarg) : 1;
                        break;
@@ -187,7 +138,7 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'y':
                        params->yieldon = true;
                        break;
-               case 't':
+/**            case 't':
                        if (install_plugin(optarg))
                                error = true;
                        break;
@@ -198,6 +149,7 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                                        error = true;
                        }
                        break;
+*/
                case 'Y':
                        params->yieldblock = true;
                        break;
@@ -224,25 +176,12 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 int main_argc;
 char **main_argv;
 
-static void install_trace_analyses(ModelExecution *execution)
-{
-       ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
-       for(unsigned int i=0;i<installedanalysis->size();i++) {
-               TraceAnalysis * ta=(*installedanalysis)[i];
-               ta->setExecution(execution);
-               model->add_trace_analysis(ta);
-               /** Call the installation event for each installed plugin */
-               ta->actionAtInstallation();
-       }
-}
-
 /** The model_main function contains the main model checking loop. */
 static void model_main()
 {
        struct model_params params;
 
        param_defaults(&params);
-       register_plugins();
 
        parse_options(&params, main_argc, main_argv);
 
@@ -251,8 +190,8 @@ static void model_main()
 
        snapshot_stack_init();
 
-       model = new ModelChecker(params);
-       install_trace_analyses(model->get_execution());
+       model = new ModelChecker(params);       // L: Model thread is created
+//     install_trace_analyses(model->get_execution());         L: disable plugin
 
        snapshot_record(0);
        model->run();
@@ -270,6 +209,18 @@ int main(int argc, char **argv)
        main_argc = argc;
        main_argv = argv;
 
+       /*
+        * If this printf statement is removed, CDSChecker 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("CDSChecker\n"
+                                "Copyright (c) 2013 Regents of the University of California. All rights reserved.\n"
+                                "Distributed under the GPLv2\n"
+                                "Written by Brian Norris and Brian Demsky\n\n");
+
        /* Configure output redirection for the model-checker */
        redirect_output();