diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gperftools/tcmalloc.h.in | 2 | ||||
| -rw-r--r-- | src/libc_override_gcc_and_weak.h | 7 | ||||
| -rw-r--r-- | src/libc_override_redefine.h | 6 | ||||
| -rw-r--r-- | src/tcmalloc.cc | 18 | ||||
| -rw-r--r-- | src/windows/gperftools/tcmalloc.h | 2 | ||||
| -rw-r--r-- | src/windows/gperftools/tcmalloc.h.in | 2 |
6 files changed, 37 insertions, 0 deletions
diff --git a/src/gperftools/tcmalloc.h.in b/src/gperftools/tcmalloc.h.in index 0334d3f..0eaa21a 100644 --- a/src/gperftools/tcmalloc.h.in +++ b/src/gperftools/tcmalloc.h.in @@ -122,12 +122,14 @@ extern "C" { PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_delete(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_delete_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_deletearray_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, const std::nothrow_t&) __THROW; } diff --git a/src/libc_override_gcc_and_weak.h b/src/libc_override_gcc_and_weak.h index 818e43d..5c0def2 100644 --- a/src/libc_override_gcc_and_weak.h +++ b/src/libc_override_gcc_and_weak.h @@ -71,6 +71,13 @@ void operator delete(void* p, const std::nothrow_t& nt) __THROW void operator delete[](void* p, const std::nothrow_t& nt) __THROW ALIAS(tc_deletearray_nothrow); +#ifdef ENABLE_SIZED_DELETE +void operator delete(void *p, size_t size) throw() + ALIAS(tc_delete_sized); +void operator delete[](void *p, size_t size) throw() + ALIAS(tc_deletearray_sized); +#endif + extern "C" { void* malloc(size_t size) __THROW ALIAS(tc_malloc); void free(void* ptr) __THROW ALIAS(tc_free); diff --git a/src/libc_override_redefine.h b/src/libc_override_redefine.h index a1e50f8..4c61116 100644 --- a/src/libc_override_redefine.h +++ b/src/libc_override_redefine.h @@ -66,6 +66,12 @@ void operator delete(void* ptr, const std::nothrow_t& nt) __THROW { void operator delete[](void* ptr, const std::nothrow_t& nt) __THROW { return tc_deletearray_nothrow(ptr, nt); } + +#ifdef ENABLE_SIZED_DELETE +void operator delete(void* p, size_t s) __THROW { tc_delete_sized(p, s); } +void operator delete[](void* p, size_t s) __THROW{ tc_deletearray_sized(p); } +#endif + extern "C" { void* malloc(size_t s) __THROW { return tc_malloc(s); } void free(void* p) __THROW { tc_free(p); } diff --git a/src/tcmalloc.cc b/src/tcmalloc.cc index f168dfd..d1e7167 100644 --- a/src/tcmalloc.cc +++ b/src/tcmalloc.cc @@ -1595,6 +1595,24 @@ extern "C" PERFTOOLS_DLL_DECL void tc_free_sized(void *ptr, size_t size) __THROW do_free_with_callback(ptr, &InvalidFree, true, size); } +#if defined(__GNUC__) && !defined(WIN32) + +extern "C" PERFTOOLS_DLL_DECL void tc_delete_sized(void *p, size_t size) throw() + __attribute__((alias("tc_free_sized"))); +extern "C" PERFTOOLS_DLL_DECL void tc_deletearray_sized(void *p, size_t size) throw() + __attribute__((alias("tc_free_sized"))); + +#else + +extern "C" PERFTOOLS_DLL_DECL void tc_delete_sized(void *p, size_t size) throw() { + tc_free_sized(p, size); +} +extern "C" PERFTOOLS_DLL_DECL void tc_deletearray_sized(void *p, size_t size) throw() { + tc_free_sized(p, size); +} + +#endif + extern "C" PERFTOOLS_DLL_DECL void* tc_calloc(size_t n, size_t elem_size) __THROW { void* result = do_calloc(n, elem_size); diff --git a/src/windows/gperftools/tcmalloc.h b/src/windows/gperftools/tcmalloc.h index 5867c7c..9c4753f 100644 --- a/src/windows/gperftools/tcmalloc.h +++ b/src/windows/gperftools/tcmalloc.h @@ -112,12 +112,14 @@ extern "C" { PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_delete(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_delete_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_deletearray_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, const std::nothrow_t&) __THROW; } diff --git a/src/windows/gperftools/tcmalloc.h.in b/src/windows/gperftools/tcmalloc.h.in index a7ec70f..c963e31 100644 --- a/src/windows/gperftools/tcmalloc.h.in +++ b/src/windows/gperftools/tcmalloc.h.in @@ -112,12 +112,14 @@ extern "C" { PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_delete(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_delete_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_deletearray_sized(void* p, size_t size) throw(); PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, const std::nothrow_t&) __THROW; } |