X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=fc1b2779daa657ae6460293da49d29a5c95ec21d;hb=507434b53b00f7d32301050dd0ce8466ad42677b;hp=300306a461bc6c4f1f9f902239bb285567d8c493;hpb=f767539fdf7a145b4208be0c30d2fa1aa095e6db;p=model-checker.git

diff --git a/main.cc b/main.cc
index 300306a..fc1b277 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"
 
@@ -19,6 +19,7 @@ static void param_defaults(struct model_params * params) {
 	params->maxfuturedelay = 100;
 	params->fairwindow = 0;
 	params->enabledcount = 1;
+	params->bound = 0;
 }
 
 static void print_usage(struct model_params *params) {
@@ -36,13 +37,14 @@ static void print_usage(struct model_params *params) {
 "                      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",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount);
+params->maxreads, params->maxfuturedelay, 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:s:f:e:";
+	const char *shortopts = "hm:s:f:e:b:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -59,6 +61,9 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 'e':
 			params->enabledcount = atoi(optarg);
 			break;
+		case 'b':
+			params->bound = atoi(optarg);
+			break;
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
@@ -77,8 +82,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;
 
@@ -97,7 +108,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();
@@ -110,12 +121,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, 4000, &real_main);
+	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
 }