X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb;hp=e629f6092992ce8fb59a80a7e14388b7b7724143;hb=2e067c102b91db06977412388b69d06a0c0b7166;hpb=6a3cefc5fc5bcae7b7f94dd9e6199f6b3efdd76e

diff --git a/main.cc b/main.cc
index e629f609..e8d4f9af 100644
--- a/main.cc
+++ b/main.cc
@@ -1,82 +1,137 @@
-#include "libthreads.h"
+/** @file main.cc
+ *  @brief Entry point for the model checker.
+ */
+
+#include <unistd.h>
+
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+
+#include "datarace.h"
 
 /* global "model" object */
 #include "model.h"
-#include "snapshot.h"
+#include "snapshot-interface.h"
 
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-int num;
-int num1;
-int num2;
-
-static int thread_system_next(void) {
-  Thread *curr, *next;
-  
-  curr = thread_current();
-  if (curr) {
-    if (curr->get_state() == THREAD_READY) {
-      model->check_current_action();
-      model->scheduler->add_thread(curr);
-    } else if (curr->get_state() == THREAD_RUNNING)
-      /* Stopped while running; i.e., completed */
-      curr->complete();
-    else
-      ASSERT(false);
-  }
-  next = model->scheduler->next_thread();
-  if (next)
-    next->set_state(THREAD_RUNNING);
-  DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-  if (!next)
-    return 1;
-  return Thread::swap(model->get_system_context(), next);
+static void param_defaults(struct model_params * params) {
+	params->maxreads = 0;
+	params->maxfuturedelay = 100;
+	params->fairwindow = 0;
+	params->enabledcount = 1;
+	params->bound = 0;
 }
 
-static void thread_wait_finish(void) {
-  DBG();
+static void print_usage(struct model_params *params) {
+	/* Reset defaults before printing */
+	param_defaults(params);
 
-  while (!thread_system_next());
+	printf(
+"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
+"\n"
+"Options:\n"
+"-h                    Display this help message and exit\n"
+"-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"
+"-b                    Upper length bound. Default: %d\n"
+"--                    Program arguments follow.\n\n",
+params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+	exit(EXIT_SUCCESS);
 }
 
-void real_main() {
-  thrd_t user_thread;
-  ucontext_t main_context;
-  
-  model = new ModelChecker();
-  
-  if (getcontext(&main_context))
-    return;
-  
-  model->set_system_context(&main_context);
-
-  do {
-    /* Start user program */
-    model->add_thread(new Thread(&user_thread, &user_main, NULL));
-    
-    /* Wait for all threads to complete */
-    thread_wait_finish();
-  } while (model->next_execution());
-  
-  delete model;
-  
-  DEBUG("Exiting\n");
+static void parse_options(struct model_params *params, int *argc, char ***argv) {
+	const char *shortopts = "hm:s:f:e:b:";
+	int opt;
+	bool error = false;
+	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+		switch (opt) {
+		case 'h':
+			print_usage(params);
+			break;
+		case 's':
+			params->maxfuturedelay = atoi(optarg);
+			break;
+		case 'f':
+			params->fairwindow = atoi(optarg);
+			break;
+		case 'e':
+			params->enabledcount = atoi(optarg);
+			break;
+		case 'b':
+			params->bound = atoi(optarg);
+			break;
+		case 'm':
+			params->maxreads = atoi(optarg);
+			break;
+		default: /* '?' */
+			error = true;
+			break;
+		}
+	}
+	(*argv)[optind - 1] = (*argv)[0];
+	(*argc) -= (optind - 1);
+	(*argv) += (optind - 1);
+	optind = 1;
+
+	if (error)
+		print_usage(params);
 }
 
-int main_numargs;
-char ** main_args;
+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(&params);
+
+	parse_options(&params, &main_argc, &main_argv);
+
+	//Initialize race detector
+	initRaceDetector();
+
+	//Create the singleton SnapshotStack object
+	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());
+
+	delete model;
+
+	DEBUG("Exiting\n");
+}
 
-/*
- * Main system function
+/**
+ * Main function.  Just initializes snapshotting library and the
+ * snapshotting library calls the model_main function.
  */
-int main(int numargs, char ** args) {
-  /* Stash this stuff in case someone wants it eventually */
-  main_numargs=numargs;
-  main_args=args;
+int main(int argc, char ** argv) {
+	main_argc = argc;
+	main_argv = argv;
 
-  /* Let's jump in quickly and start running stuff */
-  initSnapShotLibrary(10000 /*int numbackingpages*/, 1024 /*unsigned int numsnapshots*/, 1024 /*unsigned int nummemoryregions*/ , &real_main /*MyFuncPtr entryPoint*/);
+	/* Let's jump in quickly and start running stuff */
+	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
 }