kozorizki/pve-lxc-syscalld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-10-30 14:14:51 +01:00
parent ca7f6ba03b
commit 86b8386760
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/reactor.rs
View File

@ -161,12 +161,11 @@ impl PolledFd {
let registration = reactor.register(fd.as_raw_fd())?;
Ok(Self { fd, registration })
}
}
impl PolledFd {
pub fn poll_read(&mut self, data: &mut [u8], cx: &mut Context) -> Poll<io::Result<usize>> {
let fd = self.fd.as_raw_fd();
let size = libc::size_t::try_from(data.len()).map_err(io_err_other)?;
pub fn wrap_read<T, F>(&mut self, cx: &mut Context, func: F) -> Poll<io::Result<T>>
where
F: FnOnce() -> io::Result<T>,
{
let mut read_waker = self
.registration
.inner
@ -175,8 +174,8 @@ impl PolledFd {
.read_waker
.lock()
.unwrap();
match c_result!(unsafe { libc::read(fd, data.as_mut_ptr() as *mut libc::c_void, size) }) {
Ok(got) => Poll::Ready(Ok(got as usize)),
match func() {
Ok(out) => Poll::Ready(Ok(out)),
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
*read_waker = Some(cx.waker().clone());
Poll::Pending
@ -185,13 +184,10 @@ impl PolledFd {
}
}
pub async fn read(&mut self, data: &mut [u8]) -> io::Result<usize> {
poll_fn(move |cx| self.poll_read(data, cx)).await
}
pub fn poll_write(&mut self, data: &[u8], cx: &mut Context) -> Poll<io::Result<usize>> {
let fd = self.fd.as_raw_fd();
let size = libc::size_t::try_from(data.len()).map_err(io_err_other)?;
pub fn wrap_write<T, F>(&mut self, cx: &mut Context, func: F) -> Poll<io::Result<T>>
where
F: FnOnce() -> io::Result<T>,
{
let mut write_waker = self
.registration
.inner
@ -200,8 +196,8 @@ impl PolledFd {
.write_waker
.lock()
.unwrap();
match c_result!(unsafe { libc::write(fd, data.as_ptr() as *const libc::c_void, size) }) {
Ok(got) => Poll::Ready(Ok(got as usize)),
match func() {
Ok(out) => Poll::Ready(Ok(out)),
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
*write_waker = Some(cx.waker().clone());
Poll::Pending
@ -209,6 +205,30 @@ impl PolledFd {
Err(err) => Poll::Ready(Err(err)),
}
}
}
impl PolledFd {
pub fn poll_read(&mut self, cx: &mut Context, data: &mut [u8]) -> Poll<io::Result<usize>> {
let size = libc::size_t::try_from(data.len()).map_err(io_err_other)?;
let fd = self.fd.as_raw_fd();
self.wrap_read(cx, || {
c_result!(unsafe { libc::read(fd, data.as_mut_ptr() as *mut libc::c_void, size) })
.map(|res| res as usize)
})
}
pub async fn read(&mut self, data: &mut [u8]) -> io::Result<usize> {
poll_fn(move |cx| self.poll_read(cx, data)).await
}
pub fn poll_write(&mut self, data: &[u8], cx: &mut Context) -> Poll<io::Result<usize>> {
let fd = self.fd.as_raw_fd();
let size = libc::size_t::try_from(data.len()).map_err(io_err_other)?;
self.wrap_write(cx, || {
c_result!(unsafe { libc::write(fd, data.as_ptr() as *const libc::c_void, size) })
.map(|res| res as usize)
})
}
pub async fn write(&mut self, data: &[u8]) -> io::Result<usize> {
poll_fn(move |cx| self.poll_write(data, cx)).await