polish code

Author: loongs-zhang

monoio/src/buf/vec_wrapper.rs

@@ -244,7 +244,6 @@ impl<'t, T: IoBufMut> From<&'t mut T> for IoVecMeta {
     }
 }
 
-#[cfg(unix)]
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -256,9 +255,18 @@ mod tests {
         let meta = read_vec_meta(&iovec);
         assert_eq!(meta.len(), 60);
         assert_eq!(meta.data.len(), 3);
-        assert_eq!(meta.data[0].iov_len, 10);
-        assert_eq!(meta.data[1].iov_len, 20);
-        assert_eq!(meta.data[2].iov_len, 30);
+        #[cfg(unix)]
+        {
+            assert_eq!(meta.data[0].iov_len, 10);
+            assert_eq!(meta.data[1].iov_len, 20);
+            assert_eq!(meta.data[2].iov_len, 30);
+        }
+        #[cfg(windows)]
+        {
+            assert_eq!(meta.data[0].len, 10);
+            assert_eq!(meta.data[1].len, 20);
+            assert_eq!(meta.data[2].len, 30);
+        }
     }
 
     #[test]
@@ -267,8 +275,17 @@ mod tests {
         let meta = write_vec_meta(&mut iovec);
         assert_eq!(meta.len(), 60);
         assert_eq!(meta.data.len(), 3);
-        assert_eq!(meta.data[0].iov_len, 10);
-        assert_eq!(meta.data[1].iov_len, 20);
-        assert_eq!(meta.data[2].iov_len, 30);
+        #[cfg(unix)]
+        {
+            assert_eq!(meta.data[0].iov_len, 10);
+            assert_eq!(meta.data[1].iov_len, 20);
+            assert_eq!(meta.data[2].iov_len, 30);
+        }
+        #[cfg(windows)]
+        {
+            assert_eq!(meta.data[0].len, 10);
+            assert_eq!(meta.data[1].len, 20);
+            assert_eq!(meta.data[2].len, 30);
+        }
     }
 }

monoio/src/driver/op/read.rs

@@ -9,7 +9,7 @@ use {
     std::ffi::c_void,
     windows_sys::Win32::{
         Foundation::TRUE,
-        Networking::WinSock::{WSAGetLastError, WSARecv},
+        Networking::WinSock::{WSAGetLastError, WSARecv, WSAESHUTDOWN},
         Storage::FileSystem::{ReadFile, SetFilePointer, FILE_CURRENT, INVALID_SET_FILE_POINTER},
     },
 };
@@ -186,23 +186,28 @@ impl<T: IoVecBufMut> OpAble for ReadVec<T> {
 
     #[cfg(all(any(feature = "legacy", feature = "poll-io"), windows))]
     fn legacy_call(&mut self) -> io::Result<u32> {
-        let mut bytes_received = 0;
+        let mut nread = 0;
+        let mut flags = 0;
         let ret = unsafe {
             WSARecv(
                 self.fd.raw_socket() as _,
                 self.buf_vec.write_wsabuf_ptr(),
                 self.buf_vec.write_wsabuf_len().min(u32::MAX as usize) as _,
-                &mut bytes_received,
-                &mut 0,
+                &mut nread,
+                &mut flags,
                 std::ptr::null_mut(),
                 None,
             )
         };
         match ret {
-            0 => Ok(bytes_received),
+            0 => Ok(nread),
             _ => {
                 let error = unsafe { WSAGetLastError() };
-                Err(io::Error::from_raw_os_error(error))
+                if error == WSAESHUTDOWN {
+                    Ok(0)
+                } else {
+                    Err(io::Error::from_raw_os_error(error))
+                }
             }
         }
     }