autocommit 2022-02-22 14:17:48 CET

src/forker.rs

@@ -1,10 +1,10 @@
 mod clone3;
+mod io;
 
 use crate::async_engine::{AsyncFd, SpawnedFuture};
 use crate::forker::clone3::{fork_with_pidfd, Forked};
-use crate::utils::buffd::{BufFdIn, BufFdOut};
+use crate::utils::buffd::{BufFdError};
 use crate::utils::copyhashmap::CopyHashMap;
-use crate::utils::vec_ext::VecExt;
 use crate::{AsyncEngine, AsyncQueue, ErrorFmt, EventLoop, State, Wheel};
 use bincode::{Decode, Encode};
 use i4config::_private::bincode_ops;
@@ -16,8 +16,10 @@ use std::io::Read;
 use std::io::Write;
 use std::os::unix::ffi::OsStrExt;
 use std::rc::Rc;
+use bincode::error::{DecodeError, EncodeError};
 use thiserror::Error;
 use uapi::{c, pipe2, Fd, IntoUstr, OwnedFd, UstrPtr};
+use crate::forker::io::{IoIn, IoOut};
 
 pub struct ForkerProxy {
     pidfd: Rc<OwnedFd>,
@@ -35,6 +37,14 @@ pub enum ForkerError {
     Socketpair(#[source] std::io::Error),
     #[error("Could not fork")]
     Fork(#[source] std::io::Error),
+    #[error("Could not read the next message")]
+    ReadFailed(#[source] BufFdError),
+    #[error("Could not write the next message")]
+    WriteFailed(#[source] BufFdError),
+    #[error("Could not decode the next message")]
+    DecodeFailed(#[source] DecodeError),
+    #[error("Could not encode the next message")]
+    EncodeFailed(#[source] EncodeError),
 }
 
 impl ForkerProxy {
@@ -89,24 +99,16 @@ impl ForkerProxy {
     }
 
     async fn incoming(self: Rc<Self>, socket: AsyncFd) {
-        let mut buffd = BufFdIn::new(socket);
+        let mut io = IoIn::new(socket);
-        let mut buf = vec![];
         loop {
-            let mut len = 0usize;
+            let msg = match io.read_msg().await {
-            if let Err(e) = buffd.read_full(&mut len).await {
+                Ok(msg) => msg,
-                log::error!("Cannot read from the ol' forker: {}", ErrorFmt(e));
+                Err(e) => {
-                self.task_in.take();
+                    log::error!("Could not read from the ol' forker: {}", ErrorFmt(e));
-                return;
+                    self.task_in.take();
-            }
+                    return;
-            buf.clear();
+                }
-            buf.reserve(len);
+            };
-            let space = buf.split_at_spare_mut_ext().1;
-            buffd.read_full(&mut space[..len]).await.unwrap();
-            unsafe {
-                buf.set_len(len);
-            }
-            let (msg, _) =
-                bincode::decode_from_slice::<ForkerMessage, _>(&buf, bincode_ops()).unwrap();
             self.handle_msg(msg);
         }
     }
@@ -130,16 +132,10 @@ impl ForkerProxy {
     }
 
     async fn outgoing(self: Rc<Self>, state: Rc<State>, socket: AsyncFd) {
-        let mut buffd = BufFdOut::new(socket);
+        let mut io = IoOut::new(socket);
-        let mut buf = vec![];
-        let mut fds = vec![];
         loop {
             let msg = self.outgoing.pop().await;
-            buf.clear();
+            if let Err(e) = io.write_msg(msg).await {
-            buf.extend_from_slice(uapi::as_bytes(&0usize));
-            let len = bincode::encode_into_std_write(&msg, &mut buf, bincode_ops()).unwrap();
-            let _ = (&mut buf[..]).write_all(uapi::as_bytes(&len));
-            if let Err(e) = buffd.flush2(&buf, &mut fds).await {
                 log::error!("Could not write to the ol' forker: {}", ErrorFmt(e));
                 state.forker.set(None);
                 self.task_out.take();
@@ -220,34 +216,17 @@ impl Forker {
     }
 
     async fn outgoing(self: Rc<Self>) {
-        let mut buffd = BufFdOut::new(self.socket.clone());
+        let mut io = IoOut::new(self.socket.clone());
-        let mut buf = vec![];
-        let mut fds = vec![];
         loop {
             let msg = self.outgoing.pop().await;
-            buf.clear();
+            io.write_msg(msg).await.unwrap();
-            buf.extend_from_slice(uapi::as_bytes(&0usize));
-            let len = bincode::encode_into_std_write(&msg, &mut buf, bincode_ops()).unwrap();
-            let _ = (&mut buf[..]).write_all(uapi::as_bytes(&len));
-            buffd.flush2(&buf, &mut fds).await.unwrap();
         }
     }
 
     async fn incoming(self: Rc<Self>) {
-        let mut buffd = BufFdIn::new(self.socket.clone());
+        let mut io = IoIn::new(self.socket.clone());
-        let mut buf = vec![];
         loop {
-            let mut len = 0usize;
+            let msg = io.read_msg().await.unwrap();
-            buffd.read_full(&mut len).await.unwrap();
-            buf.clear();
-            buf.reserve(len);
-            let space = buf.split_at_spare_mut_ext().1;
-            buffd.read_full(&mut space[..len]).await.unwrap();
-            unsafe {
-                buf.set_len(len);
-            }
-            let (msg, _) =
-                bincode::decode_from_slice::<ServerMessage, _>(&buf, bincode_ops()).unwrap();
             self.handle_msg(msg);
         }
     }

src/forker/io.rs

@@ -0,0 +1,84 @@
+use std::mem;
+use std::rc::Rc;
+use bincode::{Decode, Encode};
+use bincode::error::EncodeError;
+use uapi::OwnedFd;
+use i4config::_private::bincode_ops;
+use crate::async_engine::AsyncFd;
+use crate::ForkerError;
+use crate::utils::buffd::{BufFdIn, BufFdOut};
+use crate::utils::vec_ext::VecExt;
+
+pub struct IoIn {
+    incoming: BufFdIn,
+    scratch: Vec<u8>,
+}
+
+impl IoIn {
+    pub fn new(fd: AsyncFd) -> Self {
+        Self {
+            incoming: BufFdIn::new(fd),
+            scratch: vec![]
+        }
+    }
+
+    pub fn pop_fd(&mut self) -> Option<OwnedFd> {
+        self.incoming.get_fd().ok()
+    }
+
+    pub async fn read_msg<T: Decode>(&mut self) -> Result<T, ForkerError> {
+        let mut len = 0usize;
+        if let Err(e) = self.incoming.read_full(&mut len).await {
+            return Err(ForkerError::ReadFailed(e));
+        }
+        self.scratch.clear();
+        self.scratch.reserve(len);
+        let space = self.scratch.split_at_spare_mut_ext().1;
+        if let Err(e) = self.incoming.read_full(&mut space[..len]).await {
+            return Err(ForkerError::ReadFailed(e));
+        }
+        unsafe {
+            self.scratch.set_len(len);
+        }
+        let res = bincode::decode_from_slice::<T, _>(&&self.scratch, bincode_ops());
+        match res {
+            Ok((msg, _)) => Ok(msg),
+            Err(e) => Err(ForkerError::DecodeFailed(e)),
+        }
+    }
+}
+
+pub struct IoOut {
+    outgoing: BufFdOut,
+    scratch: Vec<u8>,
+    fds: Vec<Rc<OwnedFd>>
+}
+
+impl IoOut {
+    pub fn new(fd: AsyncFd) -> Self {
+        Self {
+            outgoing: BufFdOut::new(fd),
+            scratch: vec![],
+            fds: vec![]
+        }
+    }
+
+    pub fn push_fd(&mut self, fd: Rc<OwnedFd>) {
+        self.fds.push(fd);
+    }
+
+    pub async fn write_msg<T: Encode>(&mut self, msg: T) -> Result<(), ForkerError> {
+        self.scratch.clear();
+        self.scratch.extend_from_slice(uapi::as_bytes(&0usize));
+        let res = bincode::encode_into_std_write(&msg, &mut self.scratch, bincode_ops());
+        let len = match res {
+            Ok(l) => l,
+            Err(e) => return Err(ForkerError::EncodeFailed(e)),
+        };
+        self.scratch[..mem::size_of_val(&len)].copy_from_slice(uapi::as_bytes(&len));
+        match self.outgoing.flush2(&self.scratch, &mut self.fds).await {
+            Ok(()) => Ok(()),
+            Err(e) => Err(ForkerError::WriteFailed(e)),
+        }
+    }
+}

src/main.rs

@@ -81,6 +81,7 @@ mod utils;
 mod wheel;
 mod wire;
 mod xkbcommon;
+mod xwayland;
 
 fn main() {
     env_logger::builder()

src/utils/buffd/buf_out.rs

@@ -157,7 +157,7 @@ impl BufFdOut {
         Ok(false)
     }
 
-    pub async fn flush2(&mut self, buf: &[u8], fds: &mut Vec<OwnedFd>) -> Result<(), BufFdError> {
+    pub async fn flush2(&mut self, buf: &[u8], fds: &mut Vec<Rc<OwnedFd>>) -> Result<(), BufFdError> {
         let mut read_pos = 0;
         while read_pos < buf.len() {
             if self.flush_sync2(&mut read_pos, buf, fds)? {
@@ -171,7 +171,7 @@ impl BufFdOut {
         &mut self,
         read_pos: &mut usize,
         buf: &[u8],
-        fds: &mut Vec<OwnedFd>,
+        fds: &mut Vec<Rc<OwnedFd>>,
     ) -> Result<bool, BufFdError> {
         let mut cmsg_len = 0;
         let mut fds_opt = None;