Refactor socketpair tests to use utility functions for reading/writing #4770
Conversation
|
Thank you for contributing to Miri! A reviewer will take a look at your PR, typically within a week or two. |
|
@hulxv please do not submit half a dozen PRs at once. That feels like a DoS attack. |
oh sorry for that xD |
There was a problem hiding this comment.
Similar comments to the other PR. :)
That's why it's better to wait after submitting the first PR in a series -- the same comments are likely to apply many times. I will not look at your remaining PRs until we finished these first two, to avoid having to repeat the same comments.
|
|
||
| #[path = "../../utils/libc.rs"] | ||
| mod libc_utils; | ||
| use libc_utils::{errno_check, errno_result, read_all_into_array, write_all_from_slice}; |
There was a problem hiding this comment.
| use libc_utils::{errno_check, errno_result, read_all_into_array, write_all_from_slice}; | |
| use libc_utils::*; |
| 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) }; |
There was a problem hiding this comment.
Similar to #4768, this should use helpers instead of directly invoking read.
| 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) }; |
There was a problem hiding this comment.
Another place that should use a helper.
| // 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!(&buf[0..3], "123".as_bytes()); | ||
| 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) }; |
| let data = "12345".as_bytes().as_ptr(); | ||
| let res = unsafe { libc_utils::write_all(fds[1], data as *const libc::c_void, 5) }; | ||
| assert_eq!(res, 5); | ||
| let data = b"12345"; |
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.)
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
3 participants
Related to #4725