projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c22fe32
)
Removing comment asking to fix fork(), has been fixed now
author
Subramanian Ganapathy
<sganapat@uci.edu>
Wed, 13 Jun 2012 20:07:22 +0000
(13:07 -0700)
committer
Brian Norris
<banorris@uci.edu>
Thu, 14 Jun 2012 04:27:54 +0000
(21:27 -0700)
mymemory.cc
patch
|
blob
|
history
diff --git
a/mymemory.cc
b/mymemory.cc
index 245b2701807710bbca6c1f69ea1df662e89e9181..bc1d2ba6c236a6fcfd3c8ddaf94b4c6a082ce455 100644
(file)
--- a/
mymemory.cc
+++ b/
mymemory.cc
@@
-100,8
+100,6
@@
mspace mySpace = NULL;
/** This global references the unaligned memory address that was malloced for the snapshotting heap */
void * basemySpace = NULL;
/** This global references the unaligned memory address that was malloced for the snapshotting heap */
void * basemySpace = NULL;
-//Subramanian --- please make these work for the fork based approach
-
/** Adding the fix for not able to allocate through a reimplemented calloc at the beginning before instantiating our allocator
A bit circumspect about adding an sbrk. linux docs say to avoid using it... */
/** Adding the fix for not able to allocate through a reimplemented calloc at the beginning before instantiating our allocator
A bit circumspect about adding an sbrk. linux docs say to avoid using it... */
@@
-163,10
+161,8
@@
void * calloc( size_t num, size_t size ){
return mspace_calloc( mySpace, num, size );
}
return mspace_calloc( mySpace, num, size );
}
-
/** Snapshotting new operator for user programs. */
/** 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);
}