Revert "As/add more actor system activity (ydb-platform#5052)"

This reverts commit a4e2878.

Author: kruall

ydb/library/actors/actor_type/common.h

@@ -29,17 +29,6 @@ enum class EInternalActorType {
     NAMESERVICE,
     DNS_RESOLVER,
     INTERCONNECT_PROXY_WRAPPER,
-    ACTOR_COROUTINE,
+    ACTOR_COROUTINE
 };
-
-enum class EInternalActorSystemActivity {
-    ACTOR_SYSTEM_SPIN,
-    ACTOR_SYSTEM_HARMONIZER,
-    ACTOR_SYSTEM_SEND,
-    ACTOR_SYSTEM_REGISTER,
-    ACTOR_SYSTEM_GET_ACTIVATION,
-    ACTOR_SYSTEM_GET_ACTIVATION_FROM_QUEUE,
-    ACTOR_SYSTEM_WAKE_UP,
-};
-
 }

ydb/library/actors/core/activity_guard.h

@@ -1,5 +1,4 @@
 #include "defs.h"
-#include "activity_guard.h"
 #include "actorsystem.h"
 #include "callstack.h"
 #include "cpu_manager.h"
@@ -97,7 +96,6 @@ namespace NActors {
         if (Y_UNLIKELY(!ev))
             return false;
 
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_SEND> activityGuard;
 #ifdef USE_ACTOR_CALLSTACK
         ev->Callstack.TraceIfEmpty();
 #endif

ydb/library/actors/core/actorsystem.cpp

@@ -149,7 +149,6 @@ namespace NActors {
 
     TActorId TExecutorPoolBaseMailboxed::Register(IActor* actor, TMailboxType::EType mailboxType, ui64 revolvingWriteCounter, const TActorId& parentId) {
         NHPTimer::STime hpstart = GetCycleCountFast();
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_REGISTER> activityGuard(hpstart);
 #ifdef ACTORSLIB_COLLECT_EXEC_STATS
         ui32 at = actor->GetActivityType();
         Y_DEBUG_ABORT_UNLESS(at < Stats.ActorsAliveByActivity.size());
@@ -237,7 +236,6 @@ namespace NActors {
 
     TActorId TExecutorPoolBaseMailboxed::Register(IActor* actor, TMailboxHeader* mailbox, ui32 hint, const TActorId& parentId) {
         NHPTimer::STime hpstart = GetCycleCountFast();
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_REGISTER> activityGuard(hpstart);
 #ifdef ACTORSLIB_COLLECT_EXEC_STATS
         ui32 at = actor->GetActivityType();
         if (at >= Stats.MaxActivityType())

ydb/library/actors/core/executor_pool_base.cpp

@@ -200,9 +200,6 @@ namespace NActors {
     }
 
     ui32 TBasicExecutorPool::GetReadyActivationCommon(TWorkerContext& wctx, ui64 revolvingCounter) {
-        NHPTimer::STime hpnow = GetCycleCountFast();
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_GET_ACTIVATION> activityGuard(hpnow);
-
         TWorkerId workerId = wctx.WorkerId;
         Y_DEBUG_ABORT_UNLESS(workerId < MaxFullThreadCount);
 
@@ -212,9 +209,10 @@ namespace NActors {
             Y_ABORT_UNLESS(wctx.SharedThread);
             wctx.SharedThread->UnsetWork();
         }
+
         if (Harmonizer) {
             LWPROBE(TryToHarmonize, PoolId, PoolName);
-            Harmonizer->Harmonize(hpnow);
+            Harmonizer->Harmonize(TlsThreadContext->StartOfProcessingEventTS.load(std::memory_order_relaxed));
         }
 
         TAtomic x = AtomicGet(Semaphore);
@@ -234,7 +232,6 @@ namespace NActors {
                     }
                 }
             } else {
-                TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_GET_ACTIVATION_FROM_QUEUE> activityGuard;
                 if (const ui32 activation = Activations.Pop(++revolvingCounter)) {
                     if (workerId >= 0) {
                         Threads[workerId].SetWork();
@@ -714,7 +711,6 @@ namespace NActors {
     }
 
     bool TExecutorThreadCtx::WakeUp() {
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_WAKE_UP> activityGuard;
         for (ui32 i = 0; i < 2; ++i) {
             EThreadState state = GetState<EThreadState>();
             switch (state) {
@@ -743,7 +739,6 @@ namespace NActors {
     }
 
     bool TSharedExecutorThreadCtx::WakeUp() {
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_GET_ACTIVATION_FROM_QUEUE> activityGuard;
         i64 requestsForWakeUp = RequestsForWakeUp.fetch_add(1, std::memory_order_acq_rel);
         if (requestsForWakeUp >= 0) {
             return false;

ydb/library/actors/core/executor_pool_basic.cpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "defs.h"
-#include "activity_guard.h"
 #include "executor_thread.h"
 #include "thread_context.h"
 
@@ -61,13 +60,11 @@ namespace NActors {
 
         template <typename TDerived, typename TWaitState>
         void Spin(ui64 spinThresholdCycles, std::atomic<bool> *stopFlag) {
+            ui64 start = GetCycleCountFast();
             bool doSpin = true;
-            NHPTimer::STime start = GetCycleCountFast();
-            TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_SPIN> activityGuard(start);
             while (true) {
                 for (ui32 j = 0; doSpin && j < 12; ++j) {
-                    NHPTimer::STime hpnow = GetCycleCountFast();
-                    if (hpnow >= i64(start + spinThresholdCycles)) {
+                    if (GetCycleCountFast() >= (start + spinThresholdCycles)) {
                         doSpin = false;
                         break;
                     }
@@ -103,8 +100,8 @@ namespace NActors {
 
             NHPTimer::STime hpnow = GetCycleCountFast();
             NHPTimer::STime hpprev = TlsThreadContext->UpdateStartOfProcessingEventTS(hpnow);
-            ui32 prevActivity = TlsThreadContext->ElapsingActorActivity.exchange(Max<ui64>(), std::memory_order_acq_rel);
-            TlsThreadContext->WorkerCtx->AddElapsedCycles(prevActivity, hpnow - hpprev);
+            TlsThreadContext->ElapsingActorActivity.store(Max<ui64>(), std::memory_order_release);
+            TlsThreadContext->WorkerCtx->AddElapsedCycles(TlsThreadContext->ActorSystemIndex, hpnow - hpprev);
             do {
                 if (WaitingPad.Park()) // interrupted
                     return true;

ydb/library/actors/core/executor_thread_ctx.h

@@ -4,7 +4,6 @@
 #include "executor_thread.h"
 #include "probes.h"
 
-#include "activity_guard.h"
 #include "actorsystem.h"
 #include "executor_pool_basic.h"
 #include "executor_pool_basic_feature_flags.h"
@@ -759,17 +758,13 @@ void THarmonizer::Harmonize(ui64 ts) {
     ui64 previousNextHarmonizeTs = NextHarmonizeTs.exchange(ts + Us2Ts(1'000'000ull));
     LWPROBE(TryToHarmonizeSuccess, ts, NextHarmonizeTs, previousNextHarmonizeTs);
 
-    {
-        TInternalActorTypeGuard<EInternalActorSystemActivity::ACTOR_SYSTEM_HARMONIZER> activityGuard;
-
-        if (PriorityOrder.empty()) {
-            CalculatePriorityOrder();
-        }
-
-        PullStats(ts);
-        HarmonizeImpl(ts);
+    if (PriorityOrder.empty()) {
+        CalculatePriorityOrder();
     }
 
+    PullStats(ts);
+    HarmonizeImpl(ts);
+
     Lock.Release();
 }