IGNIETFERRO-1922 Move atomics from util to library/cpp/deprecated

ref:0c3b0edd3284567c45ec77e57166274f3cfed8c7

12 files changed, 6 insertions, 686 deletions

diff --git a/util/CMakeLists.darwin.txt b/util/CMakeLists.darwin.txt
index 1099810428..99dd3df2e9 100644
--- a/util/CMakeLists.darwin.txt
+++ b/util/CMakeLists.darwin.txt
@@ -240,7 +240,6 @@ target_joined_source(yutil
 target_joined_source(yutil
   all_system_2.cpp
   ${CMAKE_SOURCE_DIR}/util/system/align.cpp
-  ${CMAKE_SOURCE_DIR}/util/system/atomic.cpp
   ${CMAKE_SOURCE_DIR}/util/system/byteorder.cpp
   ${CMAKE_SOURCE_DIR}/util/system/cpu_id.cpp
   ${CMAKE_SOURCE_DIR}/util/system/fhandle.cpp
diff --git a/util/CMakeLists.linux.txt b/util/CMakeLists.linux.txt
index 9592d28bf1..f3035c0bb1 100644
--- a/util/CMakeLists.linux.txt
+++ b/util/CMakeLists.linux.txt
@@ -242,7 +242,6 @@ target_joined_source(yutil
 target_joined_source(yutil
   all_system_2.cpp
   ${CMAKE_SOURCE_DIR}/util/system/align.cpp
-  ${CMAKE_SOURCE_DIR}/util/system/atomic.cpp
   ${CMAKE_SOURCE_DIR}/util/system/byteorder.cpp
   ${CMAKE_SOURCE_DIR}/util/system/cpu_id.cpp
   ${CMAKE_SOURCE_DIR}/util/system/fhandle.cpp
diff --git a/util/draft/datetime.cpp b/util/draft/datetime.cpp
index 6d6b0e7bac..d290021d5e 100644
--- a/util/draft/datetime.cpp
+++ b/util/draft/datetime.cpp
@@ -2,7 +2,6 @@
 
 #include <util/ysaveload.h>
 
-#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/fasttime.h>
 #include <util/datetime/base.h>
 #include <util/datetime/systime.h>
diff --git a/util/generic/string.h b/util/generic/string.h
index 198b8c28d4..f43775f8aa 100644
--- a/util/generic/string.h
+++ b/util/generic/string.h
@@ -8,7 +8,6 @@
 #include <string_view>
 
 #include <util/system/yassert.h>
-#include <library/cpp/deprecated/atomic/atomic.h>
 
 #include "ptr.h"
 #include "utility.h"
diff --git a/util/system/atexit.cpp b/util/system/atexit.cpp
index b06880818c..5ae7a21e23 100644
--- a/util/system/atexit.cpp
+++ b/util/system/atexit.cpp
@@ -77,28 +77,27 @@ namespace {
     };
 
     static TAdaptiveLock atExitLock;
-    static TAtExit* volatile atExitPtr = nullptr;
+    static std::atomic<TAtExit*> atExitPtr = nullptr;
     alignas(TAtExit) static char atExitMem[sizeof(TAtExit)];
 
     static void OnExit() {
-        if (TAtExit* const atExit = AtomicGet(atExitPtr)) {
+        if (TAtExit* const atExit = atExitPtr.exchange(nullptr)) {
             atExit->Finish();
             atExit->~TAtExit();
-            AtomicSet(atExitPtr, nullptr);
         }
     }
 
     static inline TAtExit* Instance() {
-        if (TAtExit* const atExit = AtomicGet(atExitPtr)) {
+        if (TAtExit* const atExit = atExitPtr.load(std::memory_order_acquire)) {
             return atExit;
         }
         with_lock (atExitLock) {
-            if (TAtExit* const atExit = AtomicGet(atExitPtr)) {
+            if (TAtExit* const atExit = atExitPtr.load()) {
                 return atExit;
             }
             atexit(OnExit);
             TAtExit* const atExit = new (atExitMem) TAtExit;
-            AtomicSet(atExitPtr, atExit);
+            atExitPtr.store(atExit, std::memory_order_release);
             return atExit;
         }
     }
@@ -109,7 +108,7 @@ void ManualRunAtExitFinalizers() {
 }
 
 bool ExitStarted() {
-    if (TAtExit* const atExit = AtomicGet(atExitPtr)) {
+    if (TAtExit* const atExit = atExitPtr.load(std::memory_order_acquire)) {
         return atExit->FinishStarted();
     }
     return false;
diff --git a/util/system/atomic.cpp b/util/system/atomic.cpp
deleted file mode 100644
index fe85ee00b7..0000000000
--- a/util/system/atomic.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "atomic.h"
-
-static_assert(sizeof(TAtomic) == sizeof(void*), "expect sizeof(TAtomic) == sizeof(void*)");
diff --git a/util/system/atomic.h b/util/system/atomic.h
deleted file mode 100644
index 80265babfd..0000000000
--- a/util/system/atomic.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "defaults.h"
-
-using TAtomicBase = intptr_t;
-using TAtomic = volatile TAtomicBase;
-
-#if defined(__GNUC__)
-    #include "atomic_gcc.h"
-#elif defined(_MSC_VER)
-    #include "atomic_win.h"
-#else
-    #error unsupported platform
-#endif
-
-#if !defined(ATOMIC_COMPILER_BARRIER)
-    #define ATOMIC_COMPILER_BARRIER()
-#endif
-
-static inline TAtomicBase AtomicSub(TAtomic& a, TAtomicBase v) {
-    return AtomicAdd(a, -v);
-}
-
-static inline TAtomicBase AtomicGetAndSub(TAtomic& a, TAtomicBase v) {
-    return AtomicGetAndAdd(a, -v);
-}
-
-#if defined(USE_GENERIC_SETGET)
-static inline TAtomicBase AtomicGet(const TAtomic& a) {
-    return a;
-}
-
-static inline void AtomicSet(TAtomic& a, TAtomicBase v) {
-    a = v;
-}
-#endif
-
-static inline bool AtomicTryLock(TAtomic* a) {
-    return AtomicCas(a, 1, 0);
-}
-
-static inline bool AtomicTryAndTryLock(TAtomic* a) {
-    return (AtomicGet(*a) == 0) && AtomicTryLock(a);
-}
-
-static inline void AtomicUnlock(TAtomic* a) {
-    ATOMIC_COMPILER_BARRIER();
-    AtomicSet(*a, 0);
-}
-
-#include "atomic_ops.h"
diff --git a/util/system/atomic_gcc.h b/util/system/atomic_gcc.h
deleted file mode 100644
index ed8dc2bdc5..0000000000
--- a/util/system/atomic_gcc.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-
-#define ATOMIC_COMPILER_BARRIER() __asm__ __volatile__("" \
-                                                       :  \
-                                                       :  \
-                                                       : "memory")
-
-static inline TAtomicBase AtomicGet(const TAtomic& a) {
-    TAtomicBase tmp;
-#if defined(_arm64_)
-    __asm__ __volatile__(
-        "ldar %x[value], %[ptr]  \n\t"
-        : [value] "=r"(tmp)
-        : [ptr] "Q"(a)
-        : "memory");
-#else
-    __atomic_load(&a, &tmp, __ATOMIC_ACQUIRE);
-#endif
-    return tmp;
-}
-
-static inline void AtomicSet(TAtomic& a, TAtomicBase v) {
-#if defined(_arm64_)
-    __asm__ __volatile__(
-        "stlr %x[value], %[ptr]  \n\t"
-        : [ptr] "=Q"(a)
-        : [value] "r"(v)
-        : "memory");
-#else
-    __atomic_store(&a, &v, __ATOMIC_RELEASE);
-#endif
-}
-
-static inline intptr_t AtomicIncrement(TAtomic& p) {
-    return __atomic_add_fetch(&p, 1, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicGetAndIncrement(TAtomic& p) {
-    return __atomic_fetch_add(&p, 1, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicDecrement(TAtomic& p) {
-    return __atomic_sub_fetch(&p, 1, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicGetAndDecrement(TAtomic& p) {
-    return __atomic_fetch_sub(&p, 1, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicAdd(TAtomic& p, intptr_t v) {
-    return __atomic_add_fetch(&p, v, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicGetAndAdd(TAtomic& p, intptr_t v) {
-    return __atomic_fetch_add(&p, v, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicSwap(TAtomic* p, intptr_t v) {
-    (void)p; // disable strange 'parameter set but not used' warning on gcc
-    intptr_t ret;
-    __atomic_exchange(p, &v, &ret, __ATOMIC_SEQ_CST);
-    return ret;
-}
-
-static inline bool AtomicCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    (void)a; // disable strange 'parameter set but not used' warning on gcc
-    return __atomic_compare_exchange(a, &compare, &exchange, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicGetAndCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    (void)a; // disable strange 'parameter set but not used' warning on gcc
-    __atomic_compare_exchange(a, &compare, &exchange, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-    return compare;
-}
-
-static inline intptr_t AtomicOr(TAtomic& a, intptr_t b) {
-    return __atomic_or_fetch(&a, b, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicXor(TAtomic& a, intptr_t b) {
-    return __atomic_xor_fetch(&a, b, __ATOMIC_SEQ_CST);
-}
-
-static inline intptr_t AtomicAnd(TAtomic& a, intptr_t b) {
-    return __atomic_and_fetch(&a, b, __ATOMIC_SEQ_CST);
-}
-
-static inline void AtomicBarrier() {
-    __sync_synchronize();
-}
diff --git a/util/system/atomic_ops.h b/util/system/atomic_ops.h
deleted file mode 100644
index 76766b4a0a..0000000000
--- a/util/system/atomic_ops.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#pragma once
-
-#include <util/generic/typetraits.h>
-
-template <typename T>
-inline TAtomic* AsAtomicPtr(T volatile* target) {
-    return reinterpret_cast<TAtomic*>(target);
-}
-
-template <typename T>
-inline const TAtomic* AsAtomicPtr(T const volatile* target) {
-    return reinterpret_cast<const TAtomic*>(target);
-}
-
-// integral types
-
-template <typename T>
-struct TAtomicTraits {
-    enum {
-        Castable = std::is_integral<T>::value && sizeof(T) == sizeof(TAtomicBase) && !std::is_const<T>::value,
-    };
-};
-
-template <typename T, typename TT>
-using TEnableIfCastable = std::enable_if_t<TAtomicTraits<T>::Castable, TT>;
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGet(T const volatile& target) {
-    return static_cast<T>(AtomicGet(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, void> AtomicSet(T volatile& target, TAtomicBase value) {
-    AtomicSet(*AsAtomicPtr(&target), value);
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicIncrement(T volatile& target) {
-    return static_cast<T>(AtomicIncrement(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGetAndIncrement(T volatile& target) {
-    return static_cast<T>(AtomicGetAndIncrement(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicDecrement(T volatile& target) {
-    return static_cast<T>(AtomicDecrement(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGetAndDecrement(T volatile& target) {
-    return static_cast<T>(AtomicGetAndDecrement(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicAdd(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicAdd(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGetAndAdd(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicGetAndAdd(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicSub(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicSub(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGetAndSub(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicGetAndSub(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicSwap(T volatile* target, TAtomicBase exchange) {
-    return static_cast<T>(AtomicSwap(AsAtomicPtr(target), exchange));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, bool> AtomicCas(T volatile* target, TAtomicBase exchange, TAtomicBase compare) {
-    return AtomicCas(AsAtomicPtr(target), exchange, compare);
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicGetAndCas(T volatile* target, TAtomicBase exchange, TAtomicBase compare) {
-    return static_cast<T>(AtomicGetAndCas(AsAtomicPtr(target), exchange, compare));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, bool> AtomicTryLock(T volatile* target) {
-    return AtomicTryLock(AsAtomicPtr(target));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, bool> AtomicTryAndTryLock(T volatile* target) {
-    return AtomicTryAndTryLock(AsAtomicPtr(target));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, void> AtomicUnlock(T volatile* target) {
-    AtomicUnlock(AsAtomicPtr(target));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicOr(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicOr(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicAnd(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicAnd(*AsAtomicPtr(&target), value));
-}
-
-template <typename T>
-inline TEnableIfCastable<T, T> AtomicXor(T volatile& target, TAtomicBase value) {
-    return static_cast<T>(AtomicXor(*AsAtomicPtr(&target), value));
-}
-
-// pointer types
-
-template <typename T>
-inline T* AtomicGet(T* const volatile& target) {
-    return reinterpret_cast<T*>(AtomicGet(*AsAtomicPtr(&target)));
-}
-
-template <typename T>
-inline void AtomicSet(T* volatile& target, T* value) {
-    AtomicSet(*AsAtomicPtr(&target), reinterpret_cast<TAtomicBase>(value));
-}
-
-using TNullPtr = decltype(nullptr);
-
-template <typename T>
-inline void AtomicSet(T* volatile& target, TNullPtr) {
-    AtomicSet(*AsAtomicPtr(&target), 0);
-}
-
-template <typename T>
-inline T* AtomicSwap(T* volatile* target, T* exchange) {
-    return reinterpret_cast<T*>(AtomicSwap(AsAtomicPtr(target), reinterpret_cast<TAtomicBase>(exchange)));
-}
-
-template <typename T>
-inline T* AtomicSwap(T* volatile* target, TNullPtr) {
-    return reinterpret_cast<T*>(AtomicSwap(AsAtomicPtr(target), 0));
-}
-
-template <typename T>
-inline bool AtomicCas(T* volatile* target, T* exchange, T* compare) {
-    return AtomicCas(AsAtomicPtr(target), reinterpret_cast<TAtomicBase>(exchange), reinterpret_cast<TAtomicBase>(compare));
-}
-
-template <typename T>
-inline T* AtomicGetAndCas(T* volatile* target, T* exchange, T* compare) {
-    return reinterpret_cast<T*>(AtomicGetAndCas(AsAtomicPtr(target), reinterpret_cast<TAtomicBase>(exchange), reinterpret_cast<TAtomicBase>(compare)));
-}
-
-template <typename T>
-inline bool AtomicCas(T* volatile* target, T* exchange, TNullPtr) {
-    return AtomicCas(AsAtomicPtr(target), reinterpret_cast<TAtomicBase>(exchange), 0);
-}
-
-template <typename T>
-inline T* AtomicGetAndCas(T* volatile* target, T* exchange, TNullPtr) {
-    return reinterpret_cast<T*>(AtomicGetAndCas(AsAtomicPtr(target), reinterpret_cast<TAtomicBase>(exchange), 0));
-}
-
-template <typename T>
-inline bool AtomicCas(T* volatile* target, TNullPtr, T* compare) {
-    return AtomicCas(AsAtomicPtr(target), 0, reinterpret_cast<TAtomicBase>(compare));
-}
-
-template <typename T>
-inline T* AtomicGetAndCas(T* volatile* target, TNullPtr, T* compare) {
-    return reinterpret_cast<T*>(AtomicGetAndCas(AsAtomicPtr(target), 0, reinterpret_cast<TAtomicBase>(compare)));
-}
-
-template <typename T>
-inline bool AtomicCas(T* volatile* target, TNullPtr, TNullPtr) {
-    return AtomicCas(AsAtomicPtr(target), 0, 0);
-}
-
-template <typename T>
-inline T* AtomicGetAndCas(T* volatile* target, TNullPtr, TNullPtr) {
-    return reinterpret_cast<T*>(AtomicGetAndCas(AsAtomicPtr(target), 0, 0));
-}
diff --git a/util/system/atomic_ut.cpp b/util/system/atomic_ut.cpp
deleted file mode 100644
index 07211ffba7..0000000000
--- a/util/system/atomic_ut.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-#include "atomic.h"
-
-#include <library/cpp/testing/unittest/registar.h>
-
-#include <util/generic/ylimits.h>
-
-template <typename TAtomic>
-class TAtomicTest
-    : public TTestBase {
-    UNIT_TEST_SUITE(TAtomicTest);
-    UNIT_TEST(TestAtomicInc1)
-    UNIT_TEST(TestAtomicInc2)
-    UNIT_TEST(TestAtomicGetAndInc)
-    UNIT_TEST(TestAtomicDec)
-    UNIT_TEST(TestAtomicGetAndDec)
-    UNIT_TEST(TestAtomicAdd)
-    UNIT_TEST(TestAtomicGetAndAdd)
-    UNIT_TEST(TestAtomicSub)
-    UNIT_TEST(TestAtomicGetAndSub)
-    UNIT_TEST(TestAtomicSwap)
-    UNIT_TEST(TestAtomicOr)
-    UNIT_TEST(TestAtomicAnd)
-    UNIT_TEST(TestAtomicXor)
-    UNIT_TEST(TestCAS)
-    UNIT_TEST(TestGetAndCAS)
-    UNIT_TEST(TestLockUnlock)
-    UNIT_TEST_SUITE_END();
-
-private:
-    inline void TestLockUnlock() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT(AtomicTryLock(&v));
-        UNIT_ASSERT(!AtomicTryLock(&v));
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        AtomicUnlock(&v);
-        UNIT_ASSERT_VALUES_EQUAL(v, 0);
-    }
-
-    inline void TestCAS() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT(AtomicCas(&v, 1, 0));
-        UNIT_ASSERT(!AtomicCas(&v, 1, 0));
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT(AtomicCas(&v, 0, 1));
-        UNIT_ASSERT_VALUES_EQUAL(v, 0);
-        UNIT_ASSERT(AtomicCas(&v, Max<intptr_t>(), 0));
-        UNIT_ASSERT_VALUES_EQUAL(v, Max<intptr_t>());
-    }
-
-    inline void TestGetAndCAS() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndCas(&v, 1, 0), 0);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndCas(&v, 2, 0), 1);
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndCas(&v, 0, 1), 1);
-        UNIT_ASSERT_VALUES_EQUAL(v, 0);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndCas(&v, Max<intptr_t>(), 0), 0);
-        UNIT_ASSERT_VALUES_EQUAL(v, Max<intptr_t>());
-    }
-
-    inline void TestAtomicInc1() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT(AtomicAdd(v, 1));
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT(AtomicAdd(v, 10));
-        UNIT_ASSERT_VALUES_EQUAL(v, 11);
-    }
-
-    inline void TestAtomicInc2() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT(AtomicIncrement(v));
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT(AtomicIncrement(v));
-        UNIT_ASSERT_VALUES_EQUAL(v, 2);
-    }
-
-    inline void TestAtomicGetAndInc() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT_EQUAL(AtomicGetAndIncrement(v), 0);
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT_EQUAL(AtomicGetAndIncrement(v), 1);
-        UNIT_ASSERT_VALUES_EQUAL(v, 2);
-    }
-
-    inline void TestAtomicDec() {
-        TAtomic v = 2;
-
-        UNIT_ASSERT(AtomicDecrement(v));
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT(!AtomicDecrement(v));
-        UNIT_ASSERT_VALUES_EQUAL(v, 0);
-    }
-
-    inline void TestAtomicGetAndDec() {
-        TAtomic v = 2;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndDecrement(v), 2);
-        UNIT_ASSERT_VALUES_EQUAL(v, 1);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndDecrement(v), 1);
-        UNIT_ASSERT_VALUES_EQUAL(v, 0);
-    }
-
-    inline void TestAtomicAdd() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicAdd(v, 1), 1);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicAdd(v, 2), 3);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicAdd(v, -4), -1);
-        UNIT_ASSERT_VALUES_EQUAL(v, -1);
-    }
-
-    inline void TestAtomicGetAndAdd() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndAdd(v, 1), 0);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndAdd(v, 2), 1);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndAdd(v, -4), 3);
-        UNIT_ASSERT_VALUES_EQUAL(v, -1);
-    }
-
-    inline void TestAtomicSub() {
-        TAtomic v = 4;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSub(v, 1), 3);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSub(v, 2), 1);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSub(v, 3), -2);
-        UNIT_ASSERT_VALUES_EQUAL(v, -2);
-    }
-
-    inline void TestAtomicGetAndSub() {
-        TAtomic v = 4;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndSub(v, 1), 4);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndSub(v, 2), 3);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGetAndSub(v, 3), 1);
-        UNIT_ASSERT_VALUES_EQUAL(v, -2);
-    }
-
-    inline void TestAtomicSwap() {
-        TAtomic v = 0;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&v, 3), 0);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&v, 5), 3);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&v, -7), 5);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&v, Max<intptr_t>()), -7);
-        UNIT_ASSERT_VALUES_EQUAL(v, Max<intptr_t>());
-    }
-
-    inline void TestAtomicOr() {
-        TAtomic v = 0xf0;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicOr(v, 0x0f), 0xff);
-        UNIT_ASSERT_VALUES_EQUAL(v, 0xff);
-    }
-
-    inline void TestAtomicAnd() {
-        TAtomic v = 0xff;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicAnd(v, 0xf0), 0xf0);
-        UNIT_ASSERT_VALUES_EQUAL(v, 0xf0);
-    }
-
-    inline void TestAtomicXor() {
-        TAtomic v = 0x00;
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicXor(v, 0xff), 0xff);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicXor(v, 0xff), 0x00);
-    }
-
-    inline void TestAtomicPtr() {
-        int* p;
-        AtomicSet(p, nullptr);
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGet(p), 0);
-
-        int i;
-        AtomicSet(p, &i);
-
-        UNIT_ASSERT_VALUES_EQUAL(AtomicGet(p), &i);
-        UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&p, nullptr), &i);
-        UNIT_ASSERT(AtomicCas(&p, &i, nullptr));
-    }
-};
-
-UNIT_TEST_SUITE_REGISTRATION(TAtomicTest<TAtomic>);
-
-#ifndef _MSC_VER
-// chooses type *other than* T1
-template <typename T1, typename T2, typename T3>
-struct TChooser {
-    using TdType = T2;
-};
-
-template <typename T1, typename T2>
-struct TChooser<T1, T1, T2> {
-    using TdType = T2;
-};
-
-template <typename T1>
-struct TChooser<T1, T1, T1> {};
-
-    #if defined(__IOS__) && defined(_32_)
-using TAltAtomic = int;
-    #else
-using TAltAtomic = volatile TChooser<TAtomicBase, long, long long>::TdType;
-    #endif
-
-class TTTest: public TAtomicTest<TAltAtomic> {
-public:
-    TString Name() const noexcept override {
-        return "TAtomicTest<TAltAtomic>";
-    }
-
-    static TString StaticName() noexcept {
-        return "TAtomicTest<TAltAtomic>";
-    }
-};
-
-UNIT_TEST_SUITE_REGISTRATION(TTTest);
-
-#endif
diff --git a/util/system/atomic_win.h b/util/system/atomic_win.h
deleted file mode 100644
index 65c290e6cc..0000000000
--- a/util/system/atomic_win.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-#include <intrin.h>
-
-#define USE_GENERIC_SETGET
-
-#if defined(_i386_)
-
-    #pragma intrinsic(_InterlockedIncrement)
-    #pragma intrinsic(_InterlockedDecrement)
-    #pragma intrinsic(_InterlockedExchangeAdd)
-    #pragma intrinsic(_InterlockedExchange)
-    #pragma intrinsic(_InterlockedCompareExchange)
-
-static inline intptr_t AtomicIncrement(TAtomic& a) {
-    return _InterlockedIncrement((volatile long*)&a);
-}
-
-static inline intptr_t AtomicGetAndIncrement(TAtomic& a) {
-    return _InterlockedIncrement((volatile long*)&a) - 1;
-}
-
-static inline intptr_t AtomicDecrement(TAtomic& a) {
-    return _InterlockedDecrement((volatile long*)&a);
-}
-
-static inline intptr_t AtomicGetAndDecrement(TAtomic& a) {
-    return _InterlockedDecrement((volatile long*)&a) + 1;
-}
-
-static inline intptr_t AtomicAdd(TAtomic& a, intptr_t b) {
-    return _InterlockedExchangeAdd((volatile long*)&a, b) + b;
-}
-
-static inline intptr_t AtomicGetAndAdd(TAtomic& a, intptr_t b) {
-    return _InterlockedExchangeAdd((volatile long*)&a, b);
-}
-
-static inline intptr_t AtomicSwap(TAtomic* a, intptr_t b) {
-    return _InterlockedExchange((volatile long*)a, b);
-}
-
-static inline bool AtomicCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    return _InterlockedCompareExchange((volatile long*)a, exchange, compare) == compare;
-}
-
-static inline intptr_t AtomicGetAndCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    return _InterlockedCompareExchange((volatile long*)a, exchange, compare);
-}
-
-#else // _x86_64_
-
-    #pragma intrinsic(_InterlockedIncrement64)
-    #pragma intrinsic(_InterlockedDecrement64)
-    #pragma intrinsic(_InterlockedExchangeAdd64)
-    #pragma intrinsic(_InterlockedExchange64)
-    #pragma intrinsic(_InterlockedCompareExchange64)
-
-static inline intptr_t AtomicIncrement(TAtomic& a) {
-    return _InterlockedIncrement64((volatile __int64*)&a);
-}
-
-static inline intptr_t AtomicGetAndIncrement(TAtomic& a) {
-    return _InterlockedIncrement64((volatile __int64*)&a) - 1;
-}
-
-static inline intptr_t AtomicDecrement(TAtomic& a) {
-    return _InterlockedDecrement64((volatile __int64*)&a);
-}
-
-static inline intptr_t AtomicGetAndDecrement(TAtomic& a) {
-    return _InterlockedDecrement64((volatile __int64*)&a) + 1;
-}
-
-static inline intptr_t AtomicAdd(TAtomic& a, intptr_t b) {
-    return _InterlockedExchangeAdd64((volatile __int64*)&a, b) + b;
-}
-
-static inline intptr_t AtomicGetAndAdd(TAtomic& a, intptr_t b) {
-    return _InterlockedExchangeAdd64((volatile __int64*)&a, b);
-}
-
-static inline intptr_t AtomicSwap(TAtomic* a, intptr_t b) {
-    return _InterlockedExchange64((volatile __int64*)a, b);
-}
-
-static inline bool AtomicCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    return _InterlockedCompareExchange64((volatile __int64*)a, exchange, compare) == compare;
-}
-
-static inline intptr_t AtomicGetAndCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
-    return _InterlockedCompareExchange64((volatile __int64*)a, exchange, compare);
-}
-
-static inline intptr_t AtomicOr(TAtomic& a, intptr_t b) {
-    return _InterlockedOr64(&a, b) | b;
-}
-
-static inline intptr_t AtomicAnd(TAtomic& a, intptr_t b) {
-    return _InterlockedAnd64(&a, b) & b;
-}
-
-static inline intptr_t AtomicXor(TAtomic& a, intptr_t b) {
-    return _InterlockedXor64(&a, b) ^ b;
-}
-
-#endif // _x86_
-
-//TODO
-static inline void AtomicBarrier() {
-    TAtomic val = 0;
-
-    AtomicSwap(&val, 0);
-}
diff --git a/util/system/mutex_ut.cpp b/util/system/mutex_ut.cpp
index c8d7caafa1..a9c5c45123 100644
--- a/util/system/mutex_ut.cpp
+++ b/util/system/mutex_ut.cpp
@@ -1,5 +1,4 @@
 #include "mutex.h"
-#include "atomic.h"
 
 #include <library/cpp/testing/unittest/registar.h>