Adding fixes for the fork based implementation, also removed some redundant code...

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index 80c1b953ff6855e24d058ddffa6589f29a6dda1f..0bbb7492dd3c1aef9987304a326678cde9484330 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -33,6 +33,37 @@ 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(1);
+               }
+       }
+       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(1);
+               }
+       }
+       freep(ptr);
+}
 void MYFREE(void *ptr) {
 #if USE_MPROTECT_SNAPSHOT
        static void (*freep)(void *);
@@ -62,6 +93,10 @@ 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 malloc(size);
 }