#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;
}
static void print_usage(const char *program_name, struct model_params *params)
"\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[NUM], --verbose[=NUM] Print verbose execution information. NUM is optional:\n"
-" 0 is quiet; 1 is noisy; 2 is noisier.\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->uninitvalue,
+ params->maxexecutions);
model_print("Analysis plugins:\n");
for(unsigned int i=0;i<registeredanalysis->size();i++) {
TraceAnalysis * analysis=(*registeredanalysis)[i];
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 = "ht:o: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", 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 */
};
int opt, longindex;
case 'h':
print_usage(argv[0], params);
break;
- case 's':
- params->maxfuturedelay = atoi(optarg);
- break;
- case 'S':
- params->expireslop = atoi(optarg);
- break;
- case 'f':
- params->fairwindow = atoi(optarg);
+ case 'x':
+ params->maxexecutions = atoi(optarg);
break;
case 'e':
params->enabledcount = atoi(optarg);
case 'b':
params->bound = atoi(optarg);
break;
- case 'm':
- params->maxreads = atoi(optarg);
- break;
- case 'M':
- params->maxfuturevalues = atoi(optarg);
- break;
case 'v':
params->verbose = optarg ? atoi(optarg) : 1;
break;
case 'u':
params->uninitvalue = atoi(optarg);
break;
- case 'y':
- params->yieldon = true;
- break;
case 't':
if (install_plugin(optarg))
error = true;
error = true;
}
break;
- case 'Y':
- params->yieldblock = true;
- break;
default: /* '?' */
error = true;
break;
TraceAnalysis * ta=(*installedanalysis)[i];
ta->setExecution(execution);
model->add_trace_analysis(ta);
+ /** Call the installation event for each installed plugin */
+ ta->actionAtInstallation();
}
}
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();
projects / c11tester.git / blobdiff