diff options
author | gotmanov <gotmanov@yandex-team.ru> | 2022-02-10 16:49:26 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:26 +0300 |
commit | b3c1a086292c74ed88830693f15a96ddeadc6b9a (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /util/memory | |
parent | 243edeedfd2c5152b5c7812e0af471e1bb0232e8 (diff) | |
download | ydb-b3c1a086292c74ed88830693f15a96ddeadc6b9a.tar.gz |
Restoring authorship annotation for <gotmanov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'util/memory')
-rw-r--r-- | util/memory/pool.h | 6 | ||||
-rw-r--r-- | util/memory/pool_ut.cpp | 82 |
2 files changed, 44 insertions, 44 deletions
diff --git a/util/memory/pool.h b/util/memory/pool.h index 2e4e8da840..13c8b6b9ed 100644 --- a/util/memory/pool.h +++ b/util/memory/pool.h @@ -388,9 +388,9 @@ public: return size_type(-1) / sizeof(T); } - template <typename... Args> - inline void construct(pointer p, Args&&... args) { - new (p) T(std::forward<Args>(args)...); + template <typename... Args> + inline void construct(pointer p, Args&&... args) { + new (p) T(std::forward<Args>(args)...); } inline void destroy(pointer p) noexcept { diff --git a/util/memory/pool_ut.cpp b/util/memory/pool_ut.cpp index 5c6aa59feb..1158a8ca42 100644 --- a/util/memory/pool_ut.cpp +++ b/util/memory/pool_ut.cpp @@ -50,39 +50,39 @@ private: size_t Frees_; }; -class TErrorOnCopy { -public: - TErrorOnCopy() = default; - TErrorOnCopy(TErrorOnCopy&&) = default; - - TErrorOnCopy(const TErrorOnCopy&) { - UNIT_ASSERT(false); - } -}; - -class TNoCopy { -public: - TNoCopy() = default; - TNoCopy(TNoCopy&&) = default; - - TNoCopy(const TNoCopy&) = delete; -}; - -class TNoMove { -public: - TNoMove() = default; - TNoMove(const TNoMove&) = default; - - TNoMove(TNoMove&&) = delete; -}; - +class TErrorOnCopy { +public: + TErrorOnCopy() = default; + TErrorOnCopy(TErrorOnCopy&&) = default; + + TErrorOnCopy(const TErrorOnCopy&) { + UNIT_ASSERT(false); + } +}; + +class TNoCopy { +public: + TNoCopy() = default; + TNoCopy(TNoCopy&&) = default; + + TNoCopy(const TNoCopy&) = delete; +}; + +class TNoMove { +public: + TNoMove() = default; + TNoMove(const TNoMove&) = default; + + TNoMove(TNoMove&&) = delete; +}; + class TMemPoolTest: public TTestBase { UNIT_TEST_SUITE(TMemPoolTest); UNIT_TEST(TestMemPool) UNIT_TEST(TestAlign) UNIT_TEST(TestZeroArray) UNIT_TEST(TestLargeStartingAlign) - UNIT_TEST(TestMoveAlloc) + UNIT_TEST(TestMoveAlloc) UNIT_TEST(TestRoundUpToNextPowerOfTwoOption) UNIT_TEST_SUITE_END(); @@ -223,22 +223,22 @@ private: UNIT_ASSERT_VALUES_EQUAL(reinterpret_cast<uintptr_t>(aligned4k1) & 4095, 0); UNIT_ASSERT_VALUES_EQUAL(reinterpret_cast<uintptr_t>(aligned4k2) & 4095, 0); } - - template <typename T> - void CheckMoveAlloc() { - TMemoryPool pool(10 * sizeof(T)); - + + template <typename T> + void CheckMoveAlloc() { + TMemoryPool pool(10 * sizeof(T)); + TVector<T, TPoolAllocator> elems(&pool); - elems.reserve(1); - elems.emplace_back(); - elems.resize(100); + elems.reserve(1); + elems.emplace_back(); + elems.resize(100); + } + + void TestMoveAlloc() { + CheckMoveAlloc<TNoMove>(); + CheckMoveAlloc<TNoCopy>(); + CheckMoveAlloc<TErrorOnCopy>(); } - - void TestMoveAlloc() { - CheckMoveAlloc<TNoMove>(); - CheckMoveAlloc<TNoCopy>(); - CheckMoveAlloc<TErrorOnCopy>(); - } void TestRoundUpToNextPowerOfTwoOption() { const size_t MEMORY_POOL_BLOCK_SIZE = (1024 - 16) * 4096 - 16 - 16 - 32; |