Skip to content

clock_control: break loops when conditions may change after waiting for microtasks #9075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2025
Merged

clock_control: break loops when conditions may change after waiting for microtasks #9075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions app/lib/task/clock_control.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,22 @@ final class ClockController {
Duration? minimumStep,
}) async {
final deadline = timeout != null ? clock.fromNowBy(timeout) : null;
while (_pendingTimers.isNotEmpty &&

bool shouldLoop() =>
_pendingTimers.isNotEmpty &&
(deadline == null ||
_pendingTimers.first._elapsesAtInFakeTime.isBefore(deadline))) {
_pendingTimers.first._elapsesAtInFakeTime.isBefore(deadline));

while (shouldLoop()) {
if (await condition()) {
return;
}

// Wait for all microtasks to run
await _waitForMicroTasks();
if (!shouldLoop()) {
break;
}

// Jump into the future, until the point in time that the next timer is
// pending.
Expand Down Expand Up @@ -371,10 +378,15 @@ final class ClockController {
/// moving backwards in time. That allows [elapseTime] to be called with
/// a zero duration.
Future<void> _elapseTo(DateTime futureTime) async {
while (_pendingTimers.isNotEmpty &&
_pendingTimers.first._elapsesAtInFakeTime.isBefore(futureTime)) {
bool shouldLoop() =>
_pendingTimers.isNotEmpty &&
_pendingTimers.first._elapsesAtInFakeTime.isBefore(futureTime);
while (shouldLoop()) {
// Wait for all microtasks to run
await _waitForMicroTasks();
if (!shouldLoop()) {
break;
}

// Jump into the future, until the point in time that the next timer is
// pending.
Expand Down