diff options
author | Anton Samokhvalov <pg83@yandex.ru> | 2022-02-10 16:45:15 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:15 +0300 |
commit | 72cb13b4aff9bc9cf22e49251bc8fd143f82538f (patch) | |
tree | da2c34829458c7d4e74bdfbdf85dff449e9e7fb8 /library/cpp/malloc | |
parent | 778e51ba091dc39e7b7fcab2b9cf4dbedfb6f2b5 (diff) | |
download | ydb-72cb13b4aff9bc9cf22e49251bc8fd143f82538f.tar.gz |
Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/malloc')
-rw-r--r-- | library/cpp/malloc/api/helpers/io.cpp | 14 | ||||
-rw-r--r-- | library/cpp/malloc/api/helpers/ya.make | 20 | ||||
-rw-r--r-- | library/cpp/malloc/api/malloc.cpp | 28 | ||||
-rw-r--r-- | library/cpp/malloc/api/malloc.h | 4 | ||||
-rw-r--r-- | library/cpp/malloc/api/ut/ya.make | 6 | ||||
-rw-r--r-- | library/cpp/malloc/jemalloc/malloc-info.cpp | 114 | ||||
-rw-r--r-- | library/cpp/malloc/jemalloc/ya.make | 22 | ||||
-rw-r--r-- | library/cpp/malloc/ya.make | 14 |
8 files changed, 111 insertions, 111 deletions
diff --git a/library/cpp/malloc/api/helpers/io.cpp b/library/cpp/malloc/api/helpers/io.cpp index 5177969f4d..3f97121298 100644 --- a/library/cpp/malloc/api/helpers/io.cpp +++ b/library/cpp/malloc/api/helpers/io.cpp @@ -1,10 +1,10 @@ #include <library/cpp/malloc/api/malloc.h> - + #include <util/stream/output.h> - -using namespace NMalloc; - -template <> + +using namespace NMalloc; + +template <> void Out<TMallocInfo>(IOutputStream& out, const TMallocInfo& info) { - out << "malloc (name = " << info.Name << ")"; -} + out << "malloc (name = " << info.Name << ")"; +} diff --git a/library/cpp/malloc/api/helpers/ya.make b/library/cpp/malloc/api/helpers/ya.make index 62875bca0e..132da29b00 100644 --- a/library/cpp/malloc/api/helpers/ya.make +++ b/library/cpp/malloc/api/helpers/ya.make @@ -1,13 +1,13 @@ -LIBRARY() - +LIBRARY() + OWNER(pg) -PEERDIR( +PEERDIR( library/cpp/malloc/api -) - -SRCS( - io.cpp -) - -END() +) + +SRCS( + io.cpp +) + +END() diff --git a/library/cpp/malloc/api/malloc.cpp b/library/cpp/malloc/api/malloc.cpp index eed1c58a38..bcfe2b66d8 100644 --- a/library/cpp/malloc/api/malloc.cpp +++ b/library/cpp/malloc/api/malloc.cpp @@ -1,13 +1,13 @@ -#include <stdlib.h> +#include <stdlib.h> #include <stdio.h> #include "malloc.h" -namespace { +namespace { bool SetEmptyParam(const char*, const char*) { - return false; - } - + return false; + } + const char* GetEmptyParam(const char*) { return nullptr; } @@ -15,18 +15,18 @@ namespace { bool CheckEmptyParam(const char*, bool defaultValue) { return defaultValue; } -} +} -namespace NMalloc { - volatile bool IsAllocatorCorrupted = false; - - TMallocInfo::TMallocInfo() - : Name() - , SetParam(SetEmptyParam) +namespace NMalloc { + volatile bool IsAllocatorCorrupted = false; + + TMallocInfo::TMallocInfo() + : Name() + , SetParam(SetEmptyParam) , GetParam(GetEmptyParam) , CheckParam(CheckEmptyParam) - { - } + { + } void AbortFromCorruptedAllocator(const char* errorMessage) { errorMessage = errorMessage ? errorMessage : "<unspecified>"; diff --git a/library/cpp/malloc/api/malloc.h b/library/cpp/malloc/api/malloc.h index ebd545d6dd..9df6f0c7cf 100644 --- a/library/cpp/malloc/api/malloc.h +++ b/library/cpp/malloc/api/malloc.h @@ -6,10 +6,10 @@ namespace NMalloc { struct TMallocInfo { TMallocInfo(); - + const char* Name; - bool (*SetParam)(const char* param, const char* value); + bool (*SetParam)(const char* param, const char* value); const char* (*GetParam)(const char* param); bool (*CheckParam)(const char* param, bool defaultValue); diff --git a/library/cpp/malloc/api/ut/ya.make b/library/cpp/malloc/api/ut/ya.make index e57225b45d..99ea9e5fd6 100644 --- a/library/cpp/malloc/api/ut/ya.make +++ b/library/cpp/malloc/api/ut/ya.make @@ -2,10 +2,10 @@ UNITTEST() OWNER(nga) -PEERDIR( +PEERDIR( library/cpp/malloc/api/helpers -) - +) + SRCS( ut.cpp ) diff --git a/library/cpp/malloc/jemalloc/malloc-info.cpp b/library/cpp/malloc/jemalloc/malloc-info.cpp index 2643ca4766..df2df745a4 100644 --- a/library/cpp/malloc/jemalloc/malloc-info.cpp +++ b/library/cpp/malloc/jemalloc/malloc-info.cpp @@ -1,65 +1,65 @@ #include <library/cpp/malloc/api/malloc.h> -using namespace NMalloc; - -#if defined(_MSC_VER) -TMallocInfo NMalloc::MallocInfo() { - TMallocInfo r; - r.Name = "jemalloc"; - return r; -} -#else -#include <strings.h> -#include <stdlib.h> -#include <inttypes.h> - -#include <contrib/libs/jemalloc/include/jemalloc/jemalloc.h> - -namespace { +using namespace NMalloc; + +#if defined(_MSC_VER) +TMallocInfo NMalloc::MallocInfo() { + TMallocInfo r; + r.Name = "jemalloc"; + return r; +} +#else +#include <strings.h> +#include <stdlib.h> +#include <inttypes.h> + +#include <contrib/libs/jemalloc/include/jemalloc/jemalloc.h> + +namespace { bool JESetParam(const char* param, const char*) { - if (param) { - if (strcmp(param, "j:reset_epoch") == 0) { - uint64_t epoch = 1; - size_t sz = sizeof(epoch); - - mallctl("epoch", &epoch, &sz, &epoch, sz); - - return true; - } - - return false; - } - - return false; - } - - const char* JEGetParam(const char* param) { - if (param) { - if (strcmp(param, "allocated") == 0) { - JESetParam("j:reset_epoch", nullptr); - - size_t allocated = 0; - size_t sz = sizeof(allocated); - - mallctl("stats.allocated", &allocated, &sz, nullptr, 0); - - static_assert(sizeof(size_t) == sizeof(void*), "fix me"); - - return (const char*)(void*)allocated; - } - - return nullptr; - } - - return nullptr; - } -} - + if (param) { + if (strcmp(param, "j:reset_epoch") == 0) { + uint64_t epoch = 1; + size_t sz = sizeof(epoch); + + mallctl("epoch", &epoch, &sz, &epoch, sz); + + return true; + } + + return false; + } + + return false; + } + + const char* JEGetParam(const char* param) { + if (param) { + if (strcmp(param, "allocated") == 0) { + JESetParam("j:reset_epoch", nullptr); + + size_t allocated = 0; + size_t sz = sizeof(allocated); + + mallctl("stats.allocated", &allocated, &sz, nullptr, 0); + + static_assert(sizeof(size_t) == sizeof(void*), "fix me"); + + return (const char*)(void*)allocated; + } + + return nullptr; + } + + return nullptr; + } +} + TMallocInfo NMalloc::MallocInfo() { TMallocInfo r; r.Name = "jemalloc"; - r.SetParam = JESetParam; - r.GetParam = JEGetParam; + r.SetParam = JESetParam; + r.GetParam = JEGetParam; return r; } -#endif +#endif diff --git a/library/cpp/malloc/jemalloc/ya.make b/library/cpp/malloc/jemalloc/ya.make index 99db474eab..672f72e6d9 100644 --- a/library/cpp/malloc/jemalloc/ya.make +++ b/library/cpp/malloc/jemalloc/ya.make @@ -4,18 +4,18 @@ NO_UTIL() OWNER(nga) -IF (OS_ANDROID) - PEERDIR( +IF (OS_ANDROID) + PEERDIR( library/cpp/malloc/system - ) -ELSE() - PEERDIR( + ) +ELSE() + PEERDIR( library/cpp/malloc/api - contrib/libs/jemalloc - ) - SRCS( - malloc-info.cpp - ) -ENDIF() + contrib/libs/jemalloc + ) + SRCS( + malloc-info.cpp + ) +ENDIF() END() diff --git a/library/cpp/malloc/ya.make b/library/cpp/malloc/ya.make index 0ec9db71d2..b968204ad9 100644 --- a/library/cpp/malloc/ya.make +++ b/library/cpp/malloc/ya.make @@ -9,18 +9,18 @@ RECURSE( nalf sample-client system - mimalloc - mimalloc/link_test - hu - hu/link_test + mimalloc + mimalloc/link_test + hu + hu/link_test ) - + IF (NOT OS_WINDOWS) - RECURSE( + RECURSE( calloc calloc/tests calloc/calloc_profile_diff calloc/calloc_profile_scan calloc/calloc_profile_scan/ut - ) + ) ENDIF() |