-/** Snapshotting malloc implementation for user programs. */
-void *malloc( size_t size ) {
- if (mySpace) {
- void *tmp=mspace_malloc( mySpace, size );
- ASSERT(tmp);
- return tmp;
- } else
- return HandleEarlyAllocationRequest( size );
+/**
+ * @brief The allocator function for "user" allocation
+ *
+ * Should only be used for allocations which will not disturb the allocation
+ * patterns of a user thread.
+ */
+static void * user_malloc(size_t size)
+{
+ void *tmp = mspace_malloc(user_snapshot_space, size);
+ ASSERT(tmp);
+ return tmp;
+}
+
+/**
+ * @brief Snapshotting malloc implementation for user programs
+ *
+ * Do NOT call this function from a model-checker context. Doing so may disrupt
+ * the allocation patterns of a user thread.
+ */
+void *malloc(size_t size)
+{
+ if (user_snapshot_space) {
+ /* Only perform user allocations from user context */
+ ASSERT(!model || thread_current());
+ return user_malloc(size);
+ } else
+ return HandleEarlyAllocationRequest(size);