Skip to content

Commit

Permalink
Revert "Fix schedule actor events for self" (ydb-platform#14217)
Browse files Browse the repository at this point in the history
  • Loading branch information
beehelit authored Feb 5, 2025
1 parent cf080a4 commit 5d66850
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ namespace NKikimr {
}

Y_UNIT_TEST(FindingPartsWithTimeout) {
return;

TBlobStorageGroupType type(TErasureType::Erasure4Plus2Block);
TVPatchTestGeneralData testData(type, 10);
TTestActorRuntimeBase &runtime = testData.Runtime;
Expand Down
18 changes: 9 additions & 9 deletions ydb/library/actors/core/actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ namespace NActors {
}

void TActorIdentity::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
return TActivationContext::Schedule(deadline, new IEventHandle(*this, *this, ev), cookie);
return TActivationContext::Schedule(deadline, new IEventHandle(*this, {}, ev), cookie);
}

void TActorIdentity::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
return TActivationContext::Schedule(deadline, new IEventHandle(*this, *this, ev), cookie);
return TActivationContext::Schedule(deadline, new IEventHandle(*this, {}, ev), cookie);
}

void TActorIdentity::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const {
return TActivationContext::Schedule(delta, new IEventHandle(*this, *this, ev), cookie);
return TActivationContext::Schedule(delta, new IEventHandle(*this, {}, ev), cookie);
}

TActorId TActivationContext::RegisterWithSameMailbox(IActor* actor, TActorId parentId) {
Expand Down Expand Up @@ -178,15 +178,15 @@ namespace NActors {
}

void TActorContext::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, SelfID, ev), cookie);
ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, TActorId(), ev), cookie);
}

void TActorContext::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, SelfID, ev), cookie);
ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, TActorId(), ev), cookie);
}

void TActorContext::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const {
ExecutorThread.Schedule(delta, new IEventHandle(SelfID, SelfID, ev), cookie);
ExecutorThread.Schedule(delta, new IEventHandle(SelfID, TActorId(), ev), cookie);
}

void TActorContext::Schedule(TInstant deadline, std::unique_ptr<IEventHandle> ev, ISchedulerCookie* cookie) const {
Expand All @@ -202,15 +202,15 @@ namespace NActors {
}

void IActor::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}

void IActor::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}

void IActor::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
TlsActivationContext->ExecutorThread.Schedule(delta, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
TlsActivationContext->ExecutorThread.Schedule(delta, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}

TInstant TActivationContext::Now() {
Expand Down

0 comments on commit 5d66850

Please sign in to comment.