Merge branch 'sandbox' (remove finalize())

[c11tester.git] / snapshot.cc

diff --git a/snapshot.cc b/snapshot.cc
index a50835d1cca27ecd2c28aac29e798791dce3f69c..5fb1a85ebd4c4e633e1da3812b97776a893dccd8 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -120,7 +120,6 @@ void createSharedLibrary(){
        sTheRecord->mStackSize = STACK_SIZE_DEFAULT;
        sTheRecord->mIDToRollback = -1;
        sTheRecord->currSnapShotID = 0;
-       sTheRecord->mbFinalize = false;
 #endif
 }
 
@@ -191,7 +190,7 @@ void initSnapShotLibrary(unsigned int numbackingpages,
        pid_t forkedID = 0;
        snapshotid = sTheRecord->currSnapShotID;
        bool swapContext = false;
-       while( !sTheRecord->mbFinalize ){
+       while( true ){
                sTheRecord->currSnapShotID=snapshotid+1;
                forkedID = fork();
                if( 0 == forkedID ){
@@ -305,14 +304,7 @@ void rollBack( snapshot_id theID ){
                SSDEBUG("Invoked rollback");
                exit(EXIT_SUCCESS);
        }
+       sTheRecord->mIDToRollback = -1;
 #endif
 }
 
-/** The finalize method shuts down the snapshotting system.  */
-//Subramanian -- remove this function from the external interface and
-//have us call it internally
-void finalize(){
-#if !USE_MPROTECT_SNAPSHOT
-       sTheRecord->mbFinalize = true;
-#endif
-}