From: Brian Norris Date: Thu, 14 Jun 2012 06:51:07 +0000 (-0700) Subject: rename struct Snapshot_t => struct Snapshot X-Git-Tag: pldi2013~391^2~30 X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=339c89039e14e4f2433d4af0b0d2ae6e6c41e028 rename struct Snapshot_t => struct Snapshot --- diff --git a/mymemory.cc b/mymemory.cc index bc1d2ba..88018e2 100644 --- a/mymemory.cc +++ b/mymemory.cc @@ -36,7 +36,7 @@ void *MYMALLOC(size_t size) { 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 } diff --git a/snapshot.cc b/snapshot.cc index 0e47ac0..bb59901 100644 --- a/snapshot.cc +++ b/snapshot.cc @@ -29,7 +29,7 @@ #if USE_MPROTECT_SNAPSHOT struct SnapShot * snapshotrecord = NULL; #else -struct Snapshot_t * sTheRecord = NULL; +struct Snapshot * sTheRecord = NULL; #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"); - 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; diff --git a/snapshotimp.h b/snapshotimp.h index b918b84..90bbc83 100644 --- a/snapshotimp.h +++ b/snapshotimp.h @@ -58,7 +58,7 @@ extern struct SnapShot * snapshotrecord; void * ReturnPageAlignedAddress( void *); void * PageAlignAddressUpward( void *); #else -struct Snapshot_t{ +struct Snapshot { char *mSharedMemoryBase; char *mStackBase; size_t mStackSize; @@ -67,6 +67,6 @@ ucontext_t mContextToRollback; snapshot_id currSnapShotID; volatile bool mbFinalize; }; -extern struct Snapshot_t * sTheRecord; +extern struct Snapshot * sTheRecord; #endif #endif