| author |  Andrew Kelley <andrew@ziglang.org> 2026-01-26 14:11:45-08:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-01-26 14:16:28-08:00 |
| log | 1b235540c1d1acdd59aee3c2a8756bc7f0fa55a3 |
| tree | 4077d095953c9a9d1f37ddab2fd7e72fab713635 |
| parent | 5eb55ba866484b7933c279006b63d8c2b1eb5856 |
Revert "Io.Threaded: remove WSA_FLAG_OVERLAPPED from socket call"
The stated reason for this commit was cancelation didn't work. On
further review, we know why cancelation didn't work, and recent
enhancements on master branch make it easy to make it work.
Meanwhile, not using overlapped means that multiple threads cannot use
the same open socket handle. I also added line comments to explain the
choice in this revert commit.
This reverts commit fd3657bf8c3a2861e1b35cf36d469d342d853880.
closes #31011
reopens #308651 files changed, 5 insertions(+), 1 deletions(-)
lib- std
lib/std/Io/Threaded.zig+5-1
| ... | ... | @@ -11025,7 +11025,11 @@ fn openSocketWsa( |
| 11025 | 11025 | ) !ws2_32.SOCKET { |
| 11026 | 11026 | const mode = posixSocketMode(options.mode); |
| 11027 | 11027 | const protocol = posixProtocol(options.protocol); |
| 11028 | const flags: u32 = ws2_32.WSA_FLAG_NO_HANDLE_INHERIT; | |
| 11028 | // WSA_FLAG_OVERLAPPED is chosen here because without this different | |
| 11029 | // threads cannot use the same open socket handle. | |
| 11030 | // TODO: the below code needs to use the AlertableSyscall mechanism instead in | |
| 11031 | // order to make cancelation work. | |
| 11032 | const flags: u32 = ws2_32.WSA_FLAG_OVERLAPPED | ws2_32.WSA_FLAG_NO_HANDLE_INHERIT; | |
| 11029 | 11033 | var syscall: Syscall = try .start(); |
| 11030 | 11034 | while (true) { |
| 11031 | 11035 | const rc = ws2_32.WSASocketW(family, @bitCast(mode), @bitCast(protocol), null, 0, flags); |