fix aligned page pool counters (#9373)

Author: gridnevvvit

ydb/core/base/pool_stats_collector.cpp

@@ -32,15 +32,21 @@ class TStatsCollectingActor : public NActors::TStatsCollectingActor {
         void Init(::NMonitoring::TDynamicCounters* group) {
             CounterGroup = group->GetSubgroup("subsystem", "mkqlalloc");
             TotalBytes = CounterGroup->GetCounter("GlobalPoolTotalBytes", false);
+            TotalMmapped = CounterGroup->GetCounter("TotalMmappedBytes", false);
+            TotalFreeList = CounterGroup->GetCounter("TotalFreeListBytes", false);
         }
 
         void Update() {
             *TotalBytes = TAlignedPagePool::GetGlobalPagePoolSize();
+            *TotalMmapped = ::NKikimr::GetTotalMmapedBytes();
+            *TotalFreeList = ::NKikimr::GetTotalFreeListBytes();
         }
 
     private:
         TIntrusivePtr<::NMonitoring::TDynamicCounters> CounterGroup;
         ::NMonitoring::TDynamicCounters::TCounterPtr TotalBytes;
+        ::NMonitoring::TDynamicCounters::TCounterPtr TotalMmapped;
+        ::NMonitoring::TDynamicCounters::TCounterPtr TotalFreeList;
     };
 
     void OnWakeup(const TActorContext &ctx) override {

ydb/library/yql/minikql/aligned_page_pool.cpp

@@ -103,6 +103,10 @@ class TGlobalPools {
         return *Pools[index];
     }
 
+    const TGlobalPagePool<T, SysAlign>& Get(ui32 index) const {
+        return *Pools[index];
+    }
+
     TGlobalPools()
     {
         Reset();
@@ -141,7 +145,7 @@ class TGlobalPools {
     i64 GetTotalFreeListBytes() const {
         i64 bytes = 0;
         for (ui32 i = 0; i <= MidLevels; ++i) {
-            bytes += Get(i).GetPageCount() * Get(i).GetPageSize();
+            bytes += Get(i).GetSize();
         }
 
         return bytes;
@@ -596,17 +600,19 @@ void* GetAlignedPage(ui64 size) {
         size = TAlignedPagePool::POOL_PAGE_SIZE;
     }
 
+    auto& pool = TGlobalPools<TMmap, true>::Instance();
+
     if (size <= MaxMidSize) {
         size = FastClp2(size);
         auto level = LeastSignificantBit(size) - LeastSignificantBit(TAlignedPagePool::POOL_PAGE_SIZE);
         Y_DEBUG_ABORT_UNLESS(level <= MidLevels);
-        if (auto res = TGlobalPools<TMmap, true>::Instance().Get(level).GetPage()) {
+        if (auto res = pool.Get(level).GetPage()) {
             return res;
         }
     }
 
     auto allocSize = Max<ui64>(MaxMidSize, size);
-    void* mem = TMmap::Mmap(allocSize);
+    void* mem = pool.DoMmap(allocSize);
     if (Y_UNLIKELY(MAP_FAILED == mem)) {
         ythrow yexception() << "Mmap failed to allocate " << allocSize << " bytes: " << LastSystemErrorText();
     }
@@ -615,7 +621,6 @@ void* GetAlignedPage(ui64 size) {
         // push extra allocated pages to cache
         auto level = LeastSignificantBit(size) - LeastSignificantBit(TAlignedPagePool::POOL_PAGE_SIZE);
         Y_DEBUG_ABORT_UNLESS(level <= MidLevels);
-        auto& pool = TGlobalPools<TMmap, true>::Instance();
         ui8* ptr = (ui8*)mem + size;
         ui8* const end = (ui8*)mem + MaxMidSize;
         while (ptr < end) {
@@ -655,6 +660,14 @@ i64 GetTotalFreeListBytes() {
     return TGlobalPools<TMmap, true>::Instance().GetTotalFreeListBytes() + TGlobalPools<TMmap, false>::Instance().GetTotalFreeListBytes();
 }
 
+template i64 GetTotalMmapedBytes<>();
+template i64 GetTotalMmapedBytes<TFakeAlignedMmap>();
+template i64 GetTotalMmapedBytes<TFakeUnalignedMmap>();
+
+template i64 GetTotalFreeListBytes<>();
+template i64 GetTotalFreeListBytes<TFakeAlignedMmap>();
+template i64 GetTotalFreeListBytes<TFakeUnalignedMmap>();
+
 template void* GetAlignedPage<>(ui64);
 template void* GetAlignedPage<TFakeAlignedMmap>(ui64);
 template void* GetAlignedPage<TFakeUnalignedMmap>(ui64);