wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

avoid accidentally blocking on the pollable channel

Browse Source 
make sure the socketpair is nonblocking (note: this only works
on unix at this time)

refs: https://github.com/wez/wezterm/issues/116
This commit is contained in:
Wez Furlong 2020-01-12 14:25:59 -08:00
parent 22884a2e81
commit 367a44fb96
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/pollable.rs
View File

@ -70,10 +70,13 @@ pub struct PollableReceiver<T> {
impl<T> PollableReceiver<T> {
pub fn try_recv(&self) -> Result<T, TryRecvError> {
let item = self.receiver.try_recv()?;
let mut byte = [0u8];
// try to drain the pipe.
// We do this regardless of whether we popped an item
// so that we avoid being in a perpetually signalled state.
let mut byte = [0u8; 64];
self.read.borrow_mut().read(&mut byte).ok();
Ok(item)
Ok(self.receiver.try_recv()?)
}
}
@ -91,6 +94,14 @@ impl<T> AsPollFd for PollableReceiver<T> {
pub fn pollable_channel<T>() -> anyhow::Result<(PollableSender<T>, PollableReceiver<T>)> {
let (sender, receiver) = channel();
let (write, read) = socketpair()?;
#[cfg(unix)]
unsafe {
let on = 1;
libc::ioctl(write.as_raw_file_descriptor(), libc::FIONBIO, &on);
libc::ioctl(read.as_raw_file_descriptor(), libc::FIONBIO, &on);
}
Ok((
PollableSender {
sender,