Skip to content

Start socket timeout after the sock snapshot #8791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Sep 23, 2026
Merged

Start socket timeout after the sock snapshot #8791

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1fef34
Drop racy STOP_BIT assertion from eval-breaker test
youknowone Sep 22, 2026
26731c2
Merge branch 'main' into fix/sendall-deadline-stw-test
youknowone Sep 23, 2026
aaf1809
Merge remote-tracking branch 'upstream/main' into fix/sendall-deadlin…
youknowone Sep 23, 2026
e613aef
Start socket timeout after the sock snapshot
youknowone Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions crates/stdlib/src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,23 +970,30 @@ mod _socket {
where
F: FnMut() -> io::Result<R>,
{
let deadline = self.get_timeout().ok().map(Deadline::new);
self.sock_op_timeout_err(vm, wait_kind, deadline, f)
let timeout = self.get_timeout().ok();
let mut deadline = None;
self.sock_op_timeout_err(vm, wait_kind, &mut deadline, timeout, f)
}

fn sock_op_timeout_err<F, R>(
&self,
vm: &VirtualMachine,
wait_kind: SockWaitKind,
deadline: Option<Deadline>,
deadline: &mut Option<Deadline>,
timeout: Option<Duration>,
mut f: F,
) -> Result<R, IoOrPyException>
where
F: FnMut() -> io::Result<R>,
{
loop {
if deadline.is_some() || matches!(wait_kind, SockWaitKind::Connect) {
if timeout.is_some() || matches!(wait_kind, SockWaitKind::Connect) {
let sock = self.sock_snapshot()?;
// Start the clock after the snapshot so lock/scheduling
// delay is not subtracted from a short timeout before poll.
if deadline.is_none() {
*deadline = timeout.map(Deadline::new);
}
sock_wait_deadline(&sock, wait_kind, deadline.as_ref(), vm)?;
}

Expand All @@ -999,7 +1006,7 @@ mod _socket {
Err(e) => break e,
}
};
if deadline.is_some() && err.kind() == io::ErrorKind::WouldBlock {
if timeout.is_some() && err.kind() == io::ErrorKind::WouldBlock {
continue;
}
return Err(err.into());
Expand Down Expand Up @@ -1717,15 +1724,14 @@ mod _socket {
let flags = flags.unwrap_or(0);

let timeout = self.get_timeout().ok();

let deadline = timeout.map(Deadline::new);
let mut deadline = None;

let buf = bytes.borrow_buf_unlocked(vm)?;
let buf = &*buf;
let mut buf_offset = 0;
// now we have like 3 layers of interrupt loop :)
while buf_offset < buf.len() {
self.sock_op_timeout_err(vm, SockWaitKind::Write, deadline, || {
self.sock_op_timeout_err(vm, SockWaitKind::Write, &mut deadline, timeout, || {
let subbuf = &buf[buf_offset..];
buf_offset += self.sock_snapshot()?.send_with_flags(subbuf, flags)?;
Ok(())
Expand Down
Loading