+
#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
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
#endif
}
+/** Non-snapshotting malloc for our use. */
+void *model_realloc(void *ptr, size_t size)
+{
+#if USE_MPROTECT_SNAPSHOT
+ static void *(*reallocp)(void *ptr, size_t size) = NULL;
+ char *error;
+ void *newptr;
+
+ /* get address of libc malloc */
+ if (!reallocp) {
+ reallocp = (void * (*)(size_t))dlsym(RTLD_NEXT, "realloc");
+ if ((error = dlerror()) != NULL) {
+ fputs(error, stderr);
+ exit(EXIT_FAILURE);
+ }
+ }
+ newptr = reallocp(ptr, size);
+ return newptr;
+#else
+ if (!sStaticSpace)
+ sStaticSpace = create_shared_mspace();
+ return mspace_realloc(sStaticSpace, ptr, size);
+#endif
+}
+
/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
void * snapshot_malloc(size_t size)
{
void *malloc(size_t size)
{
if (user_snapshot_space) {
- if (switch_alloc) {
- return model_malloc(size);
- }
/* Only perform user allocations from user context */
ASSERT(!model || thread_current());
return user_malloc(size);
void free(void * ptr)
{
if (!DontFree(ptr)) {
- if (switch_alloc) {
- return model_free(ptr);
- }
mspace_free(user_snapshot_space, ptr);
}
}
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)
{
- return malloc(size);
+ return snapshot_malloc(size);
}
/** @brief Snapshotting free function for use by the Thread class only */
void Thread_free(void *ptr)
{
- free(ptr);
+ snapshot_free(ptr);
}
-#endif /* !USE_MPROTECT_SNAPSHOT */
+#endif /* !USE_MPROTECT_SNAPSHOT */