mymemory: add basic model_snapshot_space

[model-checker.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index 759bdccd89231eff77305f392166162d8c714de4..387d6de02365803b8dd33675539918b8d825ebbc 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -88,24 +88,6 @@ 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;
-}
-
 /** Non-snapshotting free for our use. */
 void model_free(void *ptr)
 {
@@ -127,9 +109,6 @@ void model_free(void *ptr)
 #endif
 }
 
-/** @brief Global mspace reference for the snapshotting heap */
-mspace mySpace = NULL;
-
 /** Bootstrap allocation.  Problem is that the dynamic linker calls
  *  require calloc to work and calloc requires the dynamic linker to
  *     work.  */
@@ -153,6 +132,16 @@ void * HandleEarlyAllocationRequest(size_t sz)
        return pointer;
 }
 
+/** @brief Global mspace reference for the model-checker's snapshotting heap */
+mspace model_snapshot_space = NULL;
+
+#if USE_MPROTECT_SNAPSHOT
+
+/** @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)
 {
@@ -162,8 +151,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 (user_snapshot_space) {
+               void *tmp = mspace_malloc(user_snapshot_space, size);
                ASSERT(tmp);
                return tmp;
        } else
@@ -174,13 +163,13 @@ void *malloc(size_t size)
 void free(void * ptr)
 {
        if (!DontFree(ptr))
-               mspace_free(mySpace, 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(mySpace, ptr, size);
+       void *tmp = mspace_realloc(user_snapshot_space, ptr, size);
        ASSERT(tmp);
        return tmp;
 }
@@ -188,8 +177,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 (user_snapshot_space) {
+               void *tmp = mspace_calloc(user_snapshot_space, num, size);
                ASSERT(tmp);
                return tmp;
        } else {
@@ -222,3 +211,4 @@ void operator delete[](void *p, size_t size)
 {
        free(p);
 }
+#endif /* USE_MPROTECT_SNAPSHOT */