projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nodestack: limit the number of future values per read
[model-checker.git]
/
main.cc
diff --git
a/main.cc
b/main.cc
index 6624f0685e42c551949273feb3af9d2e0a67597a..122539811e8f36c0b86f7fadbe823ca6cdbee29a 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-19,9
+19,14
@@
static void param_defaults(struct model_params * params) {
params->maxfuturedelay = 100;
params->fairwindow = 0;
params->enabledcount = 1;
params->maxfuturedelay = 100;
params->fairwindow = 0;
params->enabledcount = 1;
+ params->bound = 0;
+ params->maxfuturevalues = 0;
}
static void print_usage(struct model_params *params) {
}
static void print_usage(struct model_params *params) {
+ /* Reset defaults before printing */
+ param_defaults(params);
+
printf(
"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
"\n"
printf(
"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
"\n"
@@
-29,6
+34,8
@@
static void print_usage(struct model_params *params) {
"-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"
"-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 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"
@@
-36,13
+43,14
@@
static void print_usage(struct model_params *params) {
" enabled sufficiently many times should receive\n"
" priority for execution. Default: %d\n"
"-e Enabled count. Default: %d\n"
" enabled sufficiently many times should receive\n"
" priority for execution. Default: %d\n"
"-e Enabled count. Default: %d\n"
+"-b Upper length bound. Default: %d\n"
"-- Program arguments follow.\n\n",
"-- Program arguments follow.\n\n",
-params->maxreads, params->maxfuture
delay, params->fairwindow, params->enabledcount
);
+params->maxreads, params->maxfuture
values, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound
);
exit(EXIT_SUCCESS);
}
static void parse_options(struct model_params *params, int *argc, char ***argv) {
exit(EXIT_SUCCESS);
}
static void parse_options(struct model_params *params, int *argc, char ***argv) {
- const char *shortopts = "hm:
s:f:e
:";
+ const char *shortopts = "hm:
M:s:f:e:b
:";
int opt;
bool error = false;
while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
int opt;
bool error = false;
while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@
-59,16
+67,24
@@
static void parse_options(struct model_params *params, int *argc, char ***argv)
case 'e':
params->enabledcount = 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->maxreads = atoi(optarg);
break;
+ case 'M':
+ params->maxfuturevalues = atoi(optarg);
+ break;
default: /* '?' */
error = true;
break;
}
}
default: /* '?' */
error = true;
break;
}
}
- (*argc) -= optind;
- (*argv) += optind;
+ (*argv)[optind - 1] = (*argv)[0];
+ (*argc) -= (optind - 1);
+ (*argv) += (optind - 1);
+ optind = 1;
if (error)
print_usage(params);
if (error)
print_usage(params);