projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cda45d9
)
main: add "maxreads" parameter
author
Brian Norris
<banorris@uci.edu>
Tue, 11 Sep 2012 17:10:39 +0000
(10:10 -0700)
committer
Brian Norris
<banorris@uci.edu>
Tue, 11 Sep 2012 17:10:39 +0000
(10:10 -0700)
main.cc
patch
|
blob
|
history
model.h
patch
|
blob
|
history
diff --git
a/main.cc
b/main.cc
index f58f3040d98f0afd3240381445b6de93cbf723b6..215a2197d35e91fa29cf65b869a292165be4a9ad 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-14,30
+14,41
@@
#include "model.h"
#include "snapshot-interface.h"
#include "model.h"
#include "snapshot-interface.h"
+static void param_defaults(struct model_params * params) {
+ params->maxreads = 0;
+}
+
static void print_usage() {
printf(
static void print_usage() {
printf(
-"Usage: <program name> [
OPTION
S]\n"
+"Usage: <program name> [
MC_OPTIONS] -- [PROGRAM ARGUMENT
S]\n"
"\n"
"Options:\n"
"-h Display this help message and exit\n"
"\n"
"Options:\n"
"-h Display this help message and exit\n"
-);
+"-m Maximum times a thread can read from the same write while other writes exist\n"
+"-- Program arguments follow.\n\n");
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}
-static void parse_options(struct model_params *params, int
argc, char
**argv) {
- const char *shortopts = "h";
+static void parse_options(struct model_params *params, int
*argc, char *
**argv) {
+ const char *shortopts = "h
m:
";
int opt;
bool error = false;
int opt;
bool error = false;
- while (!error && (opt = getopt(
argc,
argv, shortopts)) != -1) {
+ while (!error && (opt = getopt(
*argc, *
argv, shortopts)) != -1) {
switch (opt) {
case 'h':
print_usage();
break;
switch (opt) {
case 'h':
print_usage();
break;
+ case 'm':
+ params->maxreads = atoi(optarg);
+ break;
default: /* '?' */
error = true;
break;
}
}
default: /* '?' */
error = true;
break;
}
}
+ (*argc) -= optind;
+ (*argv) += optind;
+
if (error)
print_usage();
}
if (error)
print_usage();
}
@@
-50,7
+61,9
@@
static void real_main() {
thrd_t user_thread;
struct model_params params;
thrd_t user_thread;
struct model_params params;
- parse_options(¶ms, main_argc, main_argv);
+ param_defaults(¶ms);
+
+ parse_options(¶ms, &main_argc, &main_argv);
//Initialize race detector
initRaceDetector();
//Initialize race detector
initRaceDetector();
diff --git
a/model.h
b/model.h
index b2f7897a310f7dc66fa88ce970893c43c252059c..990f559cc5af67fd368d5355bb890fc975a2c13d 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-28,6
+28,7
@@
class Promise;
* the model checker.
*/
struct model_params {
* the model checker.
*/
struct model_params {
+ int maxreads;
};
/**
};
/**