Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

scheduler: Fix scheduler retention cycle (#57789)

Lukas Wirthf839f8e1083c
diff --git a/crates/scheduler/src/executor.rs b/crates/scheduler/src/executor.rs
index 46dd4b54ba1..2a678ec3b25 100644
--- a/crates/scheduler/src/executor.rs
+++ b/crates/scheduler/src/executor.rs
@@ -43,12 +43,14 @@ impl ForegroundExecutor {
F::Output: 'static,
{
let session_id = self.session_id;
- let scheduler = Arc::clone(&self.scheduler);
+ let scheduler = Arc::downgrade(&self.scheduler);
let location = Location::caller();
let (runnable, task) = spawn_local_with_source_location(
future,
move |runnable| {
- scheduler.schedule_foreground(session_id, runnable);
+ if let Some(scheduler) = scheduler.upgrade() {
+ scheduler.schedule_foreground(session_id, runnable);
+ }
},
RunnableMeta { location },
);
@@ -135,14 +137,16 @@ impl BackgroundExecutor {
F: Future + Send + 'static,
F::Output: Send + 'static,
{
- let scheduler = Arc::clone(&self.scheduler);
+ let scheduler = Arc::downgrade(&self.scheduler);
let location = Location::caller();
let (runnable, task) = async_task::Builder::new()
.metadata(RunnableMeta { location })
.spawn(
move |_| future,
move |runnable| {
- scheduler.schedule_background_with_priority(runnable, priority);
+ if let Some(scheduler) = scheduler.upgrade() {
+ scheduler.schedule_background_with_priority(runnable, priority);
+ }
},
);
runnable.schedule();
diff --git a/crates/scheduler/src/tests.rs b/crates/scheduler/src/tests.rs
index 3b294e6ee2e..8c6bc2bef41 100644
--- a/crates/scheduler/src/tests.rs
+++ b/crates/scheduler/src/tests.rs
@@ -34,6 +34,44 @@ fn test_background_executor_spawn() {
});
}
+#[test]
+fn test_scheduler_drops_with_stalled_detached_foreground_task() {
+ let scheduler = Arc::new(TestScheduler::new(TestSchedulerConfig::default()));
+ let weak_scheduler = Arc::downgrade(&scheduler);
+ let (sender, receiver) = oneshot::channel::<()>();
+
+ scheduler
+ .foreground()
+ .spawn(async move {
+ receiver.await.ok();
+ })
+ .detach();
+ scheduler.run();
+
+ drop(scheduler);
+ assert!(weak_scheduler.upgrade().is_none());
+ drop(sender);
+}
+
+#[test]
+fn test_scheduler_drops_with_stalled_detached_background_task() {
+ let scheduler = Arc::new(TestScheduler::new(TestSchedulerConfig::default()));
+ let weak_scheduler = Arc::downgrade(&scheduler);
+ let (sender, receiver) = oneshot::channel::<()>();
+
+ scheduler
+ .background()
+ .spawn(async move {
+ receiver.await.ok();
+ })
+ .detach();
+ scheduler.run();
+
+ drop(scheduler);
+ assert!(weak_scheduler.upgrade().is_none());
+ drop(sender);
+}
+
#[test]
fn test_foreground_ordering() {
let mut traces = HashSet::new();