From: Brian Norris <banorris@uci.edu>
Date: Mon, 8 Oct 2012 19:30:06 +0000 (-0700)
Subject: mymemory: reformat spacing
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=623631d95f3c2c475be2c0b8a9af8edb7656d90f;hp=6f66bffd0b774c219883d634586a4565c9e59af5

mymemory: reformat spacing
---

diff --git a/mymemory.cc b/mymemory.cc
index 5cb06a4f..d281330b 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,14 +88,15 @@ void snapshot_free(void *ptr)
 	free(ptr);
 }
 
-void *system_malloc( size_t size ){
+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");
+		mallocp = (void * (*)(size_t))dlsym(RTLD_NEXT, "malloc");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -104,14 +107,15 @@ void *system_malloc( size_t size ){
 }
 
 /** 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);
@@ -119,11 +123,10 @@ 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;
 
@@ -133,48 +136,49 @@ mspace mySpace = NULL;
 
 #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. */
-
-bool DontFree( void * ptr ){
-	return (ptr>=(&bootstrapmemory[0])&&ptr<(&bootstrapmemory[BOOTSTRAPBYTES]));
+/** Check whether this is bootstrapped memory that we should not free */
+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 );
+		void *tmp = mspace_malloc(mySpace, 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);
 }
 
 /** @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);
 	ASSERT(tmp);
@@ -182,15 +186,15 @@ void *realloc( void *ptr, size_t size )
 }
 
 /** @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);
 		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;
 	}
 }
diff --git a/mymemory.h b/mymemory.h
index b7936d84..ba91e613 100644
--- a/mymemory.h
+++ b/mymemory.h
@@ -47,7 +47,7 @@ void * snapshot_malloc(size_t size);
 void * snapshot_calloc(size_t count, size_t size);
 void snapshot_free(void *ptr);
 
-void *system_malloc( size_t size );
+void *system_malloc(size_t size );
 
 /** @brief Provides a non-snapshotting allocator for use in STL classes.
  *
@@ -129,7 +129,7 @@ class ModelAlloc {
 
 /** Return that all specializations of this allocator are interchangeable. */
 template <class T1, class T2>
-bool operator== (const ModelAlloc<T1>&,
+bool operator ==(const ModelAlloc<T1>&,
 		const ModelAlloc<T2>&) throw() {
 	return true;
 }