Improve SendWithContinuousExecution,

1 files changed, 8 insertions, 5 deletions

diff --git a/library/cpp/actors/core/executor_pool_base.cpp b/library/cpp/actors/core/executor_pool_base.cpp
index fe46d56fdc..dd0490277c 100644
--- a/library/cpp/actors/core/executor_pool_base.cpp
+++ b/library/cpp/actors/core/executor_pool_base.cpp
@@ -72,12 +72,15 @@ namespace NActors {
         }
     }
 
+    Y_FORCE_INLINE bool IsSendingWithContinuousExecution(IExecutorPool *self) {
+        return TlsThreadContext && TlsThreadContext->Pool == self && TlsThreadContext->IsSendingWithContinuousExecution;
+    }
+
     void TExecutorPoolBase::ScheduleActivation(ui32 activation) {
-        if (TlsThreadContext && TlsThreadContext->Pool == static_cast<IExecutorPool*>(this) && TlsThreadContext->IsSendingWithContinuousExecution
-                && !TlsThreadContext->WaitedActivation)
-        {
-            TlsThreadContext->WaitedActivation = activation;
-        } else {
+        if (IsSendingWithContinuousExecution(this)) {
+            std::swap(TlsThreadContext->WaitedActivation, activation);
+        }
+        if (activation) {
             ScheduleActivationEx(activation, AtomicIncrement(ActivationsRevolvingCounter));
         }
     }