WIP use byte slice instead of IoVec

Author: kamalmarhubi

src/sys/uio.rs

@@ -2,24 +2,18 @@
 #![allow(improper_ctypes)]
 
 use {Errno, Result};
-use libc::{c_int, c_void, size_t, off_t};
+use libc::{self, c_int, c_void, size_t, off_t};
 use std::marker::PhantomData;
 use std::os::unix::io::RawFd;
 
 mod ffi {
-    use super::IoVec;
-    use libc::{ssize_t, c_int, size_t, off_t, c_void};
+    //use super::IoVec;
+    use libc::{ssize_t, size_t, off_t, c_void};
     use std::os::unix::io::RawFd;
 
-    extern {
-        // vectorized version of write
-        // doc: http://man7.org/linux/man-pages/man2/writev.2.html
-        pub fn writev(fd: RawFd, iov: *const IoVec<&[u8]>, iovcnt: c_int) -> ssize_t;
-
-        // vectorized version of read
-        // doc: http://man7.org/linux/man-pages/man2/readv.2.html
-        pub fn readv(fd: RawFd, iov: *const IoVec<&mut [u8]>, iovcnt: c_int) -> ssize_t;
+    pub use libc::{readv, writev};
 
+    extern {
         // vectorized write at a specified offset
         // doc: http://man7.org/linux/man-pages/man2/pwritev.2.html
         #[cfg(feature = "preadv_pwritev")]
@@ -44,14 +38,14 @@ mod ffi {
     }
 }
 
-pub fn writev(fd: RawFd, iov: &[IoVec<&[u8]>]) -> Result<usize> {
-    let res = unsafe { ffi::writev(fd, iov.as_ptr(), iov.len() as c_int) };
+pub fn writev(fd: RawFd, iov: &[&[u8]]) -> Result<usize> {
+    let res = unsafe { ffi::writev(fd, iov.as_ptr() as *const libc::iovec, iov.len() as c_int) };
 
     Errno::result(res).map(|r| r as usize)
 }
 
-pub fn readv(fd: RawFd, iov: &mut [IoVec<&mut [u8]>]) -> Result<usize> {
-    let res = unsafe { ffi::readv(fd, iov.as_ptr(), iov.len() as c_int) };
+pub fn readv(fd: RawFd, iov: &mut [&mut [u8]]) -> Result<usize> {
+    let res = unsafe { ffi::readv(fd, iov.as_ptr() as *const libc::iovec, iov.len() as c_int) };
 
     Errno::result(res).map(|r| r as usize)
 }

test/sys/test_uio.rs

@@ -22,7 +22,7 @@ fn test_writev() {
         let left = to_write.len() - consumed;
         let slice_len = if left <= 64 { left } else { thread_rng().gen_range(64, cmp::min(256, left)) };
         let b = &to_write[consumed..consumed+slice_len];
-        iovecs.push(IoVec::from_slice(b));
+        iovecs.push(b);
         consumed += slice_len;
     }
     let pipe_res = pipe();
@@ -66,7 +66,7 @@ fn test_readv() {
     }
     let mut iovecs = Vec::with_capacity(storage.len());
     for v in storage.iter_mut() {
-        iovecs.push(IoVec::from_mut_slice(&mut v[..]));
+        iovecs.push(&mut v[..]);
     }
     let pipe_res = pipe();
     assert!(pipe_res.is_ok());
@@ -83,7 +83,7 @@ fn test_readv() {
     // Cccumulate data from iovecs
     let mut read_buf = Vec::with_capacity(to_write.len());
     for iovec in iovecs.iter() {
-        read_buf.extend(iovec.as_slice().iter().map(|x| x.clone()));
+        read_buf.extend(iovec.iter().map(|x| x.clone()));
     }
     // Check whether iovecs contain all written data
     assert_eq!(read_buf.len(), to_write.len());