mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-29 08:42:28 +00:00
Improve threading and i/o routines
- On Windows connect() can now be interrupted by a signal; connect() w/ O_NONBLOCK will now raise EINPROGRESS; and connect() with SO_SNDTIMEO will raise ETIMEDOUT after the interval has elapsed. - We now get the AcceptEx(), ConnectEx(), and TransmitFile() functions from the WIN32 API the officially blessed way, using WSAIoctl(). - Do nothing on Windows when fsync() is called on a directory handle. This was raising EACCES earlier becaues GENERIC_WRITE is required on the handle. It's possible to FlushFileBuffers() a directory handle if it's opened with write access but MSDN doesn't document what it does. If you have any idea, please let us know! - Prefer manual reset event objects for read() and write() on Windows. - Do some code cleanup on our dlmalloc customizations. - Fix errno type error in Windows blocking routines. - Make the futex polyfill simpler and faster.
This commit is contained in:
parent
f7343319cc
commit
49b0eaa69f
43 changed files with 528 additions and 425 deletions
|
@ -17,49 +17,133 @@
|
|||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/assert.h"
|
||||
#include "libc/atomic.h"
|
||||
#include "libc/calls/struct/fd.internal.h"
|
||||
#include "libc/calls/struct/sigset.internal.h"
|
||||
#include "libc/cosmo.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/intrin/bsr.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/nt/enum/wsaid.h"
|
||||
#include "libc/nt/errors.h"
|
||||
#include "libc/nt/struct/guid.h"
|
||||
#include "libc/nt/struct/overlapped.h"
|
||||
#include "libc/nt/thread.h"
|
||||
#include "libc/nt/thunk/msabi.h"
|
||||
#include "libc/nt/winsock.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/struct/sockaddr.h"
|
||||
#include "libc/sock/syscall_fd.internal.h"
|
||||
#include "libc/sock/wsaid.internal.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
#ifdef __x86_64__
|
||||
#include "libc/sock/yoink.inc"
|
||||
|
||||
static textwindows int64_t __connect_block(int64_t fh, unsigned eventbit,
|
||||
int64_t rc, uint32_t timeout) {
|
||||
int64_t eh;
|
||||
struct NtWsaNetworkEvents ev;
|
||||
if (rc != -1) return rc;
|
||||
if (WSAGetLastError() != EWOULDBLOCK) return __winsockerr();
|
||||
eh = WSACreateEvent();
|
||||
bzero(&ev, sizeof(ev));
|
||||
/* The proper way to reset the state of an event object used with the
|
||||
WSAEventSelect function is to pass the handle of the event object
|
||||
to the WSAEnumNetworkEvents function in the hEventObject parameter.
|
||||
This will reset the event object and adjust the status of active FD
|
||||
events on the socket in an atomic fashion. -- MSDN */
|
||||
if (WSAEventSelect(fh, eh, 1u << eventbit) != -1 &&
|
||||
WSAEnumNetworkEvents(fh, eh, &ev) != -1) {
|
||||
if (!ev.iErrorCode[eventbit]) {
|
||||
rc = 0;
|
||||
} else {
|
||||
errno = ev.iErrorCode[eventbit];
|
||||
struct ConnectArgs {
|
||||
const void *addr;
|
||||
uint32_t addrsize;
|
||||
};
|
||||
|
||||
static struct {
|
||||
atomic_uint once;
|
||||
bool32 (*__msabi lpConnectEx)(int64_t hSocket, const struct sockaddr *name,
|
||||
int namelen, const void *opt_lpSendBuffer,
|
||||
uint32_t dwSendDataLength,
|
||||
uint32_t *opt_out_lpdwBytesSent,
|
||||
struct NtOverlapped *lpOverlapped);
|
||||
} g_connectex;
|
||||
|
||||
static void connectex_init(void) {
|
||||
static struct NtGuid ConnectExGuid = WSAID_CONNECTEX;
|
||||
g_connectex.lpConnectEx = __get_wsaid(&ConnectExGuid);
|
||||
}
|
||||
|
||||
void sys_connect_nt_cleanup(struct Fd *f, bool cancel) {
|
||||
struct NtOverlapped *overlap;
|
||||
if ((overlap = f->connect_op)) {
|
||||
uint32_t got, flags;
|
||||
if (cancel) CancelIoEx(f->handle, overlap);
|
||||
if (WSAGetOverlappedResult(f->handle, overlap, &got, cancel, &flags) ||
|
||||
WSAGetLastError() != kNtErrorIoIncomplete) {
|
||||
WSACloseEvent(overlap->hEvent);
|
||||
free(overlap);
|
||||
f->connect_op = 0;
|
||||
}
|
||||
} else {
|
||||
__winsockerr();
|
||||
}
|
||||
WSACloseEvent(eh);
|
||||
}
|
||||
|
||||
static int sys_connect_nt_start(int64_t hSocket,
|
||||
struct NtOverlapped *lpOverlapped,
|
||||
uint32_t *flags, void *arg) {
|
||||
struct ConnectArgs *args = arg;
|
||||
if (g_connectex.lpConnectEx(hSocket, args->addr, args->addrsize, 0, 0, 0,
|
||||
lpOverlapped)) {
|
||||
return 0;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
static textwindows int sys_connect_nt_impl(struct Fd *f, const void *addr,
|
||||
uint32_t addrsize, sigset_t mask) {
|
||||
|
||||
// get connect function from winsock api
|
||||
cosmo_once(&g_connectex.once, connectex_init);
|
||||
|
||||
// fail if previous connect() is still in progress
|
||||
if (f->connect_op) return ealready();
|
||||
|
||||
// ConnectEx() requires bind() be called beforehand
|
||||
if (!f->isbound) {
|
||||
struct sockaddr_storage ss = {0};
|
||||
ss.ss_family = ((struct sockaddr *)addr)->sa_family;
|
||||
if (sys_bind_nt(f, &ss, sizeof(ss)) == -1) return -1;
|
||||
}
|
||||
|
||||
// perform normal connect
|
||||
if (!(f->flags & O_NONBLOCK)) {
|
||||
ssize_t rc = __winsock_block(f->handle, 0, false, f->sndtimeo, mask,
|
||||
sys_connect_nt_start,
|
||||
&(struct ConnectArgs){addr, addrsize});
|
||||
if (rc == -1 && errno == EAGAIN) {
|
||||
// return ETIMEDOUT if SO_SNDTIMEO elapsed
|
||||
// note that Linux will return EINPROGRESS
|
||||
errno = etimedout();
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
// perform nonblocking connect(), i.e.
|
||||
// 1. connect(O_NONBLOCK) → EINPROGRESS
|
||||
// 2. poll(POLLOUT)
|
||||
bool32 ok;
|
||||
struct NtOverlapped *overlap = calloc(1, sizeof(struct NtOverlapped));
|
||||
if (!overlap) return -1;
|
||||
overlap->hEvent = WSACreateEvent();
|
||||
ok = g_connectex.lpConnectEx(f->handle, addr, addrsize, 0, 0, 0, overlap);
|
||||
if (ok) {
|
||||
uint32_t dwBytes, dwFlags;
|
||||
ok = WSAGetOverlappedResult(f->handle, overlap, &dwBytes, false, &dwFlags);
|
||||
WSACloseEvent(overlap->hEvent);
|
||||
free(overlap);
|
||||
return ok ? 0 : __winsockerr();
|
||||
} else if (WSAGetLastError() == kNtErrorIoPending) {
|
||||
f->connect_op = overlap;
|
||||
return einprogress();
|
||||
} else {
|
||||
WSACloseEvent(overlap->hEvent);
|
||||
free(overlap);
|
||||
return __winsockerr();
|
||||
}
|
||||
}
|
||||
|
||||
textwindows int sys_connect_nt(struct Fd *f, const void *addr,
|
||||
uint32_t addrsize) {
|
||||
sigset_t mask = __sig_block();
|
||||
int rc = sys_connect_nt_impl(f, addr, addrsize, mask);
|
||||
__sig_unblock(mask);
|
||||
return rc;
|
||||
}
|
||||
|
||||
textwindows int sys_connect_nt(struct Fd *fd, const void *addr,
|
||||
uint32_t addrsize) {
|
||||
npassert(fd->kind == kFdSocket);
|
||||
return __connect_block(
|
||||
fd->handle, _bsr(kNtFdConnect),
|
||||
WSAConnect(fd->handle, addr, addrsize, NULL, NULL, NULL, NULL),
|
||||
fd->rcvtimeo);
|
||||
}
|
||||
|
||||
#endif /* __x86_64__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue