mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-31 23:10:27 +00:00
Improve synchronization
- Fix bugs in kDos2Errno definition - malloc() should now be thread safe - Fix bug in rollup.com header generator - Fix open(O_APPEND) on the New Technology - Fix select() on the New Technology and test it - Work towards refactoring i/o for thread safety - Socket reads and writes on NT now poll for signals - Work towards i/o completion ports on the New Technology - Make read() and write() intermittently check for signals - Blinkenlights keyboard i/o so much better on NT w/ poll() - You can now poll() files and sockets at the same time on NT - Fix bug in appendr() that manifests with dlmalloc footers off
This commit is contained in:
parent
233144b19d
commit
933411ba99
266 changed files with 8761 additions and 4344 deletions
|
@ -1,5 +1,5 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8
|
||||
-*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2020 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
|
@ -16,13 +16,17 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/assert.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/sig.internal.h"
|
||||
#include "libc/calls/strace.internal.h"
|
||||
#include "libc/nt/enum/wait.h"
|
||||
#include "libc/nt/errors.h"
|
||||
#include "libc/nt/struct/overlapped.h"
|
||||
#include "libc/nt/winsock.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/yoink.inc"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
/**
|
||||
* Performs recv(), recvfrom(), or readv() on Windows NT.
|
||||
* Performs datagram receive on New Technology.
|
||||
*
|
||||
* @param fd must be a socket
|
||||
* @return number of bytes received, or -1 w/ errno
|
||||
|
@ -31,14 +35,53 @@ textwindows ssize_t sys_recvfrom_nt(struct Fd *fd, const struct iovec *iov,
|
|||
size_t iovlen, uint32_t flags,
|
||||
void *opt_out_srcaddr,
|
||||
uint32_t *opt_inout_srcaddrsize) {
|
||||
uint32_t got;
|
||||
ssize_t rc;
|
||||
uint32_t i, got = 0;
|
||||
struct NtIovec iovnt[16];
|
||||
got = 0;
|
||||
if (WSARecvFrom(fd->handle, iovnt, __iovec2nt(iovnt, iov, iovlen), &got,
|
||||
&flags, opt_out_srcaddr, opt_inout_srcaddrsize, NULL,
|
||||
NULL) != -1) {
|
||||
return got;
|
||||
} else {
|
||||
return __winsockerr();
|
||||
struct NtOverlapped overlapped = {.hEvent = WSACreateEvent()};
|
||||
|
||||
if (_check_interrupts(true, g_fds.p)) return eintr();
|
||||
|
||||
if (!WSARecvFrom(fd->handle, iovnt, __iovec2nt(iovnt, iov, iovlen), &got,
|
||||
&flags, opt_out_srcaddr, opt_inout_srcaddrsize, &overlapped,
|
||||
NULL)) {
|
||||
rc = got;
|
||||
goto Finished;
|
||||
}
|
||||
|
||||
if (WSAGetLastError() != kNtErrorIoPending) {
|
||||
STRACE("WSARecvFrom failed %lm");
|
||||
rc = __winsockerr();
|
||||
goto Finished;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
i = WSAWaitForMultipleEvents(1, &overlapped.hEvent, true,
|
||||
__SIG_POLLING_INTERVAL_MS, true);
|
||||
if (i == kNtWaitFailed) {
|
||||
STRACE("WSAWaitForMultipleEvents failed %lm");
|
||||
rc = __winsockerr();
|
||||
goto Finished;
|
||||
} else if (i == kNtWaitTimeout) {
|
||||
if (_check_interrupts(true, g_fds.p)) {
|
||||
rc = eintr();
|
||||
goto Finished;
|
||||
}
|
||||
} else if (i == kNtWaitIoCompletion) {
|
||||
STRACE("IOCP TRIGGERED EINTR");
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!WSAGetOverlappedResult(fd->handle, &overlapped, &got, false, &flags)) {
|
||||
STRACE("WSAGetOverlappedResult failed %lm");
|
||||
rc = __winsockerr();
|
||||
goto Finished;
|
||||
}
|
||||
|
||||
rc = got;
|
||||
Finished:
|
||||
WSACloseEvent(overlapped.hEvent);
|
||||
return rc;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue