X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=2b9c44d516282e1041487c6d0d1a5f1a78a1f472;hp=c3c67e2812fe9bd2ac20ad3eae85de8c75382d46;hb=7bec9f8bcc8c63a0be2b31f8aa01a61a50afe4f9;hpb=810306cb85accaaace9a50f174264f105991230b

diff --git a/mymemory.cc b/mymemory.cc
index c3c67e28..2b9c44d5 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,75 +1,139 @@
-
 #include "mymemory.h"
 #include "snapshot.h"
 #include "snapshotimp.h"
 #include <stdio.h>
 #include <dlfcn.h>
-#define MSPACE_SIZE ( 1 << 20 )
-#if !USE_CHECKPOINTING
+#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 malloc for our use. */
+
+void *MYMALLOC(size_t size) {
+#if USE_MPROTECT_SNAPSHOT
+	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;
 #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( !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 );
 #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 MYFREE(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;
-void *malloc( size_t size ){
-	if( NULL == mySpace ){
-		//void * mem = MYMALLOC( MSPACE_SIZE );
-		mySpace = create_mspace( MSPACE_SIZE, 1 );
-        AddUserHeapToSnapshot();
-	}
+
+
+/** 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;
+
+//Subramanian --- please make these work for the fork based approach
+
+/** Snapshotting malloc implementation for user programs. */
+
+void *malloc( size_t size ) {
 	return mspace_malloc( mySpace, size );
 }
 
+/** Snapshotting free implementation for user programs. */
+
 void free( void * ptr ){
 	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 ){
+	return mspace_realloc( mySpace, ptr, size );
+}
+
+/** 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) throw() {
+	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);
 }