#include <dlfcn.h>
#include <unistd.h>
#include <cstring>
+#include "common.h"
#define REQUESTS_BEFORE_ALLOC 1024
size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
int nextRequest = 0;
#endif
/** Non-snapshotting calloc for our use. */
-void *MYCALLOC(size_t count, size_t size) {
+void *model_calloc(size_t count, size_t size) {
#if USE_MPROTECT_SNAPSHOT
static void *(*callocp)(size_t count, size_t size)=NULL;
char *error;
}
/** Non-snapshotting free for our use. */
-void MYFREE(void *ptr) {
+void model_free(void *ptr) {
#if USE_MPROTECT_SNAPSHOT
static void (*freep)(void *);
char *error;
/** Snapshotting malloc implementation for user programs. */
void *malloc( size_t size ) {
- if (mySpace)
- return mspace_malloc( mySpace, size );
- else
+ if (mySpace) {
+ void *tmp=mspace_malloc( mySpace, size );
+ ASSERT(tmp);
+ return tmp;
+ } else
return HandleEarlyAllocationRequest( size );
}
/** Snapshotting realloc implementation for user programs. */
void *realloc( void *ptr, size_t size ){
- return mspace_realloc( mySpace, ptr, size );
+ void *tmp=mspace_realloc( mySpace, ptr, size );
+ ASSERT(tmp);
+ return tmp;
}
/** Snapshotting calloc implementation for user programs. */
void * calloc( size_t num, size_t size ){
- if (mySpace)
- return mspace_calloc( mySpace, num, size );
- else {
+ if (mySpace) {
+ void *tmp=mspace_calloc( mySpace, num, size );
+ ASSERT(tmp);
+ return tmp;
+ } else {
void *tmp=HandleEarlyAllocationRequest( size * num );
std::memset( tmp, 0, size * num );
return tmp;