X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=95459be561af6b7bab74d50610d470f1005c4464;hp=9d598af7dfec11d77add4ecf02dbc845df924e00;hb=081ec029e06a68012f1a3fd119671148bfac9605;hpb=10de861d3a9908e75b6f94283cc67b3f1b4d93ab

diff --git a/mymemory.cc b/mymemory.cc
index 9d598af7..95459be5 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -3,38 +3,107 @@
 #include "snapshotimp.h"
 #include <stdio.h>
 #include <dlfcn.h>
-#if !USE_CHECKPOINTING
+#include <unistd.h>
+#include <cstring>
+#include "common.h"
+#define REQUESTS_BEFORE_ALLOC 1024
+size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
+int nextRequest = 0;
+int howManyFreed = 0;
+#if !USE_MPROTECT_SNAPSHOT
 static mspace sStaticSpace = NULL;
 #endif
 
-void *MYMALLOC(size_t size) {
-#if USE_CHECKPOINTING
-	static void *(*mallocp)(size_t size);
+/** 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( !snapshotrecord) {
+		createSharedMemory();
+	}
+	if( NULL == sStaticSpace )
+		sStaticSpace = create_mspace_with_base( ( void * )( snapshotrecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct SnapShot ), 1 );
+	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(1);
+			exit(EXIT_FAILURE);
 		}
 	}
-	ptr = mallocp(size);     
+	ptr = mallocp(size);
 	return ptr;
 #else
-	if( !sTheRecord ){
-		createSharedLibrary();
+	if( !snapshotrecord) {
+		createSharedMemory();
 	}
 	if( NULL == sStaticSpace )
-		sStaticSpace = create_mspace_with_base( ( void * )( sTheRecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct Snapshot_t ), 1 );
+		sStaticSpace = create_mspace_with_base( ( void * )( snapshotrecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct SnapShot ), 1 );
 	return mspace_malloc( sStaticSpace, size );
 #endif
 }
 
-void MYFREE(void *ptr) {
-#if USE_CHECKPOINTING
+/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
+void * snapshot_malloc(size_t size)
+{
+	return malloc(size);
+}
+
+/** @brief Snapshotting calloc, for use by model-checker (not user progs) */
+void * snapshot_calloc(size_t count, size_t size)
+{
+	return calloc(count, size);
+}
+
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+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;
+}
+
+void system_free( void * ptr ){
 	static void (*freep)(void *);
 	char *error;
 
@@ -43,7 +112,24 @@ void MYFREE(void *ptr) {
 		freep = ( void  ( * )( void * ) )dlsym(RTLD_NEXT, "free");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
-			exit(1);
+			exit(EXIT_FAILURE);
+		}
+	}
+	freep(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);
@@ -51,19 +137,103 @@ void MYFREE(void *ptr) {
 	mspace_free( sStaticSpace, ptr );
 #endif
 }
+
+
+/** @brief Global mspace reference for the snapshotting heap */
 mspace mySpace = NULL;
-void *malloc( size_t size ) {
-	return mspace_malloc( mySpace, size );
+
+/** @brief Global reference to the unaligned memory address that was malloc'd
+ * for the snapshotting heap */
+void *basemySpace = NULL;
+
+/** Bootstrap allocation.  Problem is that the dynamic linker calls
+ *  require calloc to work and calloc requires the dynamic linker to
+ *	work.  */
+
+#define BOOTSTRAPBYTES 4096
+char bootstrapmemory[BOOTSTRAPBYTES];
+size_t offset=0;
+
+void * HandleEarlyAllocationRequest( size_t sz ){
+	/*Align to 8 byte boundary*/
+	sz=(sz+7)&~7;
+
+	if (sz > (BOOTSTRAPBYTES-offset)) {
+		printf("OUT OF BOOTSTRAP MEMORY\n");
+		exit(EXIT_FAILURE);
+	}
+
+	void * pointer= (void *) & bootstrapmemory[offset];
+	offset+=sz;
+	return pointer;
+}
+
+/** Check whether this is bootstrapped memory that we should not
+		free. */
+
+bool DontFree( void * ptr ){
+	return (ptr>=(&bootstrapmemory[0])&&ptr<(&bootstrapmemory[BOOTSTRAPBYTES]));
+}
+
+/** @brief Snapshotting malloc implementation for user programs */
+void *malloc( size_t size )
+{
+	if (mySpace) {
+		void *tmp=mspace_malloc( mySpace, size );
+		ASSERT(tmp);
+		return tmp;
+	} else
+		return HandleEarlyAllocationRequest( size );
 }
 
+/** @brief Snapshotting free implementation for user programs */
 void free( void * ptr ){
-	mspace_free( mySpace, ptr );
+	if (!DontFree(ptr))
+		mspace_free(mySpace, ptr);
+}
+
+/** @brief Snapshotting realloc implementation for user programs */
+void *realloc( void *ptr, size_t size )
+{
+	void *tmp = mspace_realloc(mySpace, ptr, size);
+	ASSERT(tmp);
+	return tmp;
+}
+
+/** @brief Snapshotting calloc implementation for user programs */
+void * calloc( size_t num, size_t size )
+{
+	if (mySpace) {
+		void *tmp = mspace_calloc(mySpace, num, size);
+		ASSERT(tmp);
+		return tmp;
+	} else {
+		void *tmp=HandleEarlyAllocationRequest( size * num );
+		std::memset( tmp, 0, size * num );
+		return tmp;
+	}
+}
+
+/** @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);
 }
 
-void * operator new(size_t size) throw(std::bad_alloc) {
-	return MYMALLOC(size);
+/** @brief Snapshotting new[] operator for user programs */
+void * operator new[](size_t size) throw(std::bad_alloc)
+{
+	return malloc(size);
 }
 
-void operator delete(void *p) throw() {
-	MYFREE(p);
+/** @brief Snapshotting delete[] operator for user programs */
+void operator delete[](void *p, size_t size)
+{
+	free(p);
 }