Move TSharedData to actors lib

fix MemoryTrack usages

move MemoryTrack to utils

move TSharedData to actors lib

31 files changed, 33 insertions, 32 deletions

diff --git a/library/cpp/actors/core/CMakeLists.txt b/library/cpp/actors/core/CMakeLists.txt
index 64c617307c7..3dc01c29c15 100644
--- a/library/cpp/actors/core/CMakeLists.txt
+++ b/library/cpp/actors/core/CMakeLists.txt
@@ -47,8 +47,6 @@ target_sources(cpp-actors-core PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_settings.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mailbox.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/memory_track.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/memory_tracker.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/monotonic.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/monotonic_provider.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/worker_context.cpp
diff --git a/library/cpp/actors/util/CMakeLists.txt b/library/cpp/actors/util/CMakeLists.txt
index 233e1fe0fc4..19f683cb2a3 100644
--- a/library/cpp/actors/util/CMakeLists.txt
+++ b/library/cpp/actors/util/CMakeLists.txt
@@ -16,6 +16,9 @@ target_link_libraries(cpp-actors-util PUBLIC
 )
 target_sources(cpp-actors-util PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/affinity.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_track.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/should_continue.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/threadparkpad.cpp
 )
diff --git a/library/cpp/actors/core/memory_track.cpp b/library/cpp/actors/util/memory_track.cpp
index 5f422116bee..5f422116bee 100644
--- a/library/cpp/actors/core/memory_track.cpp
+++ b/library/cpp/actors/util/memory_track.cpp
diff --git a/library/cpp/actors/core/memory_track.h b/library/cpp/actors/util/memory_track.h
index 6035333eeb4..6035333eeb4 100644
--- a/library/cpp/actors/core/memory_track.h
+++ b/library/cpp/actors/util/memory_track.h
diff --git a/library/cpp/actors/core/memory_tracker.cpp b/library/cpp/actors/util/memory_tracker.cpp
index 8a12452c71c..8a12452c71c 100644
--- a/library/cpp/actors/core/memory_tracker.cpp
+++ b/library/cpp/actors/util/memory_tracker.cpp
diff --git a/library/cpp/actors/core/memory_tracker.h b/library/cpp/actors/util/memory_tracker.h
index e74508191b1..e74508191b1 100644
--- a/library/cpp/actors/core/memory_tracker.h
+++ b/library/cpp/actors/util/memory_tracker.h
diff --git a/library/cpp/actors/core/memory_tracker_ut.cpp b/library/cpp/actors/util/memory_tracker_ut.cpp
index d168214da63..1b8eff7cc5c 100644
--- a/library/cpp/actors/core/memory_tracker_ut.cpp
+++ b/library/cpp/actors/util/memory_tracker_ut.cpp
@@ -36,6 +36,7 @@ struct TNameLabeled
     char payload[32];
 };
 
+#ifndef _win_
 Y_UNIT_TEST(Gathering)
 {
     TMemoryTracker::Instance()->Initialize();
@@ -75,7 +76,7 @@ Y_UNIT_TEST(Gathering)
     UNIT_ASSERT(metrics[nameIndex].GetMemory() == 0);
     UNIT_ASSERT(metrics[nameIndex].GetCount() == 0);
 }
-
+#endif
 
 static constexpr char InContainerLabel[] = "InContainerLabel";
 
diff --git a/ydb/core/base/shared_data.cpp b/library/cpp/actors/util/shared_data.cpp
index c375acc515a..209ca7bcbde 100644
--- a/ydb/core/base/shared_data.cpp
+++ b/library/cpp/actors/util/shared_data.cpp
@@ -1,11 +1,11 @@
 #include "shared_data.h"
 
-#include <library/cpp/actors/core/memory_tracker.h>
+#include "memory_tracker.h"
 
 #include <util/system/sys_alloc.h>
 #include <util/system/sanitizers.h>
 
