size_t allocatedReqs[REQUESTS_BEFORE_ALLOC] = { 0 };
int nextRequest = 0;
int howManyFreed = 0;
+int switch_alloc = 0;
#if !USE_MPROTECT_SNAPSHOT
static mspace sStaticSpace = NULL;
#endif
/** 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;
sz = (sz + 7) & ~7;
if (sz > (BOOTSTRAPBYTES-offset)) {
- model_print("OUT OF BOOTSTRAP MEMORY\n");
+ model_print("OUT OF BOOTSTRAP MEMORY. Increase the size of BOOTSTRAPBYTES in mymemory.cc\n");
exit(EXIT_FAILURE);
}
size=(size+7)&~((size_t)7);
void *tmp = snapshot_struct->allocation_ptr;
snapshot_struct->allocation_ptr = (void *)((char *) snapshot_struct->allocation_ptr +size);
-
+
ASSERT(snapshot_struct->allocation_ptr <= snapshot_struct->top_ptr);
return tmp;
}
{
if (user_snapshot_space) {
/* Only perform user allocations from user context */
- return user_malloc(size);
+ if (switch_alloc) {
+ return model_malloc(size);
+ } else {
+ return user_malloc(size);
+ }
} else
return HandleEarlyAllocationRequest(size);
}
/** @brief Snapshotting free implementation for user programs */
void free(void * ptr)
{
- if (!DontFree(ptr))
- mspace_free(user_snapshot_space, ptr);
+ if (!DontFree(ptr)) {
+ if (switch_alloc) {
+ model_free(ptr);
+ } else {
+ mspace_free(user_snapshot_space, ptr);
+ }
+ }
}
/** @brief Snapshotting realloc implementation for user programs */
free(p);
}
-#else /* !USE_MPROTECT_SNAPSHOT */
+#else /* !USE_MPROTECT_SNAPSHOT */
/** @brief Snapshotting allocation function for use by the Thread class only */
void * Thread_malloc(size_t size)
free(ptr);
}
-#endif /* !USE_MPROTECT_SNAPSHOT */
+#endif/* !USE_MPROTECT_SNAPSHOT */