Work around changes in newer versions of glibc

[satcheck.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index d911f5d348c1f49132549f35c9a4e1b3a050d4c0..ea65c8967f471db37c601ca41a103e607f5d4e7d 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -26,6 +26,7 @@
 size_t allocatedReqs[REQUESTS_BEFORE_ALLOC] = { 0 };
 int nextRequest = 0;
 int howManyFreed = 0;
+int switch_alloc = 0;
 #if !USE_MPROTECT_SNAPSHOT
 static mspace sStaticSpace = NULL;
 #endif
@@ -159,7 +160,7 @@ void model_free(void *ptr)
 /** Bootstrap allocation. Problem is that the dynamic linker calls require
  *  calloc to work and calloc requires the dynamic linker to work. */
 
-#define BOOTSTRAPBYTES 4096
+#define BOOTSTRAPBYTES 131072
 char bootstrapmemory[BOOTSTRAPBYTES];
 size_t offset = 0;
 
@@ -169,7 +170,7 @@ void * HandleEarlyAllocationRequest(size_t sz)
        sz = (sz + 7) & ~7;
 
        if (sz > (BOOTSTRAPBYTES-offset)) {
-               model_print("OUT OF BOOTSTRAP MEMORY\n");
+               model_print("OUT OF BOOTSTRAP MEMORY.  Increase the size of BOOTSTRAPBYTES in mymemory.cc\n");
                exit(EXIT_FAILURE);
        }
 
@@ -226,7 +227,11 @@ void *malloc(size_t size)
 {
        if (user_snapshot_space) {
                /* Only perform user allocations from user context */
-               return user_malloc(size);
+               if (switch_alloc) {
+                       return model_malloc(size);
+               } else {
+                       return user_malloc(size);
+               }
        } else
                return HandleEarlyAllocationRequest(size);
 }
@@ -235,7 +240,11 @@ void *malloc(size_t size)
 void free(void * ptr)
 {
        if (!DontFree(ptr))
-               mspace_free(user_snapshot_space, ptr);
+               if (switch_alloc) {
+                       model_free(ptr);
+               } else {
+                       mspace_free(user_snapshot_space, ptr);
+               }
 }
 
 /** @brief Snapshotting realloc implementation for user programs */