X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=08bd4e437c897967830d5dc760d0d4f27f351b50;hp=c3c67e2812fe9bd2ac20ad3eae85de8c75382d46;hb=2462c395788348d3c036154d9f8500096804fe29;hpb=810306cb85accaaace9a50f174264f105991230b

diff --git a/mymemory.cc b/mymemory.cc
index c3c67e28..08bd4e43 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,75 +1,226 @@
-
 #include "mymemory.h"
 #include "snapshot.h"
 #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( !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_calloc(sStaticSpace, count, size);
 #endif
 }
 
-void MYFREE(void *ptr)
+/** 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 (!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
+}
+
+/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
+void * snapshot_malloc(size_t size)
+{
+	void *tmp = mspace_malloc(model_snapshot_space, size);
+	ASSERT(tmp);
+	return tmp;
+}
+
+/** @brief Snapshotting calloc, for use by model-checker (not user progs) */
+void * snapshot_calloc(size_t count, size_t size)
+{
+	void *tmp = mspace_calloc(model_snapshot_space, count, size);
+	ASSERT(tmp);
+	return tmp;
+}
+
+/** @brief Snapshotting realloc, for use by model-checker (not user progs) */
+void *snapshot_realloc(void *ptr, size_t size)
 {
-#if USE_CHECKPOINTING
-  static void (*freep)(void *);
-  char *error;
+	void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+	ASSERT(tmp);
+	return tmp;
+}
 
-  /* 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);
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
+{
+	mspace_free(model_snapshot_space, 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;
-void *malloc( size_t size ){
-	if( NULL == mySpace ){
-		//void * mem = MYMALLOC( MSPACE_SIZE );
-		mySpace = create_mspace( MSPACE_SIZE, 1 );
-        AddUserHeapToSnapshot();
+
+/** 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;
+}
+
+/** @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
+ *  @todo use this ONLY for user's allocations, not for internal snapshotting
+ *  state */
+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 Snapshotting malloc implementation for user programs */
+void *malloc(size_t size)
+{
+	if (user_snapshot_space) {
+		void *tmp = mspace_malloc(user_snapshot_space, size);
+		ASSERT(tmp);
+		return tmp;
+	} else
+		return HandleEarlyAllocationRequest(size);
+}
+
+/** @brief Snapshotting free implementation for user programs */
+void free(void * ptr)
+{
+	if (!DontFree(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);
+		std::memset(tmp, 0, size * num);
+		return tmp;
 	}
-	return mspace_malloc( mySpace, size );
 }
 
-void free( void * ptr ){
-	mspace_free( mySpace, ptr );
+/** @brief Snapshotting new operator for user programs */
+void * operator new(size_t size) throw(std::bad_alloc)
+{
+	return malloc(size);
 }
 
-void AddUserHeapToSnapshot(){
-    static bool alreadySnapshotted = false;
-    if( alreadySnapshotted ) return;
-    addMemoryRegionToSnapShot( mySpace, MSPACE_SIZE / PAGESIZE );
+/** @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);
+}
+
+/** @brief Snapshotting delete[] operator for user programs */
+void operator delete[](void *p, size_t size)
+{
+	free(p);
 }
+#endif /* USE_MPROTECT_SNAPSHOT */