X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=ab37af4cc02fa3368906ff8537ce56dd637d9d98;hb=bee1e27429b9a66e414eb83cf14e2089dd40a79e;hp=53bf7c5dfa6130f14a3ad539c90f78866f1d4d43;hpb=9bbc3203ea6079d4222167e6b01cec9d041d08d9;p=model-checker.git

diff --git a/main.cc b/main.cc
index 53bf7c5..ab37af4 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,7 @@
 
 #include <unistd.h>
 
-#include <threads.h>
 #include "common.h"
-#include "threads-model.h"
 #include "output.h"
 
 #include "datarace.h"
@@ -15,18 +13,22 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-static void param_defaults(struct model_params * params) {
+static void param_defaults(struct model_params *params)
+{
 	params->maxreads = 0;
 	params->maxfuturedelay = 100;
 	params->fairwindow = 0;
+	params->yieldon = false;
 	params->enabledcount = 1;
 	params->bound = 0;
 	params->maxfuturevalues = 0;
 	params->expireslop = 10;
-	params->verbose = 0;
+	params->verbose = !!DBG_ENABLED();
+	params->uninitvalue = 0;
 }
 
-static void print_usage(struct model_params *params) {
+static void print_usage(struct model_params *params)
+{
 	/* Reset defaults before printing */
 	param_defaults(params);
 
@@ -46,16 +48,20 @@ static void print_usage(struct model_params *params) {
 "-f                    Specify a fairness window in which actions that are\n"
 "                      enabled sufficiently many times should receive\n"
 "                      priority for execution. Default: %d\n"
+"-y                    Turn on CHESS yield-based fairness support.\n"
+"                      Default: %d\n"
 "-e                    Enabled count. Default: %d\n"
 "-b                    Upper length bound. Default: %d\n"
 "-v                    Print verbose execution information.\n"
+"-u                    Value for uninitialized reads. Default: %u\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->enabledcount, params->bound);
+params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound, params->uninitvalue);
 	exit(EXIT_SUCCESS);
 }
 
-static void parse_options(struct model_params *params, int argc, char **argv) {
-	const char *shortopts = "hm:M:s:S:f:e:b:v";
+static void parse_options(struct model_params *params, int argc, char **argv)
+{
+	const char *shortopts = "hym:M:s:S:f:e:b:u:v";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -87,6 +93,12 @@ static void parse_options(struct model_params *params, int argc, char **argv) {
 		case 'v':
 			params->verbose = 1;
 			break;
+		case 'u':
+			params->uninitvalue = atoi(optarg);
+			break;
+		case 'y':
+			params->yieldon = true;
+			break;
 		default: /* '?' */
 			error = true;
 			break;
@@ -111,7 +123,8 @@ int main_argc;
 char **main_argv;
 
 /** The model_main function contains the main model checking loop. */
-static void model_main() {
+static void model_main()
+{
 	struct model_params params;
 
 	param_defaults(&params);
@@ -121,11 +134,10 @@ static void model_main() {
 	//Initialize race detector
 	initRaceDetector();
 
-	//Create the singleton SnapshotStack object
-	snapshotObject = new SnapshotStack();
+	snapshot_stack_init();
 
 	model = new ModelChecker(params);
-	snapshotObject->snapshotStep(0);
+	snapshot_record(0);
 	model->run();
 	delete model;
 
@@ -136,7 +148,8 @@ static void model_main() {
  * Main function.  Just initializes snapshotting library and the
  * snapshotting library calls the model_main function.
  */
-int main(int argc, char ** argv) {
+int main(int argc, char **argv)
+{
 	main_argc = argc;
 	main_argv = argv;
 
@@ -144,5 +157,5 @@ int main(int argc, char ** argv) {
 	redirect_output();
 
 	/* Let's jump in quickly and start running stuff */
-	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
+	snapshot_system_init(10000, 1024, 1024, 4000, &model_main);
 }