setup main wrapper and then call into norris code

diff --git a/main.cc b/main.cc
index e456ac6b326469a85383af6a97a422e9a2c65f92..e629f6092992ce8fb59a80a7e14388b7b7724143 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -4,6 +4,7 @@
 
 /* global "model" object */
 #include "model.h"
+#include "snapshot.h"
 
 /*
  * Return 1 if found next thread, 0 otherwise
@@ -12,63 +13,70 @@ 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 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 thread_wait_finish(void)
-{
+static void thread_wait_finish(void) {
+  DBG();
+
+  while (!thread_system_next());
+}
 
-       DBG();
+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);
 
-       while (!thread_system_next());
+  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");
 }
 
+int main_numargs;
+char ** main_args;
+
 /*
  * Main system function
  */
-int main()
-{
-       thrd_t user_thread;
-       ucontext_t main_context;
-
-       model = new ModelChecker();
-
-       if (getcontext(&main_context))
-               return 1;
-
-       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;
+int main(int numargs, char ** args) {
+  /* Stash this stuff in case someone wants it eventually */
+  main_numargs=numargs;
+  main_args=args;
 
-       DEBUG("Exiting\n");
-       return 0;
+  /* 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*/);
 }

diff --git a/run.sh b/run.sh
index 45f962c1ab273f48f2ab6ee9d8859da28c2489d6..9fc6f8925aa867d51afa2d602185b0f3975e9352 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
-
 export LD_LIBRARY_PATH=.
 gdb ./model

diff --git a/snapshot.cc b/snapshot.cc
index b0b49d405c896681edbfd852847851746737ed50..8761862ca5f67e01e431fd9de006dab095b7dd6b 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -31,11 +31,11 @@ void BeginOperation( struct timeval * theStartTime ){
        gettimeofday( theStartTime, NULL );
 #endif
 }
-#if DEBUG
+#if SSDEBUG
 struct timeval *starttime = NULL;
 #endif
 void DumpIntoLog( const char * filename, const char * message ){
-#if DEBUG
+#if SSDEBUG
    static pid_t thePID = getpid();
    char newFn[ 1024 ] ={ 0 };
    sprintf( newFn,"%s-%d.txt", filename, thePID );
@@ -146,7 +146,7 @@ void initSnapShotLibrary(unsigned int numbackingpages, unsigned int numsnapshots
     exit(-1);
   }
   createSharedLibrary();
- #if DEBUG
+ #if SSDEBUG
   starttime = &(sTheRecord->startTimeGlobal);
   gettimeofday( starttime, NULL );
 #endif
@@ -187,7 +187,7 @@ void initSnapShotLibrary(unsigned int numbackingpages, unsigned int numsnapshots
     } else {
       int status;
       int retVal;
-#if DEBUG
+#if SSDEBUG
       char mesg[ 1024 ] = { 0 };
       sprintf( mesg, "The process id of child is %d and the process id of this process is %d and snapshot id is %d", forkedID, getpid(), snapshotid );
       DumpIntoLog( "ModelSnapshot", mesg );
@@ -271,7 +271,7 @@ void rollBack( snapshot_id theID ){
   getcontext( &sTheRecord->mContextToRollback );
   if( !sTemp ){
     sTemp = 1;
-#if DEBUG
+#if SSDEBUG
        DumpIntoLog( "ModelSnapshot", "Invoked rollback" ); 
 #endif
        exit( 0 );

diff --git a/snapshot.h b/snapshot.h
index c737dece2f1a7d5390c224e56d41144ae6c420c2..16d9cd76a30dd3e6d99874b2fb565813b31241b1 100644 (file)
--- a/snapshot.h
+++ b/snapshot.h
@@ -2,7 +2,7 @@
 #define _SNAPSHOT_H
 #define PAGESIZE 4096
 #define USE_CHECKPOINTING 1
-#define DEBUG 1
+
 typedef unsigned int snapshot_id;
 typedef void (*MyFuncPtr)();
 void initSnapShotLibrary(unsigned int numbackingpages, unsigned int numsnapshots, unsigned int nummemoryregions, MyFuncPtr entryPoint);