-namespace NKikimr {
+namespace NActors {
 
     static constexpr char MemoryLabelSharedData[] = "Tablet/TSharedData/Buffers";
 
diff --git a/ydb/core/base/shared_data.h b/library/cpp/actors/util/shared_data.h
index c0551f107c5..6fdc9bf35fb 100644
--- a/ydb/core/base/shared_data.h
+++ b/library/cpp/actors/util/shared_data.h
@@ -6,7 +6,7 @@
 #include <util/system/compiler.h>
 #include <util/generic/array_ref.h>
 
-namespace NKikimr {
+namespace NActors {
 
     class TSharedData {
     public:
diff --git a/ydb/core/base/shared_data_rope_backend.h b/library/cpp/actors/util/shared_data_rope_backend.h
index 814ecb98cc4..3add6afd27f 100644
--- a/ydb/core/base/shared_data_rope_backend.h
+++ b/library/cpp/actors/util/shared_data_rope_backend.h
@@ -4,7 +4,7 @@
 
 #include "shared_data.h"
 
-namespace NKikimr {
+namespace NActors {
 
 class TRopeSharedDataBackend : public IRopeChunkBackend {
     TSharedData Buffer;
@@ -34,4 +34,4 @@ public:
     }
 };
 
-} // namespace NKikimr
+} // namespace NActors
diff --git a/ydb/core/base/shared_data_rope_backend_ut.cpp b/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
index 69b3532751a..3ffe14a544f 100644
--- a/ydb/core/base/shared_data_rope_backend_ut.cpp
+++ b/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
@@ -4,7 +4,7 @@
 
 #include "shared_data_rope_backend.h"
 
-namespace NKikimr {
+namespace NActors {
 
     namespace {
 
@@ -228,4 +228,4 @@ namespace NKikimr {
         }
     }
 
-} // namespace NKikimr
+} // namespace NActors
diff --git a/ydb/core/base/shared_data_ut.cpp b/library/cpp/actors/util/shared_data_ut.cpp
index bf94a88f7e8..8ed0df68666 100644
--- a/ydb/core/base/shared_data_ut.cpp
+++ b/library/cpp/actors/util/shared_data_ut.cpp
@@ -6,7 +6,7 @@
 #include <util/generic/deque.h>
 #include <util/system/sys_alloc.h>
 
-namespace NKikimr {
+namespace NActors {
 
     Y_UNIT_TEST_SUITE(TSharedDataTest) {
 
diff --git a/ydb/core/base/CMakeLists.txt b/ydb/core/base/CMakeLists.txt
index 3adecb4b243..ec8ad4bf8d6 100644
--- a/ydb/core/base/CMakeLists.txt
+++ b/ydb/core/base/CMakeLists.txt
@@ -58,7 +58,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/services_assert.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/shared_data.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_event_filter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_guardian.cpp
diff --git a/ydb/core/base/ut/CMakeLists.darwin.txt b/ydb/core/base/ut/CMakeLists.darwin.txt
index dbffd562f17..0c008df0fa3 100644
--- a/ydb/core/base/ut/CMakeLists.darwin.txt
+++ b/ydb/core/base/ut/CMakeLists.darwin.txt
@@ -32,8 +32,6 @@ target_sources(ydb-core-base-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/shared_data_rope_backend_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_guardian_impl_ut.cpp
 )
diff --git a/ydb/core/base/ut/CMakeLists.linux.txt b/ydb/core/base/ut/CMakeLists.linux.txt
index 66b889e9119..ed385b2b2f4 100644
--- a/ydb/core/base/ut/CMakeLists.linux.txt
+++ b/ydb/core/base/ut/CMakeLists.linux.txt
@@ -36,8 +36,6 @@ target_sources(ydb-core-base-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/shared_data_rope_backend_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage_guardian_impl_ut.cpp
 )
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 25f98caaf3c..2340d649e97 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -119,7 +119,7 @@
 #include <ydb/core/node_whiteboard/node_whiteboard.h>
 #include <ydb/core/tablet/node_tablet_monitor.h>
 
-#include <library/cpp/actors/core/memory_track.h>
+#include <library/cpp/actors/util/memory_track.h>
 #include <library/cpp/actors/prof/tag.h>
 #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h>
 
diff --git a/ydb/core/sys_view/processor/processor_impl.h b/ydb/core/sys_view/processor/processor_impl.h
index 3867fd457a3..96e018dee1b 100644
--- a/ydb/core/sys_view/processor/processor_impl.h
+++ b/ydb/core/sys_view/processor/processor_impl.h
@@ -15,7 +15,7 @@
 #include <ydb/core/tx/tx.h>
 
 #include <library/cpp/actors/core/interconnect.h>
-#include <library/cpp/actors/core/memory_track.h>
+#include <library/cpp/actors/util/memory_track.h>
 
 namespace NKikimr {
 namespace NSysView {
diff --git a/ydb/core/tablet_flat/flat_bloom_writer.h b/ydb/core/tablet_flat/flat_bloom_writer.h
index 625941a77d4..9884d602dd6 100644
--- a/ydb/core/tablet_flat/flat_bloom_writer.h
+++ b/ydb/core/tablet_flat/flat_bloom_writer.h
@@ -5,7 +5,7 @@
 #include "flat_util_binary.h"
 #include "util_deref.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/ymath.h>
 #include <util/system/sanitizers.h>
diff --git a/ydb/core/tablet_flat/flat_mem_blobs.h b/ydb/core/tablet_flat/flat_mem_blobs.h
index 25417cb168e..d63580ff42e 100644
--- a/ydb/core/tablet_flat/flat_mem_blobs.h
+++ b/ydb/core/tablet_flat/flat_mem_blobs.h
@@ -4,7 +4,7 @@
 #include "flat_sausage_fetch.h"
 #include "util_store.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/core/tablet_flat/flat_page_data.h b/ydb/core/tablet_flat/flat_page_data.h
index df083d6b4a8..a37c4bf75ba 100644
--- a/ydb/core/tablet_flat/flat_page_data.h
+++ b/ydb/core/tablet_flat/flat_page_data.h
@@ -6,7 +6,7 @@
 #include "util_basics.h"
 #include "util_deref.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <library/cpp/blockcodecs/codecs.h>
 #include <util/generic/buffer.h>
diff --git a/ydb/core/tablet_flat/flat_page_label.h b/ydb/core/tablet_flat/flat_page_label.h
index ba0d1df80e7..4a04c1f7c3e 100644
--- a/ydb/core/tablet_flat/flat_page_label.h
+++ b/ydb/core/tablet_flat/flat_page_label.h
@@ -1,9 +1,11 @@
 #pragma once
 
+#include "defs.h"
+
 #include "flat_page_iface.h"
 #include "util_basics.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/array_ref.h>
 #include <util/system/unaligned_mem.h>
diff --git a/ydb/core/tablet_flat/flat_part_iface.h b/ydb/core/tablet_flat/flat_part_iface.h
index 03882305a50..bbfeab8f5de 100644
--- a/ydb/core/tablet_flat/flat_part_iface.h
+++ b/ydb/core/tablet_flat/flat_part_iface.h
@@ -6,7 +6,7 @@
 #include "flat_row_eggs.h"
 #include "util_basics.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/string.h>
 #include <util/system/types.h>
diff --git a/ydb/core/tablet_flat/flat_part_scheme.h b/ydb/core/tablet_flat/flat_part_scheme.h
index ea8f5a1dbb8..543df5fcaca 100644
--- a/ydb/core/tablet_flat/flat_part_scheme.h
+++ b/ydb/core/tablet_flat/flat_part_scheme.h
@@ -7,7 +7,7 @@
 #include "flat_row_nulls.h"
 #include "flat_part_pinout.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/ptr.h>
 #include <util/generic/hash.h>
diff --git a/ydb/core/tablet_flat/flat_range_cache.h b/ydb/core/tablet_flat/flat_range_cache.h
index b5f689c15bd..95fd100cdf4 100644
--- a/ydb/core/tablet_flat/flat_range_cache.h
+++ b/ydb/core/tablet_flat/flat_range_cache.h
@@ -6,7 +6,7 @@
 #include <ydb/core/base/row_version.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 
-#include <library/cpp/actors/core/memory_track.h>
+#include <library/cpp/actors/util/memory_track.h>
 
 #include <util/generic/deque.h>
 #include <util/generic/intrlist.h>
diff --git a/ydb/core/tablet_flat/flat_sausage_fetch.h b/ydb/core/tablet_flat/flat_sausage_fetch.h
index 3654b9e745e..c74a1ac18dc 100644
--- a/ydb/core/tablet_flat/flat_sausage_fetch.h
+++ b/ydb/core/tablet_flat/flat_sausage_fetch.h
@@ -2,7 +2,7 @@
 
 #include "flat_sausage_gut.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 namespace NKikimr {
 namespace NPageCollection {
diff --git a/ydb/core/tablet_flat/flat_sausage_meta.h b/ydb/core/tablet_flat/flat_sausage_meta.h
index bb23adc8244..b435f1758bc 100644
--- a/ydb/core/tablet_flat/flat_sausage_meta.h
+++ b/ydb/core/tablet_flat/flat_sausage_meta.h
@@ -4,7 +4,7 @@
 #include "flat_sausage_layout.h"
 #include "flat_sausage_solid.h"
 
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 namespace NKikimr {
 namespace NPageCollection {
diff --git a/ydb/core/tablet_flat/flat_sausage_solid.h b/ydb/core/tablet_flat/flat_sausage_solid.h
index 32049333bbe..c1643784ea3 100644
--- a/ydb/core/tablet_flat/flat_sausage_solid.h
+++ b/ydb/core/tablet_flat/flat_sausage_solid.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/logoblob.h>
-#include <ydb/core/base/shared_data.h>
+#include <library/cpp/actors/util/shared_data.h>
 
 namespace NKikimr {
 namespace NPageCollection {
diff --git a/ydb/core/tablet_flat/shared_handle.h b/ydb/core/tablet_flat/shared_handle.h
index 308475a75f3..507e5f40bba 100644
--- a/ydb/core/tablet_flat/shared_handle.h
+++ b/ydb/core/tablet_flat/shared_handle.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <ydb/core/base/shared_data.h>
+#include "defs.h"
+
+#include <library/cpp/actors/util/shared_data.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/core/tx/datashard/datashard_active_transaction.cpp b/ydb/core/tx/datashard/datashard_active_transaction.cpp
index 48882a072ca..6904293b1e4 100644
--- a/ydb/core/tx/datashard/datashard_active_transaction.cpp
+++ b/ydb/core/tx/datashard/datashard_active_transaction.cpp
@@ -7,7 +7,7 @@
 #include "datashard_failpoints.h"
 #include "key_conflicts.h"
 
-#include <library/cpp/actors/core/memory_track.h>
+#include <library/cpp/actors/util/memory_track.h>
 
 namespace NKikimr {
 namespace NDataShard {
diff --git a/ydb/core/tx/scheme_board/replica.cpp b/ydb/core/tx/scheme_board/replica.cpp
index 100ae3454da..dfdd36ff180 100644
--- a/ydb/core/tx/scheme_board/replica.cpp
+++ b/ydb/core/tx/scheme_board/replica.cpp
@@ -13,7 +13,7 @@
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/interconnect.h>
 #include <library/cpp/actors/core/log.h>
-#include <library/cpp/actors/core/memory_track.h>
+#include <library/cpp/actors/util/memory_track.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/map.h>
diff --git a/ydb/core/util/memory_tracker.cpp b/ydb/core/util/memory_tracker.cpp
index cbec61b07d2..6c9f192af5f 100644
--- a/ydb/core/util/memory_tracker.cpp
+++ b/ydb/core/util/memory_tracker.cpp
@@ -5,7 +5,7 @@
 #include <ydb/core/mon/mon.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
-#include <library/cpp/actors/core/memory_tracker.h>
+#include <library/cpp/actors/util/memory_tracker.h>
 #include <library/cpp/html/escape/escape.h>
 #include <library/cpp/monlib/service/pages/templates.h>