projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e067c1
)
main: add maxfuturevalues parameter (-M)
author
Brian Norris
<banorris@uci.edu>
Sun, 4 Nov 2012 01:16:45 +0000
(18:16 -0700)
committer
Brian Norris
<banorris@uci.edu>
Sun, 4 Nov 2012 02:39:23 +0000
(19:39 -0700)
Not implemented yet
main.cc
patch
|
blob
|
history
model.h
patch
|
blob
|
history
diff --git
a/main.cc
b/main.cc
index e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb..122539811e8f36c0b86f7fadbe823ca6cdbee29a 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-20,6
+20,7
@@
static void param_defaults(struct model_params * params) {
params->fairwindow = 0;
params->enabledcount = 1;
params->bound = 0;
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) {
@@
-33,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"
@@
-42,12
+45,12
@@
static void print_usage(struct model_params *params) {
"-e Enabled count. Default: %d\n"
"-b Upper length bound. Default: %d\n"
"-- Program arguments follow.\n\n",
"-e Enabled count. Default: %d\n"
"-b Upper length bound. Default: %d\n"
"-- Program arguments follow.\n\n",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+params->maxreads, params->maxfuture
values, params->maxfuture
delay, 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:b:";
+ 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) {
@@
-70,6
+73,9
@@
static void parse_options(struct model_params *params, int *argc, char ***argv)
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;
diff --git
a/model.h
b/model.h
index 59a07597bb5bf0436752ad6a4fca2f22d9fa2fe8..63f45c723d4bdca402d50a2c82d4d0a62f3b5dc7 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-37,6
+37,10
@@
struct model_params {
unsigned int fairwindow;
unsigned int enabledcount;
unsigned int bound;
unsigned int fairwindow;
unsigned int enabledcount;
unsigned int bound;
+
+ /** @brief Maximum number of future values that can be sent to the same
+ * read */
+ int maxfuturevalues;
};
struct PendingFutureValue {
};
struct PendingFutureValue {