X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=cdfa37282870e6e1d1665be7cea00d856a0a2b42;hp=95459be561af6b7bab74d50610d470f1005c4464;hb=249a155b1ad7a7d1b53c0810cd7c85d6f99af47e;hpb=ea0cb2585eee658354f48b4bbfebaf030cccf317

diff --git a/mymemory.cc b/mymemory.cc
index 95459be5..cdfa3728 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -15,15 +15,16 @@ static mspace sStaticSpace = NULL;
 #endif
 
 /** Non-snapshotting calloc for our use. */
-void *model_calloc(size_t count, size_t size) {
+void *model_calloc(size_t count, size_t size)
+{
 #if USE_MPROTECT_SNAPSHOT
-	static void *(*callocp)(size_t count, size_t size)=NULL;
+	static void *(*callocp)(size_t count, size_t size) = NULL;
 	char *error;
 	void *ptr;
 
 	/* get address of libc malloc */
 	if (!callocp) {
-		callocp = ( void * ( * )( size_t, size_t ) )dlsym(RTLD_NEXT, "calloc");
+		callocp = (void * (*)(size_t, size_t))dlsym(RTLD_NEXT, "calloc");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -32,25 +33,26 @@ void *model_calloc(size_t count, size_t size) {
 	ptr = callocp(count, size);
 	return ptr;
 #else
-	if( !snapshotrecord) {
+	if (!snapshotrecord) {
 		createSharedMemory();
 	}
-	if( NULL == sStaticSpace )
-		sStaticSpace = create_mspace_with_base( ( void * )( snapshotrecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct SnapShot ), 1 );
-	return mspace_calloc( sStaticSpace, count, size );
+	if (NULL == sStaticSpace)
+		sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+	return mspace_calloc(sStaticSpace, count, size);
 #endif
 }
 
 /** Non-snapshotting malloc for our use. */
-void *model_malloc(size_t size) {
+void *model_malloc(size_t size)
+{
 #if USE_MPROTECT_SNAPSHOT
-	static void *(*mallocp)(size_t size)=NULL;
+	static void *(*mallocp)(size_t size) = NULL;
 	char *error;
 	void *ptr;
 
 	/* get address of libc malloc */
 	if (!mallocp) {
-		mallocp = ( void * ( * )( size_t ) )dlsym(RTLD_NEXT, "malloc");
+		mallocp = (void * (*)(size_t))dlsym(RTLD_NEXT, "malloc");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -59,12 +61,12 @@ void *model_malloc(size_t size) {
 	ptr = mallocp(size);
 	return ptr;
 #else
-	if( !snapshotrecord) {
+	if (!snapshotrecord) {
 		createSharedMemory();
 	}
-	if( NULL == sStaticSpace )
-		sStaticSpace = create_mspace_with_base( ( void * )( snapshotrecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct SnapShot ), 1 );
-	return mspace_malloc( sStaticSpace, size );
+	if (NULL == sStaticSpace)
+		sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+	return mspace_malloc(sStaticSpace, size);
 #endif
 }
 
@@ -86,47 +88,16 @@ void snapshot_free(void *ptr)
 	free(ptr);
 }
 
-void *system_malloc( size_t size ){
-	static void *(*mallocp)(size_t size);
-	char *error;
-	void *ptr;
-
-	/* get address of libc malloc */
-	if (!mallocp) {
-		mallocp = ( void * ( * )( size_t ) )dlsym(RTLD_NEXT, "malloc");
-		if ((error = dlerror()) != NULL) {
-			fputs(error, stderr);
-			exit(EXIT_FAILURE);
-		}
-	}
-	ptr = mallocp(size);
-	return ptr;
-}
-
-void system_free( void * ptr ){
-	static void (*freep)(void *);
-	char *error;
-
-	/* get address of libc free */
-	if (!freep) {
-		freep = ( void  ( * )( void * ) )dlsym(RTLD_NEXT, "free");
-		if ((error = dlerror()) != NULL) {
-			fputs(error, stderr);
-			exit(EXIT_FAILURE);
-		}
-	}
-	freep(ptr);
-}
-
 /** Non-snapshotting free for our use. */
-void model_free(void *ptr) {
+void model_free(void *ptr)
+{
 #if USE_MPROTECT_SNAPSHOT
 	static void (*freep)(void *);
 	char *error;
 
 	/* get address of libc free */
 	if (!freep) {
-		freep = ( void  ( * )( void * ) )dlsym(RTLD_NEXT, "free");
+		freep = ( void  ( * )( void *))dlsym(RTLD_NEXT, "free");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -134,82 +105,80 @@ void model_free(void *ptr) {
 	}
 	freep(ptr);
 #else
-	mspace_free( sStaticSpace, ptr );
+	mspace_free(sStaticSpace, ptr);
 #endif
 }
 
-
-/** @brief Global mspace reference for the snapshotting heap */
-mspace mySpace = NULL;
-
-/** @brief Global reference to the unaligned memory address that was malloc'd
- * for the snapshotting heap */
-void *basemySpace = NULL;
-
 /** Bootstrap allocation.  Problem is that the dynamic linker calls
  *  require calloc to work and calloc requires the dynamic linker to
  *	work.  */
 
 #define BOOTSTRAPBYTES 4096
 char bootstrapmemory[BOOTSTRAPBYTES];
-size_t offset=0;
+size_t offset = 0;
 
-void * HandleEarlyAllocationRequest( size_t sz ){
-	/*Align to 8 byte boundary*/
-	sz=(sz+7)&~7;
+void * HandleEarlyAllocationRequest(size_t sz)
+{
+	/* Align to 8 byte boundary */
+	sz = (sz + 7) & ~7;
 
 	if (sz > (BOOTSTRAPBYTES-offset)) {
 		printf("OUT OF BOOTSTRAP MEMORY\n");
 		exit(EXIT_FAILURE);
 	}
 
-	void * pointer= (void *) & bootstrapmemory[offset];
-	offset+=sz;
+	void *pointer= (void *)&bootstrapmemory[offset];
+	offset += sz;
 	return pointer;
 }
 
-/** Check whether this is bootstrapped memory that we should not
-		free. */
+#if USE_MPROTECT_SNAPSHOT
+
+/** @brief Global mspace reference for the snapshotting heap */
+mspace snapshot_space = NULL;
 
-bool DontFree( void * ptr ){
-	return (ptr>=(&bootstrapmemory[0])&&ptr<(&bootstrapmemory[BOOTSTRAPBYTES]));
+/** Check whether this is bootstrapped memory that we should not free */
+static bool DontFree(void *ptr)
+{
+	return (ptr >= (&bootstrapmemory[0]) && ptr < (&bootstrapmemory[BOOTSTRAPBYTES]));
 }
 
 /** @brief Snapshotting malloc implementation for user programs */
-void *malloc( size_t size )
+void *malloc(size_t size)
 {
-	if (mySpace) {
-		void *tmp=mspace_malloc( mySpace, size );
+	if (snapshot_space) {
+		void *tmp = mspace_malloc(snapshot_space, size);
 		ASSERT(tmp);
 		return tmp;
 	} else
-		return HandleEarlyAllocationRequest( size );
+		return HandleEarlyAllocationRequest(size);
 }
 
 /** @brief Snapshotting free implementation for user programs */
-void free( void * ptr ){
+void free(void * ptr)
+{
 	if (!DontFree(ptr))
-		mspace_free(mySpace, ptr);
+		mspace_free(snapshot_space, ptr);
 }
 
 /** @brief Snapshotting realloc implementation for user programs */
-void *realloc( void *ptr, size_t size )
+void *realloc(void *ptr, size_t size)
 {
-	void *tmp = mspace_realloc(mySpace, ptr, size);
+	void *tmp = mspace_realloc(snapshot_space, ptr, size);
 	ASSERT(tmp);
 	return tmp;
 }
 
 /** @brief Snapshotting calloc implementation for user programs */
-void * calloc( size_t num, size_t size )
+void * calloc(size_t num, size_t size)
 {
-	if (mySpace) {
-		void *tmp = mspace_calloc(mySpace, num, size);
+	if (snapshot_space) {
+		void *tmp = mspace_calloc(snapshot_space, num, size);
 		ASSERT(tmp);
 		return tmp;
 	} else {
-		void *tmp=HandleEarlyAllocationRequest( size * num );
-		std::memset( tmp, 0, size * num );
+		void *tmp = HandleEarlyAllocationRequest(size * num);
+		std::memset(tmp, 0, size * num);
 		return tmp;
 	}
 }
@@ -237,3 +206,4 @@ void operator delete[](void *p, size_t size)
 {
 	free(p);
 }
+#endif /* USE_MPROTECT_SNAPSHOT */