From: Brian Norris <banorris@uci.edu>
Date: Mon, 8 Oct 2012 19:38:53 +0000 (-0700)
Subject: rename 'mySpace' to 'snapshot_space'
X-Git-Tag: pldi2013~90
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=958af9f89dff567c26582d09687fcf0a1a461bc2

rename 'mySpace' to 'snapshot_space'
---

diff --git a/mymemory.cc b/mymemory.cc
index 759bdcc..7aec2dc 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -128,7 +128,7 @@ void model_free(void *ptr)
 }
 
 /** @brief Global mspace reference for the snapshotting heap */
-mspace mySpace = NULL;
+mspace snapshot_space = NULL;
 
 /** Bootstrap allocation.  Problem is that the dynamic linker calls
  *  require calloc to work and calloc requires the dynamic linker to
@@ -162,8 +162,8 @@ static bool DontFree(void *ptr)
 /** @brief Snapshotting malloc implementation for user programs */
 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
@@ -174,13 +174,13 @@ void *malloc(size_t size)
 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 *tmp = mspace_realloc(mySpace, ptr, size);
+	void *tmp = mspace_realloc(snapshot_space, ptr, size);
 	ASSERT(tmp);
 	return tmp;
 }
@@ -188,8 +188,8 @@ void *realloc(void *ptr, size_t size)
 /** @brief Snapshotting calloc implementation for user programs */
 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 {
diff --git a/mymemory.h b/mymemory.h
index ba91e61..2379b5f 100644
--- a/mymemory.h
+++ b/mymemory.h
@@ -151,7 +151,9 @@ extern void* mspace_realloc(mspace msp, void* mem, size_t newsize);
 extern void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
 extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
 extern mspace create_mspace(size_t capacity, int locked);
-extern mspace mySpace;
+
+/** @brief mspace for the snapshotting heap */
+extern mspace snapshot_space;
 #ifdef __cplusplus
 };  /* end of extern "C" */
 #endif
diff --git a/snapshot.cc b/snapshot.cc
index 734d161..747f7c2 100644
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -173,7 +173,7 @@ void initSnapshotLibrary(unsigned int numbackingpages,
 
 	void *basemySpace = model_malloc((numheappages+1)*PAGESIZE);
 	void * pagealignedbase=PageAlignAddressUpward(basemySpace);
-	mySpace = create_mspace_with_base(pagealignedbase,  numheappages*PAGESIZE, 1 );
+	snapshot_space = create_mspace_with_base(pagealignedbase, numheappages*PAGESIZE, 1 );
 	addMemoryRegionToSnapShot(pagealignedbase, numheappages);
 	entryPoint();
 }
@@ -183,7 +183,7 @@ void initSnapshotLibrary(unsigned int numbackingpages,
 		unsigned int numheappages, VoidFuncPtr entryPoint) {
 	void *basemySpace = system_malloc((numheappages+1)*PAGESIZE);
 	void * pagealignedbase=PageAlignAddressUpward(basemySpace);
-	mySpace = create_mspace_with_base(pagealignedbase,  numheappages*PAGESIZE, 1 );
+	snapshot_space = create_mspace_with_base(pagealignedbase, numheappages * PAGESIZE, 1);
 	if (!snapshotrecord)
 		createSharedMemory();