projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: add CycleNode::resolvePromise(), CycleNode::getPromise()
[model-checker.git]
/
mymemory.cc
diff --git
a/mymemory.cc
b/mymemory.cc
index e05cb783e2455bdf68aaa5b495fa664e000677f2..44985fa3aebc0d3fc32f97c0606b3c7ef11154a8 100644
(file)
--- a/
mymemory.cc
+++ b/
mymemory.cc
@@
-7,12
+7,11
@@
#include "mymemory.h"
#include "snapshot.h"
#include "mymemory.h"
#include "snapshot.h"
-#include "snapshotimp.h"
#include "common.h"
#define REQUESTS_BEFORE_ALLOC 1024
#include "common.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
int nextRequest = 0;
int howManyFreed = 0;
#if !USE_MPROTECT_SNAPSHOT
@@
-38,11
+37,8
@@
void *model_calloc(size_t count, size_t size)
ptr = callocp(count, size);
return ptr;
#else
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
}
return mspace_calloc(sStaticSpace, count, size);
#endif
}
@@
-66,11
+62,8
@@
void *model_malloc(size_t size)
ptr = mallocp(size);
return ptr;
#else
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
}
return mspace_malloc(sStaticSpace, size);
#endif
}
@@
-114,7
+107,7
@@
void model_free(void *ptr)
/* get address of libc free */
if (!freep) {
/* 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);
if ((error = dlerror()) != NULL) {
fputs(error, stderr);
exit(EXIT_FAILURE);
@@
-126,9
+119,8
@@
void model_free(void *ptr)
#endif
}
#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
char bootstrapmemory[BOOTSTRAPBYTES];
#define BOOTSTRAPBYTES 4096
char bootstrapmemory[BOOTSTRAPBYTES];
@@
-144,7
+136,7
@@
void * HandleEarlyAllocationRequest(size_t sz)
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- void *pointer= (void *)&bootstrapmemory[offset];
+ void *pointer
= (void *)&bootstrapmemory[offset];
offset += sz;
return pointer;
}
offset += sz;
return pointer;
}