Refactor socketpair tests to use utility functions for reading/writing #4770
+52
−103
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ use std::thread; | |
|
|
||
| #[path = "../../utils/libc.rs"] | ||
| mod libc_utils; | ||
| use libc_utils::{errno_check, errno_result, read_all_into_array, write_all_from_slice}; | ||
|
|
||
| fn main() { | ||
| test_socketpair(); | ||
|
|
@@ -21,23 +22,17 @@ fn main() { | |
|
|
||
| fn test_socketpair() { | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
|
|
||
| // Read size == data available in buffer. | ||
| let data = b"abcde"; | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| let buf = read_all_into_array::<5>(fds[1]).unwrap(); | ||
| assert_eq!(&buf, data); | ||
|
|
||
| // Read size > data available in buffer. | ||
| let data = b"abc"; | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| let mut buf2: [u8; 5] = [0; 5]; | ||
| let res = unsafe { libc::read(fds[1], buf2.as_mut_ptr().cast(), buf2.len() as libc::size_t) }; | ||
|
Member
There was a problem hiding this comment. Similar to #4768, this should use helpers instead of directly invoking |
||
| assert!(res > 0 && res <= 3); | ||
|
|
@@ -51,20 +46,14 @@ fn test_socketpair() { | |
|
|
||
| // Test read and write from another direction. | ||
| // Read size == data available in buffer. | ||
| let data = b"12345"; | ||
| write_all_from_slice(fds[1], data).unwrap(); | ||
| let buf3 = read_all_into_array::<5>(fds[0]).unwrap(); | ||
| assert_eq!(&buf3, data); | ||
|
|
||
| // Read size > data available in buffer. | ||
| let data = b"123"; | ||
| write_all_from_slice(fds[1], data).unwrap(); | ||
| let mut buf4: [u8; 5] = [0; 5]; | ||
| let res = unsafe { libc::read(fds[0], buf4.as_mut_ptr().cast(), buf4.len() as libc::size_t) }; | ||
|
Member
There was a problem hiding this comment. Another place that should use a helper. |
||
| assert!(res > 0 && res <= 3); | ||
|
|
@@ -77,15 +66,14 @@ fn test_socketpair() { | |
| } | ||
|
|
||
| // Test when happens when we close one end, with some data in the buffer. | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| errno_check(unsafe { libc::close(fds[0]) }); | ||
| // Reading the other end should return that data, then EOF. | ||
| let mut buf: [u8; 5] = [0; 5]; | ||
| let res = | ||
| unsafe { libc_utils::read_all(fds[1], buf.as_mut_ptr().cast(), buf.len() as libc::size_t) }; | ||
|
|
||
| assert_eq!(res, 3); | ||
| assert_eq!(&buf[0..3], b"123"); | ||
| let res = | ||
| unsafe { libc_utils::read_all(fds[1], buf.as_mut_ptr().cast(), buf.len() as libc::size_t) }; | ||
|
|
||
| assert_eq!(res, 0); // 0-sized read: EOF. | ||
|
|
@@ -97,86 +85,60 @@ fn test_socketpair() { | |
|
|
||
| fn test_socketpair_threaded() { | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
|
|
||
| let thread1 = thread::spawn(move || { | ||
| let buf = read_all_into_array::<5>(fds[1]).unwrap(); | ||
| assert_eq!(&buf, b"abcde"); | ||
| }); | ||
| thread::yield_now(); | ||
| let data = b"abcde"; | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| thread1.join().unwrap(); | ||
|
|
||
| // Read and write from different direction | ||
| let thread2 = thread::spawn(move || { | ||
| thread::yield_now(); | ||
| let data = b"12345"; | ||
|
Member
There was a problem hiding this comment. This variable seems to be used only once, please inline it. (Same everywhere else in this PR, and in your other PRs as well.) |
||
| write_all_from_slice(fds[1], data).unwrap(); | ||
| }); | ||
| let buf = read_all_into_array::<5>(fds[0]).unwrap(); | ||
| assert_eq!(&buf, b"12345"); | ||
| thread2.join().unwrap(); | ||
| } | ||
|
|
||
| fn test_race() { | ||
| static mut VAL: u8 = 0; | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
| let thread1 = thread::spawn(move || { | ||
| // write() from the main thread will occur before the read() here | ||
| // because preemption is disabled and the main thread yields after write(). | ||
| let buf = read_all_into_array::<1>(fds[1]).unwrap(); | ||
| assert_eq!(&buf, b"a"); | ||
| // The read above establishes a happens-before so it is now safe to access this global variable. | ||
| unsafe { assert_eq!(VAL, 1) }; | ||
| }); | ||
| unsafe { VAL = 1 }; | ||
| let data = b"a"; | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| thread::yield_now(); | ||
| thread1.join().unwrap(); | ||
| } | ||
|
|
||
| // Test the behaviour of a socketpair getting blocked on read and subsequently unblocked. | ||
| fn test_blocking_read() { | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
| let thread1 = thread::spawn(move || { | ||
| // Let this thread block on read. | ||
| let buf = read_all_into_array::<3>(fds[1]).unwrap(); | ||
| assert_eq!(&buf, b"abc"); | ||
| }); | ||
| let thread2 = thread::spawn(move || { | ||
| // Unblock thread1 by doing writing something. | ||
| let data = b"abc"; | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| }); | ||
| thread1.join().unwrap(); | ||
| thread2.join().unwrap(); | ||
|
|
@@ -185,26 +147,18 @@ fn test_blocking_read() { | |
| // Test the behaviour of a socketpair getting blocked on write and subsequently unblocked. | ||
| fn test_blocking_write() { | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
| let arr1: [u8; 0x34000] = [1; 0x34000]; | ||
| // Exhaust the space in the buffer so the subsequent write will block. | ||
| write_all_from_slice(fds[0], &arr1).unwrap(); | ||
| let thread1 = thread::spawn(move || { | ||
| let data = b"abc"; | ||
| // The write below will be blocked because the buffer is already full. | ||
| write_all_from_slice(fds[0], data).unwrap(); | ||
| }); | ||
| let thread2 = thread::spawn(move || { | ||
| // Unblock thread1 by freeing up some space. | ||
| let buf = read_all_into_array::<3>(fds[1]).unwrap(); | ||
| assert_eq!(buf, [1, 1, 1]); | ||
| }); | ||
| thread1.join().unwrap(); | ||
|
|
@@ -215,30 +169,25 @@ fn test_blocking_write() { | |
| fn test_socketpair_setfl_getfl() { | ||
| // Initialise socketpair fds. | ||
| let mut fds = [-1, -1]; | ||
| errno_check(unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }); | ||
|
|
||
| // Test if both sides have O_RDWR. | ||
| assert_eq!(errno_result(unsafe { libc::fcntl(fds[0], libc::F_GETFL) }).unwrap(), libc::O_RDWR); | ||
| assert_eq!(errno_result(unsafe { libc::fcntl(fds[1], libc::F_GETFL) }).unwrap(), libc::O_RDWR); | ||
|
|
||
| // Add the O_NONBLOCK flag with F_SETFL. | ||
| errno_check(unsafe { libc::fcntl(fds[0], libc::F_SETFL, libc::O_NONBLOCK) }); | ||
|
|
||
| // Test if the O_NONBLOCK flag is successfully added. | ||
| assert_eq!( | ||
| errno_result(unsafe { libc::fcntl(fds[0], libc::F_GETFL) }).unwrap(), | ||
| libc::O_RDWR | libc::O_NONBLOCK | ||
| ); | ||
|
|
||
| // The other side remains unchanged. | ||
| assert_eq!(errno_result(unsafe { libc::fcntl(fds[1], libc::F_GETFL) }).unwrap(), libc::O_RDWR); | ||
|
|
||
| // Test if O_NONBLOCK flag can be unset. | ||
| errno_check(unsafe { libc::fcntl(fds[0], libc::F_SETFL, 0) }); | ||
| assert_eq!(errno_result(unsafe { libc::fcntl(fds[0], libc::F_GETFL) }).unwrap(), libc::O_RDWR); | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.