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

diff --git a/mymemory.cc b/mymemory.cc
index f7b71624..efc36e98 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,3 +1,4 @@
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <dlfcn.h>
@@ -10,65 +11,37 @@
 #include "common.h"
 #include "threads-model.h"
 #include "model.h"
+#include "datarace.h"
 
 #define REQUESTS_BEFORE_ALLOC 1024
 
 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
 
 /** Non-snapshotting calloc for our use. */
 void *model_calloc(size_t count, size_t size)
 {
-#if USE_MPROTECT_SNAPSHOT
-	static void *(*callocp)(size_t count, size_t size) = NULL;
-	char *error;
-	void *ptr;
-
-	/* get address of libc malloc */
-	if (!callocp) {
-		callocp = (void * (*)(size_t, size_t))dlsym(RTLD_NEXT, "calloc");
-		if ((error = dlerror()) != NULL) {
-			fputs(error, stderr);
-			exit(EXIT_FAILURE);
-		}
-	}
-	ptr = callocp(count, size);
-	return ptr;
-#else
 	if (!sStaticSpace)
 		sStaticSpace = create_shared_mspace();
 	return mspace_calloc(sStaticSpace, count, size);
-#endif
 }
 
 /** Non-snapshotting malloc for our use. */
 void *model_malloc(size_t size)
 {
-#if USE_MPROTECT_SNAPSHOT
-	static void *(*mallocp)(size_t size) = NULL;
-	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;
-#else
 	if (!sStaticSpace)
 		sStaticSpace = create_shared_mspace();
 	return mspace_malloc(sStaticSpace, size);
-#endif
+}
+
+/** Non-snapshotting malloc for our use. */
+void *model_realloc(void *ptr, size_t size)
+{
+	if (!sStaticSpace)
+		sStaticSpace = create_shared_mspace();
+	return mspace_realloc(sStaticSpace, ptr, size);
 }
 
 /** @brief Snapshotting malloc, for use by model-checker (not user progs) */
@@ -104,22 +77,7 @@ void snapshot_free(void *ptr)
 /** Non-snapshotting free for our use. */
 void model_free(void *ptr)
 {
-#if USE_MPROTECT_SNAPSHOT
-	static void (*freep)(void *);
-	char *error;
-
-	/* get address of libc free */
-	if (!freep) {
-		freep = (void (*)(void *))dlsym(RTLD_NEXT, "free");
-		if ((error = dlerror()) != NULL) {
-			fputs(error, stderr);
-			exit(EXIT_FAILURE);
-		}
-	}
-	freep(ptr);
-#else
 	mspace_free(sStaticSpace, ptr);
-#endif
 }
 
 /** Bootstrap allocation. Problem is that the dynamic linker calls require
@@ -147,130 +105,14 @@ void * HandleEarlyAllocationRequest(size_t sz)
 /** @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 */
-mspace user_snapshot_space = NULL;
-
-/** Check whether this is bootstrapped memory that we should not free */
-static bool DontFree(void *ptr)
-{
-	return (ptr >= (&bootstrapmemory[0]) && ptr < (&bootstrapmemory[BOOTSTRAPBYTES]));
-}
-
-/**
- * @brief The allocator function for "user" allocation
- *
- * Should only be used for allocations which will not disturb the allocation
- * patterns of a user thread.
- */
-static void * user_malloc(size_t size)
-{
-	void *tmp = mspace_malloc(user_snapshot_space, size);
-	ASSERT(tmp);
-	return tmp;
-}
-
-/**
- * @brief Snapshotting malloc implementation for user programs
- *
- * Do NOT call this function from a model-checker context. Doing so may disrupt
- * the allocation patterns of a user thread.
- */
-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);
-	} else
-		return HandleEarlyAllocationRequest(size);
-}
-
-/** @brief Snapshotting free implementation for user programs */
-void free(void * ptr)
-{
-	if (!DontFree(ptr)) {
-		if (switch_alloc) {
-			return model_free(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(user_snapshot_space, ptr, size);
-	ASSERT(tmp);
-	return tmp;
-}
-
-/** @brief Snapshotting calloc implementation for user programs */
-void * calloc(size_t num, size_t size)
-{
-	if (user_snapshot_space) {
-		void *tmp = mspace_calloc(user_snapshot_space, num, size);
-		ASSERT(tmp);
-		return tmp;
-	} else {
-		void *tmp = HandleEarlyAllocationRequest(size * num);
-		memset(tmp, 0, size * num);
-		return tmp;
-	}
-}
-
 /** @brief Snapshotting allocation function for use by the Thread class only */
 void * Thread_malloc(size_t size)
 {
-	return user_malloc(size);
+	return snapshot_malloc(size);
 }
 
 /** @brief Snapshotting free function for use by the Thread class only */
 void Thread_free(void *ptr)
 {
-	free(ptr);
-}
-
-/** @brief Snapshotting new operator for user programs */
-void * operator new(size_t size) throw(std::bad_alloc)
-{
-	return malloc(size);
-}
-
-/** @brief Snapshotting delete operator for user programs */
-void operator delete(void *p) throw()
-{
-	free(p);
-}
-
-/** @brief Snapshotting new[] operator for user programs */
-void * operator new[](size_t size) throw(std::bad_alloc)
-{
-	return malloc(size);
+	snapshot_free(ptr);
 }
-
-/** @brief Snapshotting delete[] operator for user programs */
-void operator delete[](void *p, size_t size)
-{
-	free(p);
-}
-
-#else	/* !USE_MPROTECT_SNAPSHOT */
-
-/** @brief Snapshotting allocation function for use by the Thread class only */
-void * Thread_malloc(size_t size)
-{
-	return malloc(size);
-}
-
-/** @brief Snapshotting free function for use by the Thread class only */
-void Thread_free(void *ptr)
-{
-	free(ptr);
-}
-
-#endif	/* !USE_MPROTECT_SNAPSHOT */