From 99928ab8d61239d499f5bf45ae9a2b41595350f8 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 8 Oct 2012 13:04:24 -0700
Subject: [PATCH] rename again (snapshot_space -> user_snapshot_space)

I will be adding a separate model_snapshot_space
---
 mymemory.cc | 18 ++++++++++--------
 mymemory.h  |  3 +--
 snapshot.cc |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mymemory.cc b/mymemory.cc
index cdfa372..f296048 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -134,8 +134,10 @@ void * HandleEarlyAllocationRequest(size_t sz)
 
 #if USE_MPROTECT_SNAPSHOT
 
-/** @brief Global mspace reference for the snapshotting heap */
-mspace snapshot_space = NULL;
+/** @brief Global mspace reference for the user's snapshotting heap
+ *  @todo use this ONLY for user's allocations, not for internal snapshotting
+ *  state */
+mspace user_snapshot_space = NULL;
 
 /** Check whether this is bootstrapped memory that we should not free */
 static bool DontFree(void *ptr)
@@ -146,8 +148,8 @@ static bool DontFree(void *ptr)
 /** @brief Snapshotting malloc implementation for user programs */
 void *malloc(size_t size)
 {
-	if (snapshot_space) {
-		void *tmp = mspace_malloc(snapshot_space, size);
+	if (user_snapshot_space) {
+		void *tmp = mspace_malloc(user_snapshot_space, size);
 		ASSERT(tmp);
 		return tmp;
 	} else
@@ -158,13 +160,13 @@ void *malloc(size_t size)
 void free(void * ptr)
 {
 	if (!DontFree(ptr))
-		mspace_free(snapshot_space, ptr);
+		mspace_free(user_snapshot_space, ptr);
 }
 
 /** @brief Snapshotting realloc implementation for user programs */
 void *realloc(void *ptr, size_t size)
 {
-	void *tmp = mspace_realloc(snapshot_space, ptr, size);
+	void *tmp = mspace_realloc(user_snapshot_space, ptr, size);
 	ASSERT(tmp);
 	return tmp;
 }
@@ -172,8 +174,8 @@ void *realloc(void *ptr, size_t size)
 /** @brief Snapshotting calloc implementation for user programs */
 void * calloc(size_t num, size_t size)
 {
-	if (snapshot_space) {
-		void *tmp = mspace_calloc(snapshot_space, num, size);
+	if (user_snapshot_space) {
+		void *tmp = mspace_calloc(user_snapshot_space, num, size);
 		ASSERT(tmp);
 		return tmp;
 	} else {
diff --git a/mymemory.h b/mymemory.h
index 85679a1..0788e69 100644
--- a/mymemory.h
+++ b/mymemory.h
@@ -153,8 +153,7 @@ extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
 extern mspace create_mspace(size_t capacity, int locked);
 
 #if USE_MPROTECT_SNAPSHOT
-/** @brief mspace for the snapshotting heap */
-extern mspace snapshot_space;
+extern mspace user_snapshot_space;
 #endif
 
 #ifdef __cplusplus
diff --git a/snapshot.cc b/snapshot.cc
index 0c90da8..59aad72 100644
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -172,7 +172,7 @@ void initSnapshotLibrary(unsigned int numbackingpages,
 
 	void *basemySpace = model_malloc((numheappages+1)*PAGESIZE);
 	void * pagealignedbase=PageAlignAddressUpward(basemySpace);
-	snapshot_space = create_mspace_with_base(pagealignedbase, numheappages*PAGESIZE, 1 );
+	user_snapshot_space = create_mspace_with_base(pagealignedbase, numheappages * PAGESIZE, 1);
 	addMemoryRegionToSnapShot(pagealignedbase, numheappages);
 	entryPoint();
 }
-- 
2.34.1