Merge branch 'brian'

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index 245b2701807710bbca6c1f69ea1df662e89e9181..88018e269093c531a67bde16d27de8a95d6d6305 100644 (file)
--- 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
 }
@@ -100,8 +100,6 @@ mspace mySpace = NULL;
 /** This global references the unaligned memory address that was malloced for the snapshotting heap */
 void * basemySpace = NULL;
 
-//Subramanian --- please make these work for the fork based approach
-
 /** Adding the fix for not able to allocate through a reimplemented calloc at the beginning before instantiating our allocator
 A bit circumspect about adding an sbrk. linux docs say to avoid using it... */
 
@@ -163,10 +161,8 @@ void * calloc( size_t num, size_t size ){
        return mspace_calloc( mySpace, num, size );
 }
 
-
 /** Snapshotting new operator for user programs. */
 
-
 void * operator new(size_t size) throw(std::bad_alloc) {
        return malloc(size);
 }