| author |  Bas van den Berg <BarabasGitHub@users.noreply.github.com> 2020-09-10 20:20:27+02:00 |
| committer | Bas van den Berg <BarabasGitHub@users.noreply.github.com> 2020-09-10 20:20:27+02:00 |
| log | 127fa8009011e19d552ffdd834c6a607498f1c1e |
| tree | cd3895e82a0fd773358faf9f0c45ec38cfd51581 |
| parent | f5b9e445aa9d2b344b87d4868f9fbb8021577f55 |
implement poll for windows with WSAPoll (only available on vista and higher)
4 files changed, 68 insertions(+), 7 deletions(-)
lib- std
- os.zig
- os
- bits
- windows.zig
- windows
lib/std/os.zig+25-7
| ... | ... | @@ -5208,6 +5208,9 @@ pub fn copy_file_range(fd_in: fd_t, off_in: u64, fd_out: fd_t, off_out: u64, len |
| 5208 | 5208 | } |
| 5209 | 5209 | |
| 5210 | 5210 | pub const PollError = error{ |
| 5211 | /// The network subsystem has failed. | |
| 5212 | NetworkSubsystemFailed, | |
| 5213 | ||
| 5211 | 5214 | /// The kernel had no space to allocate file descriptor tables. |
| 5212 | 5215 | SystemResources, |
| 5213 | 5216 | } || UnexpectedError; |
| ... | ... | @@ -5215,14 +5218,29 @@ pub const PollError = error{ |
| 5215 | 5218 | pub fn poll(fds: []pollfd, timeout: i32) PollError!usize { |
| 5216 | 5219 | while (true) { |
| 5217 | 5220 | const rc = system.poll(fds.ptr, fds.len, timeout); |
| 5218 | switch (errno(rc)) { | |
| 5219 | 0 => return @intCast(usize, rc), | |
| 5220 | EFAULT => unreachable, | |
| 5221 | EINTR => continue, | |
| 5222 | EINVAL => unreachable, | |
| 5223 | ENOMEM => return error.SystemResources, | |
| 5224 | else => |err| return unexpectedErrno(err), | |
| 5221 | if (builtin.os.tag == .windows) { | |
| 5222 | if (rc == windows.ws2_32.SOCKET_ERROR) { | |
| 5223 | switch (windows.ws2_32.WSAGetLastError()) { | |
| 5224 | .WSANOTINITIALISED => unreachable, | |
| 5225 | .WSAENETDOWN => return error.NetworkSubsystemFailed, | |
| 5226 | .WSAENOBUFS => return error.SystemResources, | |
| 5227 | // TODO: handle more errors | |
| 5228 | else => |err| return windows.unexpectedWSAError(err), | |
| 5229 | } | |
| 5230 | } else { | |
| 5231 | return @intCast(usize, rc); | |
| 5232 | } | |
| 5233 | } else { | |
| 5234 | switch (errno(rc)) { | |
| 5235 | 0 => return @intCast(usize, rc), | |
| 5236 | EFAULT => unreachable, | |
| 5237 | EINTR => continue, | |
| 5238 | EINVAL => unreachable, | |
| 5239 | ENOMEM => return error.SystemResources, | |
| 5240 | else => |err| return unexpectedErrno(err), | |
| 5241 | } | |
| 5225 | 5242 | } |
| 5243 | unreachable; | |
| 5226 | 5244 | } |
| 5227 | 5245 | } |
| 5228 | 5246 |
lib/std/os/bits/windows.zig+13
| ... | ... | @@ -243,6 +243,19 @@ pub const IPPROTO_UDP = ws2_32.IPPROTO_UDP; |
| 243 | 243 | pub const IPPROTO_ICMPV6 = ws2_32.IPPROTO_ICMPV6; |
| 244 | 244 | pub const IPPROTO_RM = ws2_32.IPPROTO_RM; |
| 245 | 245 | |
| 246 | pub const pollfd = ws2_32.pollfd; | |
| 247 | ||
| 248 | pub const POLLRDNORM = ws2_32.POLLRDNORM; | |
| 249 | pub const POLLRDBAND = ws2_32.POLLRDBAND; | |
| 250 | pub const POLLIN = ws2_32.POLLIN; | |
| 251 | pub const POLLPRI = ws2_32.POLLPRI; | |
| 252 | pub const POLLWRNORM = ws2_32.POLLWRNORM; | |
| 253 | pub const POLLOUT = ws2_32.POLLOUT; | |
| 254 | pub const POLLWRBAND = ws2_32.POLLWRBAND; | |
| 255 | pub const POLLERR = ws2_32.POLLERR; | |
| 256 | pub const POLLHUP = ws2_32.POLLHUP; | |
| 257 | pub const POLLNVAL = ws2_32.POLLNVAL; | |
| 258 | ||
| 246 | 259 | pub const O_RDONLY = 0o0; |
| 247 | 260 | pub const O_WRONLY = 0o1; |
| 248 | 261 | pub const O_RDWR = 0o2; |
lib/std/os/windows.zig+4
| ... | ... | @@ -1201,6 +1201,10 @@ pub fn recvfrom(s: ws2_32.SOCKET, buf: [*]u8, len: usize, flags: u32, from: ?*ws |
| 1201 | 1201 | } |
| 1202 | 1202 | } |
| 1203 | 1203 | |
| 1204 | pub fn poll(fds: [*]ws2_32.pollfd, n: usize, timeout: i32) i32 { | |
| 1205 | return ws2_32.WSAPoll(fds, @intCast(u32, n), timeout); | |
| 1206 | } | |
| 1207 | ||
| 1204 | 1208 | pub fn WSAIoctl( |
| 1205 | 1209 | s: ws2_32.SOCKET, |
| 1206 | 1210 | dwIoControlCode: DWORD, |
lib/std/os/windows/ws2_32.zig+26
| ... | ... | @@ -234,6 +234,27 @@ pub const WSAMSG = extern struct { |
| 234 | 234 | dwFlags: DWORD, |
| 235 | 235 | }; |
| 236 | 236 | |
| 237 | pub const pollfd = extern struct { | |
| 238 | fd: SOCKET, | |
| 239 | events: SHORT, | |
| 240 | revents: SHORT, | |
| 241 | }; | |
| 242 | ||
| 243 | // Event flag definitions for WSAPoll(). | |
| 244 | ||
| 245 | pub const POLLRDNORM = 0x0100; | |
| 246 | pub const POLLRDBAND = 0x0200; | |
| 247 | pub const POLLIN = (POLLRDNORM | POLLRDBAND); | |
| 248 | pub const POLLPRI = 0x0400; | |
| 249 | ||
| 250 | pub const POLLWRNORM = 0x0010; | |
| 251 | pub const POLLOUT = (POLLWRNORM); | |
| 252 | pub const POLLWRBAND = 0x0020; | |
| 253 | ||
| 254 | pub const POLLERR = 0x0001; | |
| 255 | pub const POLLHUP = 0x0002; | |
| 256 | pub const POLLNVAL = 0x0004; | |
| 257 | ||
| 237 | 258 | // https://docs.microsoft.com/en-au/windows/win32/winsock/windows-sockets-error-codes-2 |
| 238 | 259 | pub const WinsockError = extern enum(u16) { |
| 239 | 260 | /// Specified event object handle is invalid. |
| ... | ... | @@ -790,6 +811,11 @@ pub extern "ws2_32" fn WSASendTo( |
| 790 | 811 | lpOverlapped: ?*WSAOVERLAPPED, |
| 791 | 812 | lpCompletionRoutine: ?WSAOVERLAPPED_COMPLETION_ROUTINE, |
| 792 | 813 | ) callconv(.Stdcall) c_int; |
| 814 | pub extern "ws2_32" fn WSAPoll( | |
| 815 | fdArray: [*]pollfd, | |
| 816 | fds: c_ulong, | |
| 817 | timeout: c_int, | |
| 818 | ) callconv(.Stdcall) c_int; | |
| 793 | 819 | pub extern "ws2_32" fn getaddrinfo( |
| 794 | 820 | pNodeName: [*:0]const u8, |
| 795 | 821 | pServiceName: [*:0]const u8, |