snapshot: remove duplicate definition of finalize()

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index a825bb940f66f4331e723eadd8983f9bd8d05e70..1dada053c2ba9060ed1c3301e3b895c44bf3855c 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -3,12 +3,12 @@
 #include "snapshotimp.h"
 #include <stdio.h>
 #include <dlfcn.h>
-#if !USE_CHECKPOINTING
+#if !USE_MPROTECT_SNAPSHOT
 static mspace sStaticSpace = NULL;
 #endif
 
 void *MYMALLOC(size_t size) {
-#if USE_CHECKPOINTING
+#if USE_MPROTECT_SNAPSHOT
        static void *(*mallocp)(size_t size);
        char *error;
        void *ptr;
@@ -18,7 +18,7 @@ void *MYMALLOC(size_t size) {
                mallocp = ( void * ( * )( size_t ) )dlsym(RTLD_NEXT, "malloc");
                if ((error = dlerror()) != NULL) {
                        fputs(error, stderr);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
        ptr = mallocp(size);     
@@ -33,8 +33,39 @@ void *MYMALLOC(size_t size) {
 #endif
 }
 
+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);
+}
 void MYFREE(void *ptr) {
-#if USE_CHECKPOINTING
+#if USE_MPROTECT_SNAPSHOT
        static void (*freep)(void *);
        char *error;
 
@@ -43,7 +74,7 @@ void MYFREE(void *ptr) {
                freep = ( void  ( * )( void * ) )dlsym(RTLD_NEXT, "free");
                if ((error = dlerror()) != NULL) {
                        fputs(error, stderr);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
        }
        freep(ptr);
@@ -62,10 +93,22 @@ void free( void * ptr ){
        mspace_free( mySpace, ptr );
 }
 
+void *realloc( void *ptr, size_t size ){
+       return mspace_realloc( mySpace, ptr, size );
+}
+
 void * operator new(size_t size) throw(std::bad_alloc) {
-       return MYMALLOC(size);
+       return malloc(size);
 }
 
 void operator delete(void *p) throw() {
-       MYFREE(p);
+       free(p);
+}
+
+void * operator new[](size_t size) throw(std::bad_alloc) {
+       return malloc(size);
+}
+
+void operator delete[](void *p, size_t size) {
+       free(p);
 }