Merge c9fae23 into 02fde22

Author: mregrock

ydb/library/actors/interconnect/event_holder_pool.h

@@ -12,7 +12,7 @@ namespace NActors {
         TStackVec<THolder<IEventBase>, MaxEvents> Events;
         TStackVec<THolder<TEventSerializedData>, MaxEvents> Buffers;
         std::shared_ptr<std::atomic<TAtomicBase>> Counter;
-        ui64 NumBytes = 0;
+        ui64 NumBytes = sizeof(TEvFreeItems);
 
         ~TEvFreeItems() {
             if (Counter) {
@@ -76,6 +76,7 @@ namespace NActors {
                 auto p = GetPendingEvent();
                 p->NumBytes += event->EventSerializedSize;
                 auto& events = p->Events;
+                p->NumBytes += sizeof(ev);
                 events.push_back(std::move(ev));
                 trim = trim || events.size() >= TEvFreeItems::MaxEvents || p->NumBytes >= MaxBytesPerMessage;
             }
@@ -85,18 +86,22 @@ namespace NActors {
                 auto p = GetPendingEvent();
                 p->NumBytes += event->EventSerializedSize;
                 auto& buffers = p->Buffers;
-                buffers.emplace_back(event->Buffer.Release());
+                auto&& bufferReleased = event->Buffer.Release();
+                p->NumBytes += sizeof(bufferReleased);
+                buffers.emplace_back(bufferReleased);
                 trim = trim || buffers.size() >= TEvFreeItems::MaxEvents || p->NumBytes >= MaxBytesPerMessage;
             }
 
             // free event and trim the cache if its size is exceeded
             event->Clear();
             Cache.splice(Cache.end(), queue, event);
             if (Cache.size() >= FreeQueueTrimThreshold) {
-                auto& freeQueue = GetPendingEvent()->FreeQueue;
+                auto p = GetPendingEvent();
+                auto& freeQueue = p->FreeQueue;
                 auto it = Cache.begin();
                 std::advance(it, Cache.size() - MaxFreeQueueItems);
                 freeQueue.splice(freeQueue.end(), Cache, Cache.begin(), it);
+                p->NumBytes += sizeof(TEventHolder) * (std::distance(it, Cache.begin()));
                 trim = true;
             }