#include "mymemory.h"
#include "snapshot.h"
-#include "snapshotimp.h"
#include "common.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
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);
+ if (!sStaticSpace)
+ sStaticSpace = create_shared_mspace();
return mspace_calloc(sStaticSpace, count, size);
#endif
}
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);
+ if (!sStaticSpace)
+ sStaticSpace = create_shared_mspace();
return mspace_malloc(sStaticSpace, size);
#endif
}
/* get address of libc free */
if (!freep) {
- freep = ( void ( * )( void *))dlsym(RTLD_NEXT, "free");
+ freep = (void (*)(void *))dlsym(RTLD_NEXT, "free");
if ((error = dlerror()) != NULL) {
fputs(error, stderr);
exit(EXIT_FAILURE);
#endif
}
-/** 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
char bootstrapmemory[BOOTSTRAPBYTES];
exit(EXIT_FAILURE);
}
- void *pointer= (void *)&bootstrapmemory[offset];
+ void *pointer = (void *)&bootstrapmemory[offset];
offset += sz;
return pointer;
}