diff options
author | ironpeter <ironpeter@yandex-team.ru> | 2022-02-10 16:49:52 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:52 +0300 |
commit | edee5b99e1eec042f46725b89dcd81ea7e41d663 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/balloc | |
parent | ff97837ecc5972a00cb395483d8856566738375c (diff) | |
download | ydb-edee5b99e1eec042f46725b89dcd81ea7e41d663.tar.gz |
Restoring authorship annotation for <ironpeter@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/balloc')
-rw-r--r-- | library/cpp/balloc/balloc.cpp | 120 | ||||
-rw-r--r-- | library/cpp/balloc/ya.make | 8 |
2 files changed, 64 insertions, 64 deletions
diff --git a/library/cpp/balloc/balloc.cpp b/library/cpp/balloc/balloc.cpp index 02ce67383c..fab489db4c 100644 --- a/library/cpp/balloc/balloc.cpp +++ b/library/cpp/balloc/balloc.cpp @@ -1,7 +1,7 @@ #include <library/cpp/balloc/lib/balloc.h> #include <errno.h> -namespace NBalloc { +namespace NBalloc { static constexpr size_t ALIVE_SIGNATURE = 0xaULL << 56; static constexpr size_t DISABLED_SIGNATURE = 0xbULL << 56; @@ -26,9 +26,9 @@ namespace NBalloc { TAllocHeader* allocHeader = (TAllocHeader*)LibcMalloc(extsize); allocHeader->Encode(allocHeader, size, DISABLED_SIGNATURE); return allocHeader + 1; - } + } } - + static void Y_FORCE_INLINE Free(void* ptr) { if (ptr == nullptr) { return; @@ -50,8 +50,8 @@ namespace NBalloc { } else { NMalloc::AbortFromCorruptedAllocator(); } - } - + } + static bool Y_FORCE_INLINE IsOwnedByBalloc(void* ptr) { TAllocHeader* allocHeader = ((TAllocHeader*)ptr) - 1; size_t size = allocHeader->AllocSize; @@ -64,7 +64,7 @@ namespace NBalloc { NMalloc::AbortFromCorruptedAllocator(); Y_UNREACHABLE(); } - + static void Y_FORCE_INLINE Disable() { #if defined(_musl_) // just skip it @@ -80,8 +80,8 @@ namespace NBalloc { static bool Y_FORCE_INLINE IsDisabled() { return tls.Mode == Disabled; } -}; - +}; + #if defined(Y_COVER_PTR) void* CoverPtr(void* ptr, size_t len) noexcept; void* UncoverPtr(void* ptr) noexcept; @@ -91,18 +91,18 @@ extern "C" void* malloc(size_t size) { #if defined(Y_COVER_PTR) return CoverPtr(NBalloc::Malloc(size + 32), size); #else - return NBalloc::Malloc(size); + return NBalloc::Malloc(size); #endif -} - +} + extern "C" void free(void* data) { #if defined(Y_COVER_PTR) NBalloc::Free(UncoverPtr(data)); #else - NBalloc::Free(data); + NBalloc::Free(data); #endif -} - +} + #if defined(USE_INTELCC) || defined(_darwin_) || defined(_freebsd_) || defined(_STLPORT_VERSION) #define OP_THROWNOTHING noexcept #else @@ -113,10 +113,10 @@ void* operator new(size_t size) { #if defined(Y_COVER_PTR) return malloc(size); #else - return NBalloc::Malloc(size); + return NBalloc::Malloc(size); #endif -} - +} + int posix_memalign(void** memptr, const size_t alignment, const size_t size) { #if defined(Y_COVER_PTR) (void)alignment; @@ -125,7 +125,7 @@ int posix_memalign(void** memptr, const size_t alignment, const size_t size) { #else if (((alignment - 1) & alignment) != 0 || alignment < sizeof(void*)) { return EINVAL; - } + } if (alignment <= NBalloc::MINIMAL_ALIGNMENT) { *memptr = NBalloc::Malloc(size); return 0; @@ -140,66 +140,66 @@ int posix_memalign(void** memptr, const size_t alignment, const size_t size) { newAllocHeader->Encode(block, size, NBalloc::ALIVE_SIGNATURE); } *memptr = alignedPtr; - return 0; + return 0; #endif -} - +} + void* operator new(size_t size, const std::nothrow_t&) OP_THROWNOTHING { #if defined(Y_COVER_PTR) return malloc(size); #else - return NBalloc::Malloc(size); + return NBalloc::Malloc(size); #endif -} - +} + void operator delete(void* p)OP_THROWNOTHING { #if defined(Y_COVER_PTR) free(p); #else - NBalloc::Free(p); + NBalloc::Free(p); #endif -} - +} + void operator delete(void* p, const std::nothrow_t&)OP_THROWNOTHING { #if defined(Y_COVER_PTR) free(p); #else - NBalloc::Free(p); + NBalloc::Free(p); #endif -} - +} + void* operator new[](size_t size) { #if defined(Y_COVER_PTR) return malloc(size); #else - return NBalloc::Malloc(size); + return NBalloc::Malloc(size); #endif -} - +} + void* operator new[](size_t size, const std::nothrow_t&) OP_THROWNOTHING { #if defined(Y_COVER_PTR) return malloc(size); #else - return NBalloc::Malloc(size); + return NBalloc::Malloc(size); #endif -} - +} + void operator delete[](void* p) OP_THROWNOTHING { #if defined(Y_COVER_PTR) free(p); #else - NBalloc::Free(p); + NBalloc::Free(p); #endif -} - +} + void operator delete[](void* p, const std::nothrow_t&) OP_THROWNOTHING { #if defined(Y_COVER_PTR) free(p); #else - NBalloc::Free(p); + NBalloc::Free(p); #endif -} - +} + extern "C" void* calloc(size_t n, size_t elemSize) { const size_t size = n * elemSize; @@ -210,44 +210,44 @@ extern "C" void* calloc(size_t n, size_t elemSize) { #if defined(Y_COVER_PTR) void* result = malloc(size); #else - void* result = NBalloc::Malloc(size); + void* result = NBalloc::Malloc(size); #endif if (result) { - memset(result, 0, size); - } + memset(result, 0, size); + } + + return result; +} - return result; -} - -extern "C" void cfree(void* ptr) { +extern "C" void cfree(void* ptr) { #if defined(Y_COVER_PTR) free(ptr); #else NBalloc::Free(ptr); #endif -} - +} + #if defined(Y_COVER_PTR) static inline void* DoRealloc(void* oldPtr, size_t newSize) { #else extern "C" void* realloc(void* oldPtr, size_t newSize) { #endif if (!oldPtr) { - void* result = NBalloc::Malloc(newSize); - return result; - } - if (newSize == 0) { + void* result = NBalloc::Malloc(newSize); + return result; + } + if (newSize == 0) { NBalloc::Free(oldPtr); return nullptr; - } + } void* newPtr = NBalloc::Malloc(newSize); if (!newPtr) { return nullptr; - } + } NBalloc::TAllocHeader* header = (NBalloc::TAllocHeader*)oldPtr - 1; - const size_t oldSize = header->AllocSize & ~NBalloc::SIGNATURE_MASK; - const size_t signature = header->AllocSize & NBalloc::SIGNATURE_MASK; + const size_t oldSize = header->AllocSize & ~NBalloc::SIGNATURE_MASK; + const size_t signature = header->AllocSize & NBalloc::SIGNATURE_MASK; if (Y_LIKELY((signature == NBalloc::ALIVE_SIGNATURE) || (signature == NBalloc::DISABLED_SIGNATURE))) { memcpy(newPtr, oldPtr, oldSize < newSize ? oldSize : newSize); NBalloc::Free(oldPtr); @@ -255,7 +255,7 @@ extern "C" void* realloc(void* oldPtr, size_t newSize) { } NMalloc::AbortFromCorruptedAllocator(); return nullptr; -} +} #if defined(Y_COVER_PTR) extern "C" void* realloc(void* oldPtr, size_t newSize) { diff --git a/library/cpp/balloc/ya.make b/library/cpp/balloc/ya.make index 2dd7ca6895..d4457fbba9 100644 --- a/library/cpp/balloc/ya.make +++ b/library/cpp/balloc/ya.make @@ -1,13 +1,13 @@ -LIBRARY() +LIBRARY() OWNER( ironpeter g:base ) - + NO_UTIL() NO_COMPILER_WARNINGS() - + IF (OS_WINDOWS) PEERDIR( library/cpp/lfalloc @@ -23,6 +23,6 @@ ELSE() ) ENDIF() -END() +END() NEED_CHECK() |