rename struct Snapshot_t => struct Snapshot

diff --git a/mymemory.cc b/mymemory.cc
index bc1d2ba6c236a6fcfd3c8ddaf94b4c6a082ce455..88018e269093c531a67bde16d27de8a95d6d6305 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -36,7 +36,7 @@ void *MYMALLOC(size_t size) {
                createSharedLibrary();
        }
        if( NULL == sStaticSpace )
                createSharedLibrary();
        }
        if( NULL == sStaticSpace )

-               sStaticSpace = create_mspace_with_base( ( void * )( sTheRecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct Snapshot_t ), 1 );
+               sStaticSpace = create_mspace_with_base( ( void * )( sTheRecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct Snapshot ), 1 );

        return mspace_malloc( sStaticSpace, size );
 #endif
 }
        return mspace_malloc( sStaticSpace, size );
 #endif
 }

diff --git a/snapshot.cc b/snapshot.cc
index 0e47ac00f5cb22508bac587039d6d38246c54490..bb599010f37f5c810ae6436ddd042850208d986c 100644 (file)
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -29,7 +29,7 @@
 #if USE_MPROTECT_SNAPSHOT
 struct SnapShot * snapshotrecord = NULL;
 #else
 #if USE_MPROTECT_SNAPSHOT
 struct SnapShot * snapshotrecord = NULL;
 #else

-struct Snapshot_t * sTheRecord = NULL;
+struct Snapshot * sTheRecord = NULL;

 #endif
 
 #if !USE_MPROTECT_SNAPSHOT
 #endif
 
 #if !USE_MPROTECT_SNAPSHOT


@@ -114,8 +114,8 @@ void createSharedLibrary(){
        if( -1 == ftruncate( fd, ( size_t )SHARED_MEMORY_DEFAULT + ( size_t )STACK_SIZE_DEFAULT ) ) FAILURE( "ftruncate" );
        char * memMapBase = ( char * ) mmap( 0, ( size_t )SHARED_MEMORY_DEFAULT + ( size_t )STACK_SIZE_DEFAULT, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
        if( MAP_FAILED == memMapBase ) FAILURE("mmap");
        if( -1 == ftruncate( fd, ( size_t )SHARED_MEMORY_DEFAULT + ( size_t )STACK_SIZE_DEFAULT ) ) FAILURE( "ftruncate" );
        char * memMapBase = ( char * ) mmap( 0, ( size_t )SHARED_MEMORY_DEFAULT + ( size_t )STACK_SIZE_DEFAULT, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
        if( MAP_FAILED == memMapBase ) FAILURE("mmap");

-       sTheRecord = ( struct Snapshot_t * )memMapBase;
-       sTheRecord->mSharedMemoryBase = memMapBase + sizeof( struct Snapshot_t );
+       sTheRecord = ( struct Snapshot * )memMapBase;
+       sTheRecord->mSharedMemoryBase = memMapBase + sizeof( struct Snapshot );

        sTheRecord->mStackBase = ( char * )memMapBase + ( size_t )SHARED_MEMORY_DEFAULT;
        sTheRecord->mStackSize = STACK_SIZE_DEFAULT;
        sTheRecord->mIDToRollback = -1;
        sTheRecord->mStackBase = ( char * )memMapBase + ( size_t )SHARED_MEMORY_DEFAULT;
        sTheRecord->mStackSize = STACK_SIZE_DEFAULT;
        sTheRecord->mIDToRollback = -1;

diff --git a/snapshotimp.h b/snapshotimp.h
index b918b8447b9b6f77b8b633ecdd835185997ddaa8..90bbc83352fc4b6697032929d1ab942fdd25a2fc 100644 (file)
--- a/snapshotimp.h
+++ b/snapshotimp.h
@@ -58,7 +58,7 @@ extern struct SnapShot * snapshotrecord;
 void * ReturnPageAlignedAddress( void *);
 void * PageAlignAddressUpward( void *);
 #else
 void * ReturnPageAlignedAddress( void *);
 void * PageAlignAddressUpward( void *);
 #else

-struct Snapshot_t{
+struct Snapshot {

 char *mSharedMemoryBase;
 char *mStackBase;
 size_t mStackSize;
 char *mSharedMemoryBase;
 char *mStackBase;
 size_t mStackSize;


@@ -67,6 +67,6 @@ ucontext_t mContextToRollback;
 snapshot_id currSnapShotID;
 volatile bool mbFinalize;
 };
 snapshot_id currSnapShotID;
 volatile bool mbFinalize;
 };

-extern struct Snapshot_t * sTheRecord;
+extern struct Snapshot * sTheRecord;

 #endif
 #endif
 #endif
 #endif