Increase size of bootstrap bytes as some Linux distributions need more space.

[model-checker.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index e05cb783e2455bdf68aaa5b495fa664e000677f2..4182e094e5251c1a8efedbe8a92c232c012f13f3 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -7,12 +7,13 @@
 
 #include "mymemory.h"
 #include "snapshot.h"
-#include "snapshotimp.h"
 #include "common.h"
+#include "threads-model.h"
+#include "model.h"
 
 #define REQUESTS_BEFORE_ALLOC 1024
 
-size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
+size_t allocatedReqs[REQUESTS_BEFORE_ALLOC] = { 0 };
 int nextRequest = 0;
 int howManyFreed = 0;
 #if !USE_MPROTECT_SNAPSHOT
@@ -38,11 +39,8 @@ void *model_calloc(size_t count, size_t size)
        ptr = callocp(count, size);
        return ptr;
 #else
-       if (!snapshotrecord) {
-               createSharedMemory();
-       }
-       if (NULL == sStaticSpace)
-               sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+       if (!sStaticSpace)
+               sStaticSpace = create_shared_mspace();
        return mspace_calloc(sStaticSpace, count, size);
 #endif
 }
@@ -66,11 +64,8 @@ void *model_malloc(size_t size)
        ptr = mallocp(size);
        return ptr;
 #else
-       if (!snapshotrecord) {
-               createSharedMemory();
-       }
-       if (NULL == sStaticSpace)
-               sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+       if (!sStaticSpace)
+               sStaticSpace = create_shared_mspace();
        return mspace_malloc(sStaticSpace, size);
 #endif
 }
@@ -114,7 +109,7 @@ void model_free(void *ptr)
 
        /* get address of libc free */
        if (!freep) {
-               freep = ( void  ( * )( void *))dlsym(RTLD_NEXT, "free");
+               freep = (void (*)(void *))dlsym(RTLD_NEXT, "free");
                if ((error = dlerror()) != NULL) {
                        fputs(error, stderr);
                        exit(EXIT_FAILURE);
@@ -126,11 +121,10 @@ void model_free(void *ptr)
 #endif
 }
 
-/** Bootstrap allocation.  Problem is that the dynamic linker calls
- *  require calloc to work and calloc requires the dynamic linker to
- *     work.  */
+/** 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;
 
@@ -140,11 +134,11 @@ void * HandleEarlyAllocationRequest(size_t sz)
        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 *pointer= (void *)&bootstrapmemory[offset];
+       void *pointer = (void *)&bootstrapmemory[offset];
        offset += sz;
        return pointer;
 }
@@ -163,13 +157,31 @@ static bool DontFree(void *ptr)
        return (ptr >= (&bootstrapmemory[0]) && ptr < (&bootstrapmemory[BOOTSTRAPBYTES]));
 }
 
-/** @brief Snapshotting malloc implementation for user programs */
+/**
+ * @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) {
-               void *tmp = mspace_malloc(user_snapshot_space, size);
-               ASSERT(tmp);
-               return tmp;
+               /* Only perform user allocations from user context */
+               ASSERT(!model || thread_current());
+               return user_malloc(size);
        } else
                return HandleEarlyAllocationRequest(size);
 }
@@ -203,6 +215,18 @@ void * calloc(size_t num, size_t size)
        }
 }
 
+/** @brief Snapshotting allocation function for use by the Thread class only */
+void * Thread_malloc(size_t size)
+{
+       return user_malloc(size);
+}
+
+/** @brief Snapshotting free function for use by the Thread class only */
+void Thread_free(void *ptr)
+{
+       free(ptr);
+}
+
 /** @brief Snapshotting new operator for user programs */
 void * operator new(size_t size) throw(std::bad_alloc)
 {
@@ -226,4 +250,19 @@ void operator delete[](void *p, size_t size)
 {
        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 */