project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix style nits.

Browse Source
This commit is contained in:
Jason Evans 2017-01-13 18:17:54 -08:00
parent e8990dc7c7
commit 41aa41853c
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jemalloc_cpp.cpp
View File

@ -17,26 +17,25 @@
void *operator new(std::size_t size); void *operator new(std::size_t size);
void *operator new[](std::size_t size); void *operator new[](std::size_t size);
void *operator new(std::size_t size, const std::nothrow_t&) noexcept; void *operator new(std::size_t size, const std::nothrow_t &) noexcept;
void *operator new[](std::size_t size, const std::nothrow_t&) noexcept; void *operator new[](std::size_t size, const std::nothrow_t &) noexcept;
void operator delete(void* ptr) noexcept; void operator delete(void *ptr) noexcept;
void operator delete[](void* ptr) noexcept; void operator delete[](void *ptr) noexcept;
void operator delete(void* ptr, const std::nothrow_t&) noexcept; void operator delete(void *ptr, const std::nothrow_t &) noexcept;
void operator delete[](void* ptr, const std::nothrow_t&) noexcept; void operator delete[](void *ptr, const std::nothrow_t &) noexcept;
#if __cpp_sized_deallocation >= 201309 #if __cpp_sized_deallocation >= 201309
/* C++14's sized-delete operators. */ /* C++14's sized-delete operators. */
void operator delete(void* ptr, std::size_t size) noexcept; void operator delete(void *ptr, std::size_t size) noexcept;
void operator delete[](void* ptr, std::size_t size) noexcept; void operator delete[](void *ptr, std::size_t size) noexcept;
#endif #endif
template <bool IsNoExcept> template <bool IsNoExcept>
JEMALLOC_INLINE JEMALLOC_INLINE
void * void *
newImpl(std::size_t size) noexcept(IsNoExcept) newImpl(std::size_t size) noexcept(IsNoExcept)
{ {
void* ptr = je_malloc(size); void *ptr = je_malloc(size);
if (likely(ptr != nullptr)) if (likely(ptr != nullptr))
return (ptr); return (ptr);
@ -55,7 +54,7 @@ newImpl(std::size_t size) noexcept(IsNoExcept)
try { try {
handler(); handler();
} catch (const std::bad_alloc&) { } catch (const std::bad_alloc &) {
break; break;
} }
@ -80,36 +79,36 @@ operator new[](std::size_t size)
} }
void * void *
operator new(std::size_t size, const std::nothrow_t&) noexcept operator new(std::size_t size, const std::nothrow_t &) noexcept
{ {
return (newImpl<true>(size)); return (newImpl<true>(size));
} }
void * void *
operator new[](std::size_t size, const std::nothrow_t&) noexcept operator new[](std::size_t size, const std::nothrow_t &) noexcept
{ {
return (newImpl<true>(size)); return (newImpl<true>(size));
} }
void void
operator delete(void* ptr) noexcept operator delete(void *ptr) noexcept
{ {
je_free(ptr); je_free(ptr);
} }
void void
operator delete[](void* ptr) noexcept operator delete[](void *ptr) noexcept
{ {
je_free(ptr); je_free(ptr);
} }
void void
operator delete(void* ptr, const std::nothrow_t&) noexcept operator delete(void *ptr, const std::nothrow_t &) noexcept
{ {
je_free(ptr); je_free(ptr);
} }
void operator delete[](void* ptr, const std::nothrow_t&) noexcept void operator delete[](void *ptr, const std::nothrow_t &) noexcept
{ {
je_free(ptr); je_free(ptr);
} }
@ -117,12 +116,12 @@ void operator delete[](void* ptr, const std::nothrow_t&) noexcept
#if __cpp_sized_deallocation >= 201309 #if __cpp_sized_deallocation >= 201309
void void
operator delete(void* ptr, std::size_t size) noexcept operator delete(void *ptr, std::size_t size) noexcept
{ {
je_sdallocx(ptr, size, /*flags=*/0); je_sdallocx(ptr, size, /*flags=*/0);
} }
void operator delete[](void* ptr, std::size_t size) noexcept void operator delete[](void *ptr, std::size_t size) noexcept
{ {
je_sdallocx(ptr, size, /*flags=*/0); je_sdallocx(ptr, size, /*flags=*/0);
} }