void param_defaults(struct model_params *params)
{
params->verbose = !!DBG_ENABLED();
- params->uninitvalue = 0;
params->maxexecutions = 10;
+ params->traceminsize = 0;
+ params->checkthreshold = 500000;
+ params->removevisible = false;
params->nofork = false;
}
" 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\n"
+ "-n No fork\n"
+ "-m, --minsize=NUM Minimum number of actions to keep\n"
+ " Default: %u\n"
+ "-f, --freqfree=NUM Frequency to free actions\n"
+ " Default: %u\n"
+ "-r, --removevisible Free visible writes\n",
params->verbose,
- params->uninitvalue,
- params->maxexecutions);
+ params->maxexecutions,
+ params->traceminsize,
+ params->checkthreshold);
model_print("Analysis plugins:\n");
for(unsigned int i=0;i<registeredanalysis->size();i++) {
TraceAnalysis * analysis=(*registeredanalysis)[i];
}
void parse_options(struct model_params *params) {
- const char *shortopts = "hnt:o:u:x:v::";
+ const char *shortopts = "hrnt:o:x:v:m:f:";
const struct option longopts[] = {
{"help", no_argument, NULL, 'h'},
- {"verbose", optional_argument, NULL, 'v'},
- {"uninitialized", required_argument, NULL, 'u'},
+ {"removevisible", no_argument, NULL, 'r'},
{"analysis", required_argument, NULL, 't'},
{"options", required_argument, NULL, 'o'},
{"maxexecutions", required_argument, NULL, 'x'},
+ {"verbose", optional_argument, NULL, 'v'},
+ {"minsize", required_argument, NULL, 'm'},
+ {"freqfree", required_argument, NULL, 'f'},
{0, 0, 0, 0} /* Terminator */
};
int opt, longindex;
- int tmpoptind = optind;
bool error = false;
char * options = getenv("C11TESTER");
if (options == NULL)
return;
int argc = 1;
- for(int index = 0;options[index]!=0;index++) {
+ int index;
+ for(index = 0;options[index]!=0;index++) {
if (options[index] == ' ')
argc++;
}
argc++; //first parameter is executable name
+ char optcpy[index + 1];
+ memcpy(optcpy, options, index+1);
char * argv[argc + 1];
argv[0] = NULL;
- argv[1] = options;
- for(int index = 0, count = 2;options[index]!=0;index++) {
- if (options[index]==' ')
- argv[count++] = &options[index];
+ argv[1] = optcpy;
+ int count = 2;
+ for(index = 0;optcpy[index]!=0;index++) {
+ if (optcpy[index] == ' ') {
+ argv[count++] = &optcpy[index+1];
+ optcpy[index] = 0;
+ }
}
while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) {
case 'v':
params->verbose = optarg ? atoi(optarg) : 1;
break;
- case 'u':
- params->uninitvalue = atoi(optarg);
- break;
case 't':
if (install_plugin(optarg))
error = true;
break;
+ case 'm':
+ params->traceminsize = atoi(optarg);
+ break;
+ case 'f':
+ params->checkthreshold = atoi(optarg);
+ break;
+ case 'r':
+ params->removevisible = true;
+ break;
case 'o':
{
ModelVector<TraceAnalysis *> * analyses = getInstalledTraceAnalysis();
}
}
- /* Restore (global) optind for potential use by user program */
- optind = tmpoptind;
+ /* Special value to reset implementation as described by Linux man page. */
+ optind = 0;
if (error)
print_usage(params);
}
-static void install_trace_analyses(ModelExecution *execution)
-{
+void install_trace_analyses(ModelExecution *execution) {
ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
for(unsigned int i=0;i<installedanalysis->size();i++) {
TraceAnalysis * ta=(*installedanalysis)[i];
ta->actionAtInstallation();
}
}
-
-/**
- * Main function. Just initializes snapshotting library and the
- * snapshotting library calls the model_main function.
- */
-int main(int argc, char **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();
- register_plugins();
-
- //Stash command line options
- model_params *params = model->getParams();
- params->argc = argc;
- params->argv = argv;
-
- install_trace_analyses(model->get_execution());
-
- model->startMainThread();
- DEBUG("Exiting\n");
-}
projects / c11tester.git / blobdiff