-#include "mymemory.h"
-#include "snapshot.h"
-#include "snapshotimp.h"
+
+#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
#include <unistd.h>
-#include <cstring>
+#include <string.h>
+#include <new>
+
+#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 };
+
+size_t allocatedReqs[REQUESTS_BEFORE_ALLOC] = { 0 };
int nextRequest = 0;
int howManyFreed = 0;
-#if !USE_MPROTECT_SNAPSHOT
-static mspace sStaticSpace = NULL;
-#endif
+mspace sStaticSpace = NULL;
/** 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
+void *model_calloc(size_t count, size_t size)
+{
+ return mspace_calloc(sStaticSpace, count, size);
}
/** 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
+void *model_malloc(size_t size)
+{
+ return mspace_malloc(sStaticSpace, 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_realloc(void *ptr, size_t size)
+{
+ return mspace_realloc(sStaticSpace, ptr, 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);
+/** @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;
}
-/** 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 );
-#endif
+/** @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)
+{
+ void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+ ASSERT(tmp);
+ return tmp;
+}
-/** This global references the mspace for the snapshotting heap */
-mspace mySpace = NULL;
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
+{
+ mspace_free(model_snapshot_space, ptr);
+}
-/** This global references the unaligned memory address that was malloced for the snapshotting heap */
-void * basemySpace = NULL;
+/** Non-snapshotting free for our use. */
+void model_free(void *ptr)
+{
+ mspace_free(sStaticSpace, ptr);
+}
-/** Bootstrap allocation. Problem is that the dynamic linker calls
- * require calloc to work and calloc requires the dynamic linker to
- * work. */
+/** Bootstrap allocation. Problem is that the dynamic linker calls require
+ * calloc to work and calloc requires the dynamic linker to work. */
-#define BOOTSTRAPBYTES 4096
+#define BOOTSTRAPBYTES 131072
char bootstrapmemory[BOOTSTRAPBYTES];
-size_t offset=0;
+size_t offset = 0;
-void * HandleEarlyAllocationRequest( size_t sz ){
- /*Align to 8 byte boundary*/
- sz=(sz+7)&~7;
+void * HandleEarlyAllocationRequest(size_t sz)
+{
+ /* Align to 8 byte boundary */
+ sz = (sz + 7) & ~7;
if (sz > (BOOTSTRAPBYTES-offset)) {
- printf("OUT OF BOOTSTRAP MEMORY\n");
+ 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;
+ 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 (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 ){
- if( DontFree( ptr ) ) return;
- mspace_free( mySpace, ptr );
-}
-
-/** 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 malloc(size);
-}
-
-/** Snapshotting delete operator for user programs. */
-void operator delete(void *p) throw() {
- free(p);
-}
+/** @brief Global mspace reference for the model-checker's snapshotting heap */
+mspace model_snapshot_space = NULL;
-/** Snapshotting new[] operator for user programs. */
-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);
}
projects / c11tester.git / blobdiff