mymemory: kill system_free()

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index 4b393cb4a29fac98fdb7b912fef5991d7a7c458a..5cb06a4f834e72a1be7f578c0e41c76d70f06aad 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -5,6 +5,7 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <cstring>
+#include "common.h"
 #define REQUESTS_BEFORE_ALLOC 1024
 size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
 int nextRequest = 0;
@@ -14,7 +15,7 @@ static mspace sStaticSpace = NULL;
 #endif
 
 /** Non-snapshotting calloc for our use. */
-void *MYCALLOC(size_t count, size_t size) {
+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;
@@ -67,6 +68,24 @@ void *model_malloc(size_t size) {
 #endif
 }
 
+/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
+void * snapshot_malloc(size_t size)
+{
+       return malloc(size);
+}
+
+/** @brief Snapshotting calloc, for use by model-checker (not user progs) */
+void * snapshot_calloc(size_t count, size_t size)
+{
+       return calloc(count, size);
+}
+
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
+{
+       free(ptr);
+}
+
 void *system_malloc( size_t size ){
        static void *(*mallocp)(size_t size);
        char *error;
@@ -84,23 +103,8 @@ void *system_malloc( size_t 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) {
+void model_free(void *ptr) {
 #if USE_MPROTECT_SNAPSHOT
        static void (*freep)(void *);
        char *error;
@@ -120,12 +124,9 @@ void MYFREE(void *ptr) {
 }
 
 
-/** This global references the mspace for the snapshotting heap */
+/** @brief Global mspace reference 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.  */
@@ -155,52 +156,65 @@ bool DontFree( void * ptr ){
        return (ptr>=(&bootstrapmemory[0])&&ptr<(&bootstrapmemory[BOOTSTRAPBYTES]));
 }
 
-/** Snapshotting malloc implementation for user programs. */
-void *malloc( size_t size ) {
-       if (mySpace)
-               return mspace_malloc( mySpace, size );
-       else
+/** @brief 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. */
+/** @brief Snapshotting free implementation for user programs */
 void free( void * ptr ){
-       if( DontFree( ptr ) ) return;
-       mspace_free( mySpace, ptr );
+       if (!DontFree(ptr))
+               mspace_free(mySpace, ptr);
 }
 
-/** Snapshotting realloc implementation for user programs. */
-void *realloc( void *ptr, size_t size ){
-       return mspace_realloc( mySpace, ptr, size );
+/** @brief 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)
-               return mspace_calloc( mySpace, num, size );
-       else {
+/** @brief 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) {
+/** @brief 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() {
+/** @brief 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) {
+/** @brief 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) {
+/** @brief Snapshotting delete[] operator for user programs */
+void operator delete[](void *p, size_t size)
+{
        free(p);
 }