x11-misc/neovide.neovide
1
0
Fork 0
mirror of https://github.com/neovide/neovide.git synced 2026-09-10 07:16:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix event loop CPU spin without deadline (#3503)

Browse source 
the old fallback mapped None to WaitUntil(now), which asks the
event loop to wake up immediately. during startup, if nvim blocks before
the first render state exists, that turns into a tight CPU loop.

the error-window special case was the wrong abstraction: no deadline
should mean idle wait, regardless of why there is no render deadline.

we keep WaitUntil only for real deadlines and use Wait otherwise.
This commit is contained in:
Alexsander Falcucci 2026-05-09 20:58:42 +02:00 committed by GitHub
parent fdd02c24ff
commit dfc854bd91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/window/application.rs
View file

@ -368,8 +368,8 @@ impl Application {
self.render_states.values().map(|state| self.get_event_deadline_for(state)).min()
}
fn next_control_flow(&self, now: Instant) -> ControlFlow {
next_control_flow_for(self.get_event_deadline(), !self.error_windows.is_empty(), now)
fn next_control_flow(&self) -> ControlFlow {
next_control_flow_for(self.get_event_deadline())
}
fn schedule_next_event(&mut self, event_loop: &ActiveEventLoop) {
@ -379,7 +379,7 @@ impl Application {
if self.create_window_allowed && self.window_wrapper.has_pending_window_creation() {
self.window_wrapper.try_create_window(event_loop, &self.proxy, None, None);
}
event_loop.set_control_flow(self.next_control_flow(Instant::now()));
event_loop.set_control_flow(self.next_control_flow());
}
fn handle_error_window_event(
@ -907,14 +907,9 @@ impl Drop for Application {
}
}
fn next_control_flow_for(
deadline: Option<Instant>,
has_error_windows: bool,
now: Instant,
) -> ControlFlow {
fn next_control_flow_for(deadline: Option<Instant>) -> ControlFlow {
match deadline {
Some(deadline) => ControlFlow::WaitUntil(deadline),
None if has_error_windows => ControlFlow::Wait,
None => ControlFlow::WaitUntil(now),
None => ControlFlow::Wait,
}
}