remove plugins

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 127ffd160ff8df930d30500b1944ec2a9b107b00..61554eaa8e11b0d684d1d13a9df5d9a60aca2e83 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -15,8 +15,6 @@
 #include "model.h"
 #include "params.h"
 #include "snapshot-interface.h"
-#include "scanalysis.h"
-#include "plugins.h"
 
 static void param_defaults(struct model_params *params)
 {
@@ -36,7 +34,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);
 
@@ -104,26 +101,8 @@ static void print_usage(const char *program_name, struct model_params *params)
     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)
@@ -141,9 +120,9 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                {"enabled", required_argument, NULL, 'e'},
                {"bound", required_argument, NULL, 'b'},
                {"verbose", optional_argument, NULL, 'v'},
-               {"uninitialized", optional_argument, NULL, 'u'},
-               {"analysis", optional_argument, NULL, 't'},
-               {"options", optional_argument, NULL, 'o'},
+               {"uninitialized", required_argument, NULL, 'u'},
+               {"analysis", required_argument, NULL, 't'},
+               {"options", required_argument, NULL, 'o'},
                {"maxexecutions", required_argument, NULL, 'x'},
                {0, 0, 0, 0} /* Terminator */
        };
@@ -187,7 +166,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 +177,7 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                                        error = true;
                        }
                        break;
+*/
                case 'Y':
                        params->yieldblock = true;
                        break;
@@ -224,23 +204,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);
-       }
-}
-
 /** 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);
 
@@ -249,8 +218,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();
@@ -268,6 +237,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();