Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 13:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

FdMonitor: change_signaller to be held strongly not weakly

Browse source 
There's no reason to use Weak here, especially since we just unwrap it. There's
no reference cycles, so just share the data via Arc.
This commit is contained in:
Peter Ammon 2024-12-23 11:12:23 -08:00
parent b7ae159824
commit 244c55f9ce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fd_monitor.rs
View file

@ -4,7 +4,7 @@ use std::os::unix::prelude::*;
#[cfg(target_has_atomic = "64")] #[cfg(target_has_atomic = "64")]
use std::sync::atomic::AtomicU64; use std::sync::atomic::AtomicU64;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use std::sync::{Arc, Mutex, Weak}; use std::sync::{Arc, Mutex};
use std::time::Duration; use std::time::Duration;
use crate::common::exit_without_destructors; use crate::common::exit_without_destructors;
@ -291,7 +291,7 @@ struct BackgroundFdMonitor {
items: Vec<FdMonitorItem>, items: Vec<FdMonitorItem>,
/// Our self-signaller. When this is written to, it means there are new items pending, new items /// Our self-signaller. When this is written to, it means there are new items pending, new items
/// in the poke list, or terminate has been set. /// in the poke list, or terminate has been set.
change_signaller: Weak<FdEventSignaller>, change_signaller: Arc<FdEventSignaller>,
/// The data shared between the background thread and the `FdMonitor` instance. /// The data shared between the background thread and the `FdMonitor` instance.
data: Arc<Mutex<SharedData>>, data: Arc<Mutex<SharedData>>,
} }
@ -325,7 +325,7 @@ impl FdMonitor {
FLOG!(fd_monitor, "Thread starting"); FLOG!(fd_monitor, "Thread starting");
let background_monitor = BackgroundFdMonitor { let background_monitor = BackgroundFdMonitor {
data: Arc::clone(&self.data), data: Arc::clone(&self.data),
change_signaller: Arc::downgrade(&self.change_signaller), change_signaller: Arc::clone(&self.change_signaller),
items: Vec::new(), items: Vec::new(),
}; };
crate::threads::spawn(move || { crate::threads::spawn(move || {
@ -389,7 +389,7 @@ impl BackgroundFdMonitor {
fds.clear(); fds.clear();
// Our change_signaller is special-cased // Our change_signaller is special-cased
let change_signal_fd = self.change_signaller.upgrade().unwrap().read_fd(); let change_signal_fd = self.change_signaller.read_fd();
fds.add(change_signal_fd); fds.add(change_signal_fd);
for item in &mut self.items { for item in &mut self.items {
@ -437,7 +437,7 @@ impl BackgroundFdMonitor {
let change_signalled = fds.test(change_signal_fd); let change_signalled = fds.test(change_signal_fd);
if change_signalled || is_wait_lap { if change_signalled || is_wait_lap {
// Clear the change signaller before processing incoming changes // Clear the change signaller before processing incoming changes
self.change_signaller.upgrade().unwrap().try_consume(); self.change_signaller.try_consume();
let mut data = self.data.lock().expect("Mutex poisoned!"); let mut data = self.data.lock().expect("Mutex poisoned!");
// Move from `pending` to the end of `items` // Move from `pending` to the end of `items`