Remove malloc overrides. Fixes issue 138.
parent
2d9805123c
commit
f33bcfafad
@ -1,36 +1,118 @@
|
||||
// This code is in the public domain -- Ignacio Castaño <castano@gmail.com>
|
||||
|
||||
#include "Memory.h"
|
||||
#include "Debug.h"
|
||||
|
||||
//#if HAVE_MALLOC_H
|
||||
//#include <malloc.h>
|
||||
//#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#define USE_EFENCE 0
|
||||
|
||||
#if USE_EFENCE
|
||||
extern "C" void *EF_malloc(size_t size);
|
||||
extern "C" void *EF_realloc(void * oldBuffer, size_t newSize);
|
||||
extern "C" void EF_free(void * address);
|
||||
#endif
|
||||
|
||||
using namespace nv;
|
||||
|
||||
void * nv::mem::malloc(size_t size)
|
||||
#if NV_OVERRIDE_ALLOC
|
||||
|
||||
void * malloc(size_t size)
|
||||
{
|
||||
#if USE_EFENCE
|
||||
return EF_malloc(size);
|
||||
#else
|
||||
return ::malloc(size);
|
||||
#endif
|
||||
}
|
||||
|
||||
void * debug_malloc(size_t size, const char * file, int line)
|
||||
{
|
||||
NV_UNUSED(file);
|
||||
NV_UNUSED(line);
|
||||
#if USE_EFENCE
|
||||
return EF_malloc(size);
|
||||
#else
|
||||
return ::malloc(size);
|
||||
#endif
|
||||
}
|
||||
|
||||
void free(void * ptr)
|
||||
{
|
||||
return ::malloc(size);
|
||||
#if USE_EFENCE
|
||||
return EF_free(const_cast<void *>(ptr));
|
||||
#else
|
||||
::free(const_cast<void *>(ptr));
|
||||
#endif
|
||||
}
|
||||
|
||||
void * nv::mem::malloc(size_t size, const char * file, int line)
|
||||
void * realloc(void * ptr, size_t size)
|
||||
{
|
||||
NV_UNUSED(file);
|
||||
NV_UNUSED(line);
|
||||
return ::malloc(size);
|
||||
nvDebugCheck(ptr != NULL || size != 0); // undefined realloc behavior.
|
||||
#if USE_EFENCE
|
||||
return EF_realloc(ptr, size);
|
||||
#else
|
||||
return ::realloc(ptr, size);
|
||||
#endif
|
||||
}
|
||||
|
||||
void nv::mem::free(const void * ptr)
|
||||
/* No need to override this unless we want line info.
|
||||
void * operator new (size_t size) throw()
|
||||
{
|
||||
::free(const_cast<void *>(ptr));
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
void * nv::mem::realloc(void * ptr, size_t size)
|
||||
void operator delete (void *p) throw()
|
||||
{
|
||||
nvDebugCheck(ptr != NULL || size != 0); // undefined realloc behavior.
|
||||
return ::realloc(ptr, size);
|
||||
free(p);
|
||||
}
|
||||
|
||||
void * operator new [] (size_t size) throw()
|
||||
{
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
void operator delete [] (void * p) throw()
|
||||
{
|
||||
free(p);
|
||||
}
|
||||
*/
|
||||
|
||||
#if 0 // Code from Apple:
|
||||
void* operator new(std::size_t sz) throw (std::bad_alloc)
|
||||
{
|
||||
void *result = std::malloc (sz == 0 ? 1 : sz);
|
||||
if (result == NULL)
|
||||
throw std::bad_alloc();
|
||||
gNewCounter++;
|
||||
return result;
|
||||
}
|
||||
void operator delete(void* p) throw()
|
||||
{
|
||||
if (p == NULL)
|
||||
return;
|
||||
std::free (p);
|
||||
gDeleteCounter++;
|
||||
}
|
||||
|
||||
/* These are the 'nothrow' versions of the above operators.
|
||||
The system version will try to call a std::new_handler if they
|
||||
fail, but your overriding versions are not required to do this. */
|
||||
void* operator new(std::size_t sz, const std::nothrow_t&) throw()
|
||||
{
|
||||
try {
|
||||
void * result = ::operator new (sz); // calls our overridden operator new
|
||||
return result;
|
||||
} catch (std::bad_alloc &) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
void operator delete(void* p, const std::nothrow_t&) throw()
|
||||
{
|
||||
::operator delete (p);
|
||||
}
|
||||
|
||||
#endif // 0
|
||||
|
||||
|
||||
#endif // NV_OVERRIDE_ALLOC
|
||||
|
Loading…
Reference in New Issue