#include <threads.h>
#include "common.h"
#include "threads-model.h"
+#include "output.h"
#include "datarace.h"
params->enabledcount = 1;
params->bound = 0;
params->maxfuturevalues = 0;
+ params->expireslop = 10;
+ params->verbose = 0;
}
static void print_usage(struct model_params *params) {
/* Reset defaults before printing */
param_defaults(params);
- printf(
+ model_print(
"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
"\n"
"Options:\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"
"-b Upper length bound. Default: %d\n"
+"-v Print verbose execution information.\n"
"-- Program arguments follow.\n\n",
-params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+params->maxreads, params->maxfuturevalues, 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) {
- const char *shortopts = "hm:M:s:f:e:b:";
+ const char *shortopts = "hm:M:s:S:f:e:b:v";
int opt;
bool error = false;
while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
case 's':
params->maxfuturedelay = atoi(optarg);
break;
+ case 'S':
+ params->expireslop = atoi(optarg);
+ break;
case 'f':
params->fairwindow = atoi(optarg);
break;
case 'M':
params->maxfuturevalues = atoi(optarg);
break;
+ case 'v':
+ params->verbose = 1;
+ break;
default: /* '?' */
error = true;
break;
int main_argc;
char **main_argv;
-/** 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;
param_defaults(¶ms);
parse_options(¶ms, &main_argc, &main_argv);
+ /* Pass remaining arguments to user program */
+ params.argc = main_argc;
+ params.argv = main_argv;
+
//Initialize race detector
initRaceDetector();
snapshotObject = new SnapshotStack();
model = new ModelChecker(params);
-
snapshotObject->snapshotStep(0);
- do {
- /* Start user program */
- model->add_thread(new Thread(&user_thread, &wrapper_user_main, NULL));
-
- /* Wait for all threads to complete */
- model->finish_execution();
- } while (model->next_execution());
-
+ model->run();
delete model;
DEBUG("Exiting\n");
main_argc = argc;
main_argv = argv;
+ /* Configure output redirection for the model-checker */
+ redirect_output();
+
/* Let's jump in quickly and start running stuff */
initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
}