Skip to content

[win32] Remove the predicate from TimerThread condition variable - #193181

Merged
knopp merged 1 commit into
flutter:masterfrom
knopp:fix_timer_thread_wake_up
Sep 23, 2026
Merged

knopp merged 1 commit into
flutter:masterfrom
knopp:fix_timer_thread_wake_up

Conversation

@knopp

@knopp knopp commented Sep 22, 2026

Copy link
Copy Markdown
Member

Right now we're not checking the next_fire_time_ in the predicate, which means that when scheduling an earlier timer, we signal the condition variable but because of the missing check it is ignored as spurious wake-up.

This is the second time we got the predicate wrong. The loop can handle spurious wake-ups just fine, so it's probably best to remove the predicate.

This might account for some of the win32 tests flakiness.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

@knopp
knopp requested a review from a team as a code owner September 22, 2026 20:41
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Sep 22, 2026
@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates TimerThread::TimerThreadMain in task_runner_window.cc to simplify the wait logic. It replaces the predicate lambda in cv_.wait_until with a direct call, followed by an explicit check to continue the loop if the current time is before next_fire_time_. There are no review comments, and I have no feedback to provide.

@knopp
knopp requested a review from loic-sharma September 22, 2026 20:53
@github-actions github-actions Bot added engine flutter/engine related. See also e: labels. platform-windows Building on or for Windows specifically a: desktop Running on desktop team-windows Owned by the Windows platform team labels Sep 22, 2026

@loic-sharma loic-sharma left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@loic-sharma
loic-sharma requested a review from mattkae September 22, 2026 22:42
@knopp
knopp force-pushed the fix_timer_thread_wake_up branch from 76272c8 to ca62856 Compare September 23, 2026 10:07
@knopp
knopp enabled auto-merge September 23, 2026 12:01
@knopp knopp added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 23, 2026
@knopp
knopp added this pull request to the merge queue Sep 23, 2026
Merged via the queue into flutter:master with commit f263dec Sep 23, 2026
22 of 23 checks passed
@knopp
knopp deleted the fix_timer_thread_wake_up branch September 23, 2026 13:19
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 23, 2026
@knopp knopp added the cp: stable cherry pick this pull request to stable release candidate branch label Sep 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: desktop Running on desktop CICD Run CI/CD cp: stable cherry pick this pull request to stable release candidate branch engine flutter/engine related. See also e: labels. platform-windows Building on or for Windows specifically team-windows Owned by the Windows platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants