X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=0d4a6ad7d34b6c62397c2a007da8c1a4a5fcde0a;hb=a5125804a850074c164722b2355bfc181643d7f1;hp=a10bec364c0633ee569306b89243b3f1283fc3d6;hpb=110c70c7f5a9b438ba04824e91a277e73e8334ef;p=c11tester.git diff --git a/main.cc b/main.cc index a10bec36..0d4a6ad7 100644 --- a/main.cc +++ b/main.cc @@ -3,6 +3,8 @@ */ #include +#include +#include #include "common.h" #include "output.h" @@ -11,23 +13,26 @@ /* global "model" object */ #include "model.h" +#include "params.h" #include "snapshot-interface.h" static void param_defaults(struct model_params *params) { params->maxreads = 0; - params->maxfuturedelay = 100; + params->maxfuturedelay = 6; params->fairwindow = 0; params->yieldon = false; + params->yieldblock = false; params->enabledcount = 1; params->bound = 0; params->maxfuturevalues = 0; - params->expireslop = 10; + params->expireslop = 4; params->verbose = !!DBG_ENABLED(); params->uninitvalue = 0; + params->maxexecutions = 0; } -static void print_usage(struct model_params *params) +static void print_usage(const char *program_name, struct model_params *params) { /* Reset defaults before printing */ param_defaults(params); @@ -37,41 +42,98 @@ static void print_usage(struct model_params *params) "Distributed under the GPLv2\n" "Written by Brian Norris and Brian Demsky\n" "\n" -"Usage: [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n" +"Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n" "\n" -"Options:\n" -"-h Display this help message and exit\n" -"-m Maximum times a thread can read from the same write\n" -" while other writes exist. Default: %d\n" -"-M Maximum number of future values that can be sent to\n" -" the same read. Default: %d\n" -"-s Maximum actions that the model checker will wait for\n" -" a write from the future past the expected number of\n" -" actions. Default: %d\n" -"-S Future value expiration sloppiness. Default: %u\n" -"-f Specify a fairness window in which actions that are\n" -" enabled sufficiently many times should receive\n" -" priority for execution. Default: %d\n" -"-y Turn on CHESS yield-based fairness support.\n" -" Default: %d\n" -"-e Enabled count. Default: %d\n" -"-b Upper length bound. Default: %d\n" -"-v Print verbose execution information.\n" -"-u Value for uninitialized reads. Default: %u\n" -"-- Program arguments follow.\n\n", -params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound, params->uninitvalue); +"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" +"\n" +"Model-checker options:\n" +"-h, --help Display this help message and exit\n" +"-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" +"-Y, --yieldblock Prohibit an execution from running a yield.\n" +" Default: %s\n" +"-f, --fairness=WINDOW Specify a fairness window in which actions that are\n" +" enabled sufficiently many times should receive\n" +" priority for execution (not recommended).\n" +" Default: %d\n" +"-e, --enabled=COUNT Enabled count.\n" +" Default: %d\n" +"-b, --bound=MAX Upper length bound.\n" +" Default: %d\n" +"-v[NUM], --verbose[=NUM] Print verbose execution information. NUM is optional:\n" +" 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" +" -- 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->maxexecutions); + exit(EXIT_SUCCESS); } static void parse_options(struct model_params *params, int argc, char **argv) { - const char *shortopts = "hym:M:s:S:f:e:b:u:v"; - int opt; + const char *shortopts = "hyYt:o:m:M:s:S: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'}, + {"enabled", required_argument, NULL, 'e'}, + {"bound", required_argument, NULL, 'b'}, + {"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'}, + {0, 0, 0, 0} /* Terminator */ + }; + int opt, longindex; bool error = false; - while (!error && (opt = getopt(argc, argv, shortopts)) != -1) { + while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) { switch (opt) { case 'h': - print_usage(params); + print_usage(argv[0], params); + break; + case 'x': + params->maxexecutions = atoi(optarg); break; case 's': params->maxfuturedelay = atoi(optarg); @@ -95,7 +157,7 @@ static void parse_options(struct model_params *params, int argc, char **argv) params->maxfuturevalues = atoi(optarg); break; case 'v': - params->verbose = 1; + params->verbose = optarg ? atoi(optarg) : 1; break; case 'u': params->uninitvalue = atoi(optarg); @@ -103,6 +165,21 @@ static void parse_options(struct model_params *params, int argc, char **argv) case 'y': params->yieldon = true; break; +/** case 't': + if (install_plugin(optarg)) + error = true; + break; + case 'o': + { + ModelVector * analyses = getInstalledTraceAnalysis(); + if ( analyses->size() == 0 || (*analyses)[analyses->size()-1]->option(optarg)) + error = true; + } + break; +*/ + case 'Y': + params->yieldblock = true; + break; default: /* '?' */ error = true; break; @@ -120,7 +197,7 @@ static void parse_options(struct model_params *params, int argc, char **argv) optind = 1; if (error) - print_usage(params); + print_usage(argv[0], params); } int main_argc; @@ -140,7 +217,9 @@ static void model_main() snapshot_stack_init(); - model = new ModelChecker(params); + model = new ModelChecker(params); // L: Model thread is created +// install_trace_analyses(model->get_execution()); L: disable plugin + snapshot_record(0); model->run(); delete model; @@ -157,6 +236,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();