mirror of
https://github.com/jiangcuo/nix.git
synced 2026-01-14 03:44:56 +00:00
* Relax lifetime requirements for FdSet::{insert, remove, contains}
Fixes #2130
* Take BorrowedFd as the argument for FdSet::{insert, remove, contains}
&AsFd doesn't work because there are 'static types, like std::fs::File,
which implement AsFd.
* fix changelog & remove unused entries
* fix wrong PR number
---------
Co-authored-by: Steve Lau <stevelauc@outlook.com>
79 lines
1.8 KiB
Rust
79 lines
1.8 KiB
Rust
use nix::sys::select::*;
|
|
use nix::sys::signal::SigSet;
|
|
use nix::sys::time::{TimeSpec, TimeValLike};
|
|
use nix::unistd::{pipe, write};
|
|
use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd};
|
|
|
|
#[test]
|
|
pub fn test_pselect() {
|
|
let _mtx = crate::SIGNAL_MTX.lock();
|
|
|
|
let (r1, w1) = pipe().unwrap();
|
|
write(&w1, b"hi!").unwrap();
|
|
let (r2, _w2) = pipe().unwrap();
|
|
|
|
let mut fd_set = FdSet::new();
|
|
fd_set.insert(r1.as_fd());
|
|
fd_set.insert(r2.as_fd());
|
|
|
|
let timeout = TimeSpec::seconds(10);
|
|
let sigmask = SigSet::empty();
|
|
assert_eq!(
|
|
1,
|
|
pselect(None, &mut fd_set, None, None, &timeout, &sigmask).unwrap()
|
|
);
|
|
assert!(fd_set.contains(r1.as_fd()));
|
|
assert!(!fd_set.contains(r2.as_fd()));
|
|
}
|
|
|
|
#[test]
|
|
pub fn test_pselect_nfds2() {
|
|
let (r1, w1) = pipe().unwrap();
|
|
write(&w1, b"hi!").unwrap();
|
|
let (r2, _w2) = pipe().unwrap();
|
|
|
|
let mut fd_set = FdSet::new();
|
|
fd_set.insert(r1.as_fd());
|
|
fd_set.insert(r2.as_fd());
|
|
|
|
let timeout = TimeSpec::seconds(10);
|
|
assert_eq!(
|
|
1,
|
|
pselect(
|
|
std::cmp::max(r1.as_raw_fd(), r2.as_raw_fd()) + 1,
|
|
&mut fd_set,
|
|
None,
|
|
None,
|
|
&timeout,
|
|
None
|
|
)
|
|
.unwrap()
|
|
);
|
|
assert!(fd_set.contains(r1.as_fd()));
|
|
assert!(!fd_set.contains(r2.as_fd()));
|
|
}
|
|
|
|
macro_rules! generate_fdset_bad_fd_tests {
|
|
($fd:expr, $($method:ident),* $(,)?) => {
|
|
$(
|
|
#[test]
|
|
#[should_panic]
|
|
fn $method() {
|
|
let bad_fd = unsafe{BorrowedFd::borrow_raw($fd)};
|
|
FdSet::new().$method(bad_fd);
|
|
}
|
|
)*
|
|
}
|
|
}
|
|
|
|
mod test_fdset_too_large_fd {
|
|
use super::*;
|
|
use std::convert::TryInto;
|
|
generate_fdset_bad_fd_tests!(
|
|
FD_SETSIZE.try_into().unwrap(),
|
|
insert,
|
|
remove,
|
|
contains,
|
|
);
|
|
}
|