#include "mymemory.h"
#include "snapshot.h"
#include "common.h"
+#include "threads-model.h"
+#include "model.h"
#define REQUESTS_BEFORE_ALLOC 1024
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
/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
void * snapshot_malloc(size_t size)
{
- void *tmp = mspace_malloc(model_snapshot_space, size);
+ void *tmp = malloc(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)
{
- void *tmp = mspace_calloc(model_snapshot_space, count, size);
+ void *tmp = calloc(count, size);
ASSERT(tmp);
return tmp;
}
/** @brief Snapshotting realloc, for use by model-checker (not user progs) */
void *snapshot_realloc(void *ptr, size_t size)
{
- void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+ void *tmp = realloc(ptr, size);
ASSERT(tmp);
return tmp;
}
/** @brief Snapshotting free, for use by model-checker (not user progs) */
void snapshot_free(void *ptr)
{
- mspace_free(model_snapshot_space, ptr);
+ free(ptr);
}
/** Non-snapshotting free for our use. */
/** 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);
}
*/
void *malloc(size_t size)
{
- if (user_snapshot_space)
+ 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);
- else
+ } else
return HandleEarlyAllocationRequest(size);
}
/** @brief Snapshotting free implementation for user programs */
void free(void * ptr)
{
- if (!DontFree(ptr))
+ if (!DontFree(ptr)) {
+ if (switch_alloc) {
+ return model_free(ptr);
+ }
mspace_free(user_snapshot_space, ptr);
+ }
}
/** @brief Snapshotting realloc implementation for user programs */
{
free(p);
}
-#endif /* 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);
+}
+
+/** @brief Snapshotting free function for use by the Thread class only */
+void Thread_free(void *ptr)
+{
+ free(ptr);
+}
+
+#endif /* !USE_MPROTECT_SNAPSHOT */