X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=590a41d27f33c07118592912fc73f582a4624050;hp=5a33baf996bc3d0f85f11108797b8907c89b6507;hb=c522e1dd1ccc11827ac2fce444764081dca25746;hpb=a4d3f2ae3f3a9e2a30cc36c92cee9f83bb09e9b1 diff --git a/main.cc b/main.cc index 5a33baf9..590a41d2 100644 --- a/main.cc +++ b/main.cc @@ -15,22 +15,15 @@ #include "model.h" #include "params.h" #include "snapshot-interface.h" -#include "scanalysis.h" #include "plugins.h" -static void param_defaults(struct model_params *params) +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 = 10; + params->nofork = false; + params->threadsnocleanup = false; } static void print_usage(const char *program_name, struct model_params *params) @@ -40,61 +33,39 @@ static void print_usage(const char *program_name, struct model_params *params) param_defaults(params); model_print( -"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" -"Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n" -"\n" -"MODLE-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" -" 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, --verbose Print verbose execution information.\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" -" -o help for a list of options\n" -" -- Program arguments follow.\n\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" + "Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\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" + "\n" + "Model-checker options:\n" + "-h, --help Display this help message and exit\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" + "-n No fork\n" +#ifdef TLS + "-d Don't allow threads to cleanup\n" +#endif + " -- 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->uninitvalue); - model_print("Analysis plug ins:\n"); + params->verbose, + params->uninitvalue, + params->maxexecutions); + model_print("Analysis plugins:\n"); for(unsigned int i=0;isize();i++) { TraceAnalysis * analysis=(*registeredanalysis)[i]; model_print("%s\n", analysis->name()); @@ -119,23 +90,15 @@ bool install_plugin(char * name) { 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:v::"; + const char *shortopts = "hdnt:o: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", optional_argument, NULL, 'u'}, - {"analysis", optional_argument, NULL, 't'}, - {"options", optional_argument, NULL, 'o'}, - {0, 0, 0, 0} /* Terminator */ + {"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; @@ -144,26 +107,14 @@ static void parse_options(struct model_params *params, int argc, char **argv) case 'h': print_usage(argv[0], params); break; - case 's': - params->maxfuturedelay = atoi(optarg); + case 'd': + params->threadsnocleanup = true; break; - case 'S': - params->expireslop = atoi(optarg); + case 'n': + params->nofork = true; break; - case 'f': - params->fairwindow = atoi(optarg); - break; - case 'e': - params->enabledcount = atoi(optarg); - break; - case 'b': - params->bound = atoi(optarg); - break; - case 'm': - params->maxreads = atoi(optarg); - break; - case 'M': - params->maxfuturevalues = atoi(optarg); + case 'x': + params->maxexecutions = atoi(optarg); break; case 'v': params->verbose = optarg ? atoi(optarg) : 1; @@ -171,24 +122,18 @@ static void parse_options(struct model_params *params, int argc, char **argv) case 'u': params->uninitvalue = atoi(optarg); break; - 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: /* '?' */ + { + ModelVector * analyses = getInstalledTraceAnalysis(); + if ( analyses->size() == 0 || (*analyses)[analyses->size()-1]->option(optarg)) + error = true; + } + break; + default: /* '?' */ error = true; break; } @@ -218,34 +163,11 @@ static void install_trace_analyses(ModelExecution *execution) 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(¶ms); - register_plugins(); - - parse_options(¶ms, main_argc, main_argv); - - //Initialize race detector - initRaceDetector(); - - snapshot_stack_init(); - - model = new ModelChecker(params); - install_trace_analyses(model->get_execution()); - - snapshot_record(0); - model->run(); - delete model; - - DEBUG("Exiting\n"); -} - /** * Main function. Just initializes snapshotting library and the * snapshotting library calls the model_main function. @@ -255,9 +177,38 @@ int main(int argc, char **argv) main_argc = argc; main_argv = 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(); - /* Let's jump in quickly and start running stuff */ - snapshot_system_init(10000, 1024, 1024, 4000, &model_main); + register_plugins(); + + //Parse command line options + model_params *params = model->getParams(); + parse_options(params, main_argc, main_argv); + + + install_trace_analyses(model->get_execution()); + + model->startMainThread(); + DEBUG("Exiting\n"); }