X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=6624f0685e42c551949273feb3af9d2e0a67597a;hb=616746ec12aae78b0d0262c009568109686cb000;hp=b58599df76681bdae923157b84d47f16a42681e1;hpb=1bc8782b55cab0503f1b64529f993f0b9e3a1846;p=model-checker.git

diff --git a/main.cc b/main.cc
index b58599d..6624f06 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,9 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 #include "datarace.h"
 
@@ -16,7 +16,9 @@
 
 static void param_defaults(struct model_params * params) {
 	params->maxreads = 0;
-  params->maxfuturedelay = 100;
+	params->maxfuturedelay = 100;
+	params->fairwindow = 0;
+	params->enabledcount = 1;
 }
 
 static void print_usage(struct model_params *params) {
@@ -25,14 +27,22 @@ static void print_usage(struct model_params *params) {
 "\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. Default: %d\n"
-"-s                    Maximum actions that the model checker will wait for a write from the future past the expected number of actions.  Default: %d\n"
-"--                    Program arguments follow.\n\n", params->maxreads, params->maxfuturedelay);
+"-m                    Maximum times a thread can read from the same write\n"
+"                      while other writes exist. 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"
+"-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"
+"--                    Program arguments follow.\n\n",
+params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount);
 	exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int *argc, char ***argv) {
-	const char *shortopts = "hm:s:";
+	const char *shortopts = "hm:s:f:e:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -43,6 +53,12 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 's':
 			params->maxfuturedelay = atoi(optarg);
 			break;
+		case 'f':
+			params->fairwindow = atoi(optarg);
+			break;
+		case 'e':
+			params->enabledcount = atoi(optarg);
+			break;
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
@@ -61,8 +77,14 @@ static void parse_options(struct model_params *params, int *argc, char ***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;
 
@@ -81,7 +103,7 @@ static void real_main() {
 	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();
@@ -94,12 +116,12 @@ static void real_main() {
 
 /**
  * Main function.  Just initializes snapshotting library and the
- * snapshotting library calls the real_main function.
+ * snapshotting library calls the model_main function.
  */
 int main(int argc, char ** argv) {
 	main_argc = argc;
 	main_argv = argv;
 
 	/* Let's jump in quickly and start running stuff */
-	initSnapShotLibrary(10000, 1024, 1024, 1000, &real_main);
+	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
 }