Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-31 21:47:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5053 from WhySoBad/network-socket-test-fill-buffer-windows

Browse Source 
Fix skipping TCP write buffer filling on Windows hosts
This commit is contained in:
Ralf Jung
2026-05-24 20:08:22 +00:00
committed by GitHub
parent 102df46fb3 d4406dde64
commit c1f7fa1a48
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/miri/tests/pass-dep/libc/libc-socket-no-blocking.rs
+30 -30
View File
@@ -339,23 +339,23 @@ fn test_send_recv_nonblock() {
.unwrap()
};
if !cfg!(windows_host) {
// Keep sending data until the buffer is full and we block.
// We cannot test this on Windows since there apparently the send buffer
// never fills up, at least for localhost connections.
let fill_buf = [1u8; 5_000_000];
// This fills the socket receive buffer and thus should start blocking.
let err = unsafe {
let fill_buf = [1u8; 32_000];
// Keep sending data until the buffer is full and we would block.
loop {
let result = unsafe {
libc_utils::write_all_generic(
fill_buf.as_ptr().cast(),
fill_buf.len(),
libc_utils::NoRetry,
|buf, count| libc::send(client_sockfd, buf, count, 0),
)
.unwrap_err()
};
assert_eq!(err.kind(), ErrorKind::WouldBlock)
match result {
Ok(_) => { /* continue to fill buffer */ }
Err(err) if err.kind() == ErrorKind::WouldBlock => break,
Err(err) => panic!("unexpected error whilst filling up buffer: {err}"),
}
}
server_thread.join().unwrap();
@@ -455,23 +455,23 @@ fn test_send_recv_dontwait() {
.unwrap()
};
if !cfg!(windows_host) {
// Keep sending data until the buffer is full and we block.
// We cannot test this on Windows since there apparently the send buffer
// never fills up, at least for localhost connections.
let fill_buf = [1u8; 5_000_000];
// This fills the socket receive buffer and thus should start blocking.
let err = unsafe {
let fill_buf = [1u8; 32_000];
// Keep sending data until the buffer is full and we would block.
loop {
let result = unsafe {
libc_utils::write_all_generic(
fill_buf.as_ptr().cast(),
fill_buf.len(),
libc_utils::NoRetry,
|buf, count| libc::send(client_sockfd, buf, count, libc::MSG_DONTWAIT),
)
.unwrap_err()
};
assert_eq!(err.kind(), ErrorKind::WouldBlock)
match result {
Ok(_) => { /* continue to fill buffer */ }
Err(err) if err.kind() == ErrorKind::WouldBlock => break,
Err(err) => panic!("unexpected error whilst filling up buffer: {err}"),
}
}
server_thread.join().unwrap();
@@ -542,23 +542,23 @@ fn test_write_read_nonblock() {
// Writing into the empty buffer should succeed without blocking.
libc_utils::write_all(client_sockfd, TEST_BYTES).unwrap();
if !cfg!(windows_host) {
// Keep sending data until the buffer is full and we block.
// We cannot test this on Windows since there apparently the send buffer
// never fills up, at least for localhost connections.
let fill_buf = [1u8; 5_000_000];
// This fills the socket receive buffer and thus should start blocking.
let err = unsafe {
let fill_buf = [1u8; 32_000];
// Keep sending data until the buffer is full and we would block.
loop {
let result = unsafe {
libc_utils::write_all_generic(
fill_buf.as_ptr().cast(),
fill_buf.len(),
libc_utils::NoRetry,
|buf, count| libc::write(client_sockfd, buf, count),
)
.unwrap_err()
};
assert_eq!(err.kind(), ErrorKind::WouldBlock)
match result {
Ok(_) => { /* continue to fill buffer */ }
Err(err) if err.kind() == ErrorKind::WouldBlock => break,
Err(err) => panic!("unexpected error whilst filling up buffer: {err}"),
}
}
server_thread.join().unwrap();