projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more documentation
[c11tester.git]
/
mymemory.cc
diff --git
a/mymemory.cc
b/mymemory.cc
index 1dada053c2ba9060ed1c3301e3b895c44bf3855c..2b9c44d516282e1041487c6d0d1a5f1a78a1f472 100644
(file)
--- a/
mymemory.cc
+++ b/
mymemory.cc
@@
-7,6
+7,8
@@
static mspace sStaticSpace = NULL;
#endif
static mspace sStaticSpace = NULL;
#endif
+/** Non-snapshotting malloc for our use. */
+
void *MYMALLOC(size_t size) {
#if USE_MPROTECT_SNAPSHOT
static void *(*mallocp)(size_t size);
void *MYMALLOC(size_t size) {
#if USE_MPROTECT_SNAPSHOT
static void *(*mallocp)(size_t size);
@@
-64,6
+66,8
@@
void system_free( void * ptr ){
}
freep(ptr);
}
}
freep(ptr);
}
+
+/** Non-snapshotting free for our use. */
void MYFREE(void *ptr) {
#if USE_MPROTECT_SNAPSHOT
static void (*freep)(void *);
void MYFREE(void *ptr) {
#if USE_MPROTECT_SNAPSHOT
static void (*freep)(void *);
@@
-82,33
+86,54
@@
void MYFREE(void *ptr) {
mspace_free( sStaticSpace, ptr );
#endif
}
mspace_free( sStaticSpace, ptr );
#endif
}
+
+
+/** This global references the mspace for the snapshotting heap */
mspace mySpace = NULL;
mspace mySpace = NULL;
+
+/** This global references the unaligned memory address that was malloced for the snapshotting heap */
void * basemySpace = NULL;
void * basemySpace = NULL;
+//Subramanian --- please make these work for the fork based approach
+
+/** Snapshotting malloc implementation for user programs. */
+
void *malloc( size_t size ) {
return mspace_malloc( mySpace, size );
}
void *malloc( size_t size ) {
return mspace_malloc( mySpace, size );
}
+/** Snapshotting free implementation for user programs. */
+
void free( void * ptr ){
mspace_free( mySpace, ptr );
}
void free( void * ptr ){
mspace_free( mySpace, ptr );
}
+/** Snapshotting realloc implementation for user programs. */
+
void *realloc( void *ptr, size_t size ){
return mspace_realloc( mySpace, ptr, size );
}
void *realloc( void *ptr, size_t size ){
return mspace_realloc( mySpace, ptr, size );
}
+/** Snapshotting new operator for user programs. */
+
void * operator new(size_t size) throw(std::bad_alloc) {
return malloc(size);
}
void * operator new(size_t size) throw(std::bad_alloc) {
return malloc(size);
}
+/** Snapshotting delete operator for user programs. */
+
void operator delete(void *p) throw() {
free(p);
}
void operator delete(void *p) throw() {
free(p);
}
+/** Snapshotting new[] operator for user programs. */
+
void * operator new[](size_t size) throw(std::bad_alloc) {
return malloc(size);
}
void * operator new[](size_t size) throw(std::bad_alloc) {
return malloc(size);
}
+/** Snapshotting delete[] operator for user programs. */
+
void operator delete[](void *p, size_t size) {
free(p);
}
void operator delete[](void *p, size_t size) {
free(p);
}