X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=6fd7c704b9175c7c47a5df6a50016ded23046a8f;hp=ac46b1178df29eeabacdd063f85cbd9783dc5260;hb=6d8f169552ab07df876bd11725162ac602c5f4fe;hpb=7ff2770de1315e88ea63e21dbaee9edda0e39827

diff --git a/mymemory.cc b/mymemory.cc
index ac46b117..6fd7c704 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -3,80 +3,211 @@
 #include "snapshotimp.h"
 #include <stdio.h>
 #include <dlfcn.h>
-#define MSPACE_SIZE ( 1 << 20 )
-#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);
-  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);
-    }
-  }
-  ptr = mallocp(size);     
-  return ptr;
+/** 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(EXIT_FAILURE);
+		}
+	}
+	ptr = mallocp(size);
+	return ptr;
 #else
-  if( !sTheRecord ){
-    createSharedLibrary();
-  }
-  if( NULL == sStaticSpace )
-    sStaticSpace = create_mspace_with_base( ( void * )( sTheRecord->mSharedMemoryBase ), SHARED_MEMORY_DEFAULT -sizeof( struct Snapshot_t ), 1 );
-  return mspace_malloc( sStaticSpace, size );
+	if( !snapshotrecord) {
+		createSharedMemory();
+	}
+	if( NULL == sStaticSpace )
+		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
-  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(1);
-    }
-  }
-  freep(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;
+
+	/* 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);
+}
+
+/** 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 );
+	mspace_free( sStaticSpace, ptr );
 #endif
 }
-static mspace mySpace = NULL;
+
+
+/** This global references the mspace for the snapshotting heap */
+mspace mySpace = NULL;
+
+/** This global references the unaligned memory address that was malloced 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]));
+}
+
+/** Snapshotting malloc implementation for user programs. */
 void *malloc( size_t size ) {
-  if( NULL == mySpace ){
-    //void * mem = MYMALLOC( MSPACE_SIZE );
-    mySpace = create_mspace( MSPACE_SIZE, 1 );
-    AddUserHeapToSnapshot();
-  }
-  return mspace_malloc( mySpace, size );
+	if (mySpace) {
+		void *tmp=mspace_malloc( mySpace, size );
+		ASSERT(tmp);
+		return tmp;
+	}	else
+		return HandleEarlyAllocationRequest( size );
 }
 
+/** Snapshotting free implementation for user programs. */
 void free( void * ptr ){
-  mspace_free( mySpace, ptr );
+	if( DontFree( ptr ) ) return;
+	mspace_free( mySpace, ptr );
 }
 
-void AddUserHeapToSnapshot(){
-  static bool alreadySnapshotted = false;
-  if( alreadySnapshotted ) return;
-  addMemoryRegionToSnapShot( mySpace, MSPACE_SIZE / PAGESIZE );
+/** Snapshotting realloc implementation for user programs. */
+void *realloc( void *ptr, size_t size ){
+	void *tmp=mspace_realloc( mySpace, ptr, size );
+	ASSERT(tmp);
+	return tmp;
 }
 
+/** 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;
+	}
+}
 
+/** Snapshotting new operator for user programs. */
 void * operator new(size_t size) throw(std::bad_alloc) {
-  return MYMALLOC(size);
+	return malloc(size);
 }
 
+/** Snapshotting delete operator for user programs. */
 void operator delete(void *p) throw() {
-  MYFREE(p);
+	free(p);
+}
+
+/** Snapshotting new[] operator for user programs. */
+void * operator new[](size_t size) throw(std::bad_alloc) {
+	return malloc(size);
+}
+
+/** Snapshotting delete[] operator for user programs. */
+void operator delete[](void *p, size_t size) {
+	free(p);
 }