merge and resolve conflict

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index e72c1421f011a7297b33da2eb2a6c026b92bc3c9..66a4fb973066621e3531b3963f045eafb63977f7 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -17,7 +17,6 @@
 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
@@ -75,7 +74,7 @@ void *model_malloc(size_t size)
 /** @brief Snapshotting malloc, for use by model-checker (not user progs) */
 void * snapshot_malloc(size_t size)
 {
-  void *tmp = mspace_malloc(model_snapshot_space, size);
+       void *tmp = mspace_malloc(model_snapshot_space, size);
        ASSERT(tmp);
        return tmp;
 }
@@ -83,7 +82,7 @@ void * snapshot_malloc(size_t size)
 /** @brief Snapshotting calloc, for use by model-checker (not user progs) */
 void * snapshot_calloc(size_t count, size_t size)
 {
-  void *tmp = mspace_calloc(model_snapshot_space, count, size);
+       void *tmp = mspace_calloc(model_snapshot_space, count, size);
        ASSERT(tmp);
        return tmp;
 }
@@ -91,7 +90,7 @@ void * snapshot_calloc(size_t count, size_t size)
 /** @brief Snapshotting realloc, for use by model-checker (not user progs) */
 void *snapshot_realloc(void *ptr, size_t size)
 {
-  void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+       void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
        ASSERT(tmp);
        return tmp;
 }
@@ -99,7 +98,7 @@ void *snapshot_realloc(void *ptr, size_t size)
 /** @brief Snapshotting free, for use by model-checker (not user progs) */
 void snapshot_free(void *ptr)
 {
-  mspace_free(model_snapshot_space, ptr);
+       mspace_free(model_snapshot_space, ptr);
 }
 
 /** Non-snapshotting free for our use. */
@@ -181,9 +180,6 @@ static void * user_malloc(size_t size)
 void *malloc(size_t size)
 {
        if (user_snapshot_space) {
-               if (switch_alloc) {
-                       return model_malloc(size);
-               }
                /* Only perform user allocations from user context */
                ASSERT(!model || thread_current());
                return user_malloc(size);
@@ -195,9 +191,6 @@ void *malloc(size_t size)
 void free(void * ptr)
 {
        if (!DontFree(ptr)) {
-               if (switch_alloc) {
-                       return model_free(ptr);
-               }
                mspace_free(user_snapshot_space, ptr);
        }
 }