/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
void * snapshot_malloc(size_t size)
{
- return malloc(size);
+ void *tmp = mspace_malloc(model_snapshot_space, size);
+ ASSERT(tmp);
+ return tmp;
}
/** @brief Snapshotting calloc, for use by model-checker (not user progs) */
void * snapshot_calloc(size_t count, size_t size)
{
- return calloc(count, size);
+ void *tmp = mspace_calloc(model_snapshot_space, count, size);
+ ASSERT(tmp);
+ return tmp;
}
-/** @brief Snapshotting free, for use by model-checker (not user progs) */
-void snapshot_free(void *ptr)
+/** @brief Snapshotting realloc, for use by model-checker (not user progs) */
+void *snapshot_realloc(void *ptr, size_t size)
{
- free(ptr);
+ void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+ ASSERT(tmp);
+ return tmp;
}
-void *system_malloc(size_t size)
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
{
- 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;
+ mspace_free(model_snapshot_space, ptr);
}
/** Non-snapshotting free for our use. */
#endif
}
-/** @brief Global mspace reference for the snapshotting heap */
-mspace snapshot_space = NULL;
-
/** Bootstrap allocation. Problem is that the dynamic linker calls
* require calloc to work and calloc requires the dynamic linker to
* work. */
return pointer;
}
+/** @brief Global mspace reference for the model-checker's snapshotting heap */
+mspace model_snapshot_space = NULL;
+
+#if USE_MPROTECT_SNAPSHOT
+
+/** @brief Global mspace reference for the user's snapshotting heap */
+mspace user_snapshot_space = NULL;
+
/** Check whether this is bootstrapped memory that we should not free */
static bool DontFree(void *ptr)
{
/** @brief Snapshotting malloc implementation for user programs */
void *malloc(size_t size)
{
- if (snapshot_space) {
- void *tmp = mspace_malloc(snapshot_space, size);
+ if (user_snapshot_space) {
+ void *tmp = mspace_malloc(user_snapshot_space, size);
ASSERT(tmp);
return tmp;
} else
void free(void * ptr)
{
if (!DontFree(ptr))
- mspace_free(snapshot_space, ptr);
+ mspace_free(user_snapshot_space, ptr);
}
/** @brief Snapshotting realloc implementation for user programs */
void *realloc(void *ptr, size_t size)
{
- void *tmp = mspace_realloc(snapshot_space, ptr, size);
+ void *tmp = mspace_realloc(user_snapshot_space, ptr, size);
ASSERT(tmp);
return tmp;
}
/** @brief Snapshotting calloc implementation for user programs */
void * calloc(size_t num, size_t size)
{
- if (snapshot_space) {
- void *tmp = mspace_calloc(snapshot_space, num, size);
+ if (user_snapshot_space) {
+ void *tmp = mspace_calloc(user_snapshot_space, num, size);
ASSERT(tmp);
return tmp;
} else {
{
free(p);
}
+#endif /* USE_MPROTECT_SNAPSHOT */