X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=66a4fb973066621e3531b3963f045eafb63977f7;hp=f7b716247e3965d5b2c2f3e255846b60aeda01c5;hb=54210d33af73ae7c74f2d416ab0e7bd472379e12;hpb=63b2c687570085f2a87b6a659d26608228af1ee0

diff --git a/mymemory.cc b/mymemory.cc
index f7b71624..66a4fb97 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,3 +1,4 @@
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <dlfcn.h>
@@ -16,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
@@ -180,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);
@@ -194,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);
 	}
 }
@@ -264,13 +258,13 @@ void operator delete[](void *p, size_t size)
 /** @brief Snapshotting allocation function for use by the Thread class only */
 void * Thread_malloc(size_t size)
 {
-	return malloc(size);
+	return snapshot_malloc(size);
 }
 
 /** @brief Snapshotting free function for use by the Thread class only */
 void Thread_free(void *ptr)
 {
-	free(ptr);
+	snapshot_free(ptr);
 }
 
 #endif	/* !USE_MPROTECT_SNAPSHOT */