projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main/model: add future value expiration sloppiness parameter
[model-checker.git]
/
main.cc
diff --git
a/main.cc
b/main.cc
index 26d8beb79d52f8d09a9d16b97f96c79972941822..1aafb696c8f80bd5974957a47eb2c9e0b6324d51 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-4,9
+4,9
@@
#include <unistd.h>
#include <unistd.h>
-#include
"libthreads.h"
+#include
<threads.h>
#include "common.h"
#include "common.h"
-#include "threads.h"
+#include "threads
-model
.h"
#include "datarace.h"
#include "datarace.h"
@@
-19,9
+19,15
@@
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;
+ params->expireslop = 2;
}
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,20
+35,24
@@
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"
+"-S Future value expiration sloppiness. Default: %u\n"
"-f Specify a fairness window in which actions that are\n"
" enabled sufficiently many times should receive\n"
" priority for execution. Default: %d\n"
"-e Enabled count. Default: %d\n"
"-f Specify a fairness window in which actions that are\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->expireslop, 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: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) {
@@
-53,22
+63,33
@@
static void parse_options(struct model_params *params, int *argc, char ***argv)
case 's':
params->maxfuturedelay = atoi(optarg);
break;
case 's':
params->maxfuturedelay = atoi(optarg);
break;
+ case 'S':
+ params->expireslop = atoi(optarg);
+ break;
case 'f':
params->fairwindow = atoi(optarg);
break;
case 'e':
params->enabledcount = atoi(optarg);
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->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);
@@
-77,8
+98,14
@@
static void parse_options(struct model_params *params, int *argc, char ***argv)
int main_argc;
char **main_argv;
int main_argc;
char **main_argv;
-/** The real_main function contains the main model checking loop. */
-static void real_main() {
+/** Wrapper to run the user's main function, with appropriate arguments */
+void wrapper_user_main(void *)
+{
+ user_main(main_argc, main_argv);
+}
+
+/** The model_main function contains the main model checking loop. */
+static void model_main() {
thrd_t user_thread;
struct model_params params;
thrd_t user_thread;
struct model_params params;
@@
-97,7
+124,7
@@
static void real_main() {
snapshotObject->snapshotStep(0);
do {
/* Start user program */
snapshotObject->snapshotStep(0);
do {
/* Start user program */
- model->add_thread(new Thread(&user_thread,
(void (*)(void *)) &
user_main, NULL));
+ model->add_thread(new Thread(&user_thread,
&wrapper_
user_main, NULL));
/* Wait for all threads to complete */
model->finish_execution();
/* Wait for all threads to complete */
model->finish_execution();
@@
-110,12
+137,12
@@
static void real_main() {
/**
* Main function. Just initializes snapshotting library and the
/**
* Main function. Just initializes snapshotting library and the
- * snapshotting library calls the
rea
l_main function.
+ * snapshotting library calls the
mode
l_main function.
*/
int main(int argc, char ** argv) {
main_argc = argc;
main_argv = argv;
/* Let's jump in quickly and start running stuff */
*/
int main(int argc, char ** argv) {
main_argc = argc;
main_argv = argv;
/* Let's jump in quickly and start running stuff */
- initSnap
ShotLibrary(10000, 1024, 1024, 1000, &rea
l_main);
+ initSnap
shotLibrary(10000, 1024, 1024, 4000, &mode
l_main);
}
}