mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Delete timer state when the future that's awaiting it gets dropped

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-02 10:08:38 +01:00
parent 8b7a9367fa
commit be7a4770fb
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/gpui/src/executor.rs
View file

@ -16,7 +16,8 @@ use std::{
use crate::{ use crate::{
platform::{self, Dispatcher}, platform::{self, Dispatcher},
util, MutableAppContext, util::{self, post_inc},
MutableAppContext,
}; };
pub enum Foreground { pub enum Foreground {
@ -69,7 +70,8 @@ struct DeterministicState {
forbid_parking: bool, forbid_parking: bool,
block_on_ticks: std::ops::RangeInclusive<usize>, block_on_ticks: std::ops::RangeInclusive<usize>,
now: std::time::Instant, now: std::time::Instant,
pending_timers: Vec<(std::time::Instant, postage::barrier::Sender)>, next_timer_id: usize,
pending_timers: Vec<(usize, std::time::Instant, postage::barrier::Sender)>,
waiting_backtrace: Option<backtrace::Backtrace>, waiting_backtrace: Option<backtrace::Backtrace>,
} }
@ -99,6 +101,7 @@ impl Deterministic {
forbid_parking: false, forbid_parking: false,
block_on_ticks: 0..=1000, block_on_ticks: 0..=1000,
now: std::time::Instant::now(), now: std::time::Instant::now(),
next_timer_id: Default::default(),
pending_timers: Default::default(), pending_timers: Default::default(),
waiting_backtrace: None, waiting_backtrace: None,
})), })),
@ -426,11 +429,31 @@ impl Foreground {
use postage::prelude::Stream as _; use postage::prelude::Stream as _;
let (tx, mut rx) = postage::barrier::channel(); let (tx, mut rx) = postage::barrier::channel();
let timer_id;
{ {
let mut state = executor.state.lock(); let mut state = executor.state.lock();
let wakeup_at = state.now + duration; let wakeup_at = state.now + duration;
state.pending_timers.push((wakeup_at, tx)); timer_id = post_inc(&mut state.next_timer_id);
state.pending_timers.push((timer_id, wakeup_at, tx));
} }
struct DropTimer<'a>(usize, &'a Foreground);
impl<'a> Drop for DropTimer<'a> {
fn drop(&mut self) {
match self.1 {
Foreground::Deterministic { executor, .. } => {
executor
.state
.lock()
.pending_timers
.retain(|(timer_id, _, _)| *timer_id != self.0);
}
_ => unreachable!(),
}
}
}
let _guard = DropTimer(timer_id, self);
rx.recv().await; rx.recv().await;
} }
_ => { _ => {
@ -451,7 +474,7 @@ impl Foreground {
let mut pending_timers = mem::take(&mut state.pending_timers); let mut pending_timers = mem::take(&mut state.pending_timers);
drop(state); drop(state);
pending_timers.retain(|(wakeup, _)| *wakeup > now); pending_timers.retain(|(_, wakeup, _)| *wakeup > now);
executor.state.lock().pending_timers.extend(pending_timers); executor.state.lock().pending_timers.extend(pending_timers);
} }
_ => panic!("this method can only be called on a deterministic executor"), _ => panic!("this method can only be called on a deterministic executor"),