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

diff --git a/mymemory.cc b/mymemory.cc
index 2b9c44d5..dd22909c 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,139 +1,112 @@
-#include "mymemory.h"
-#include "snapshot.h"
-#include "snapshotimp.h"
+
+#include <stdlib.h>
 #include <stdio.h>
 #include <dlfcn.h>
-#if !USE_MPROTECT_SNAPSHOT
-static mspace sStaticSpace = NULL;
-#endif
+#include <unistd.h>
+#include <string.h>
+#include <new>
 
-/** 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 );
-#endif
+#include "mymemory.h"
+#include "snapshot.h"
+#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;
+mspace sStaticSpace = NULL;
+
+/** Non-snapshotting calloc for our use. */
+void *model_calloc(size_t count, size_t size)
+{
+	return mspace_calloc(sStaticSpace, count, size);
 }
 
-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;
+/** Non-snapshotting malloc for our use. */
+void *model_malloc(size_t size)
+{
+	return mspace_malloc(sStaticSpace, size);
 }
 
-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 malloc for our use. */
+void *model_realloc(void *ptr, size_t size)
+{
+	return mspace_realloc(sStaticSpace, ptr, size);
 }
 
-/** 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 );
-#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;
 }
 
-
-/** 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 );
+/** @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;
 }
 
-/** Snapshotting free implementation for user programs. */
-
-void free( void * ptr ){
-	mspace_free( mySpace, ptr );
+/** @brief Snapshotting realloc, for use by model-checker (not user progs) */
+void *snapshot_realloc(void *ptr, size_t size)
+{
+	void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+	ASSERT(tmp);
+	return tmp;
 }
 
-/** Snapshotting realloc implementation for user programs. */
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
+{
+	mspace_free(model_snapshot_space, ptr);
+}
 
-void *realloc( void *ptr, size_t size ){
-	return mspace_realloc( mySpace, ptr, size );
+/** Non-snapshotting free for our use. */
+void model_free(void *ptr)
+{
+	mspace_free(sStaticSpace, ptr);
 }
 
-/** Snapshotting new operator for user programs. */
+/** Bootstrap allocation. Problem is that the dynamic linker calls require
+ *  calloc to work and calloc requires the dynamic linker to work. */
 
-void * operator new(size_t size) throw(std::bad_alloc) {
-	return malloc(size);
-}
+#define BOOTSTRAPBYTES 131072
+char bootstrapmemory[BOOTSTRAPBYTES];
+size_t offset = 0;
 
-/** Snapshotting delete operator for user programs. */
+void * HandleEarlyAllocationRequest(size_t sz)
+{
+	/* Align to 8 byte boundary */
+	sz = (sz + 7) & ~7;
 
-void operator delete(void *p) throw() {
-	free(p);
+	if (sz > (BOOTSTRAPBYTES-offset)) {
+		model_print("OUT OF BOOTSTRAP MEMORY.  Increase the size of BOOTSTRAPBYTES in mymemory.cc\n");
+		exit(EXIT_FAILURE);
+	}
+
+	void *pointer = (void *)&bootstrapmemory[offset];
+	offset += sz;
+	return pointer;
 }
 
-/** Snapshotting new[] operator for user programs. */
+/** @brief Global mspace reference for the model-checker's snapshotting heap */
+mspace model_snapshot_space = NULL;
 
-void * operator new[](size_t size) throw(std::bad_alloc) {
-	return malloc(size);
+/** @brief Snapshotting allocation function for use by the Thread class only */
+void * Thread_malloc(size_t size)
+{
+	return snapshot_malloc(size);
 }
 
-/** Snapshotting delete[] operator for user programs. */
-
-void operator delete[](void *p, size_t size) {
-	free(p);
+/** @brief Snapshotting free function for use by the Thread class only */
+void Thread_free(void *ptr)
+{
+	snapshot_free(ptr);
 }