mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 22:02:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve threading and i/o routines

Browse source 
- 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:
Justine Tunney 2023-10-12 18:53:17 -07:00
parent f7343319cc
commit 49b0eaa69f
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
43 changed files with 528 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

177
test/libc/dns/servicestxt_test.c
View file

@ -51,77 +51,72 @@ ssh 22/tcp # SSH Remote Login Protocol";
ASSERT_NE(-1, close(fd));
}
/* TEST(LookupServicesByPort, GetNameWhenPortCorrect) { */
/* char name[8]; /\* service names are of length 3 *\/ */
/* char eitherproto[8]; /\* protocol names are of length 3 *\/ */
/* char proto1[] = "tcp"; */
/* char proto2[] = "udp"; */
/* char* localproto; */
/* strcpy(eitherproto, ""); */
/* strcpy(name, ""); */
TEST(LookupServicesByPort, GetNameWhenPortCorrect) {
char name[8]; /* service names are of length 3 */
char eitherproto[8]; /* protocol names are of length 3 */
char proto1[] = "tcp";
char proto2[] = "udp";
char* localproto;
strcpy(eitherproto, "");
strcpy(name, "");
/* localproto = eitherproto; */
/* ASSERT_EQ(-1, /\* non existent port *\/ */
/* LookupServicesByPort(965, localproto, sizeof(eitherproto), name,
*/
/* sizeof(name), "services")); */
/* ASSERT_EQ('\0', localproto[0]); */
localproto = eitherproto;
ASSERT_EQ(-1, /* non existent port */
LookupServicesByPort(965, localproto, sizeof(eitherproto), name,
sizeof(name), "services"));
ASSERT_EQ('\0', localproto[0]);
/* localproto = eitherproto; */
/* ASSERT_EQ(-1, /\* port in network byte order *\/ */
/* LookupServicesByPort(htons(22), localproto, sizeof(eitherproto),
*/
/* name, sizeof(name), "services")); */
/* ASSERT_EQ('\0', localproto[0]); */
localproto = eitherproto;
ASSERT_EQ(-1, /* port in network byte order */
LookupServicesByPort(htons(22), localproto, sizeof(eitherproto),
name, sizeof(name), "services"));
ASSERT_EQ('\0', localproto[0]);
/* localproto = proto2; */
/* ASSERT_EQ(-1, /\* port ok but wrong protocol *\/ */
/* LookupServicesByPort(22, localproto, sizeof(proto2), name, */
/* sizeof(name), "services")); */
/* ASSERT_STREQ(proto2, "udp"); */
localproto = proto2;
ASSERT_EQ(-1, /* port ok but wrong protocol */
LookupServicesByPort(22, localproto, sizeof(proto2), name,
sizeof(name), "services"));
ASSERT_STREQ(proto2, "udp");
/* localproto = proto1; */
/* ASSERT_EQ( */
/* -1, /\* protocol is non-NULL/length must be nonzero *\/ */
/* LookupServicesByPort(22, localproto, 0, name, sizeof(name),
* "services")); */
/* ASSERT_STREQ(proto1, "tcp"); */
localproto = proto1;
ASSERT_EQ(
-1, /* protocol is non-NULL/length must be nonzero */
LookupServicesByPort(22, localproto, 0, name, sizeof(name), "services"));
ASSERT_STREQ(proto1, "tcp");
/* localproto = proto1; */
/* ASSERT_EQ(-1, /\* sizeof(name) insufficient, memccpy failure *\/ */
/* LookupServicesByPort(22, localproto, sizeof(proto1), name, 1, */
/* "services")); */
/* ASSERT_STREQ(proto1, "tcp"); */
/* ASSERT_STREQ(name, ""); /\* cleaned up after memccpy failed *\/ */
localproto = proto1;
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
LookupServicesByPort(22, localproto, sizeof(proto1), name, 1,
"services"));
ASSERT_STREQ(proto1, "tcp");
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
/* localproto = eitherproto; */
/* ASSERT_EQ( */
/* -1, /\* sizeof(proto) insufficient, memccpy failure *\/ */
/* LookupServicesByPort(22, localproto, 1, name, sizeof(name),
* "services")); */
/* ASSERT_STREQ(eitherproto, ""); /\* cleaned up after memccpy failed *\/ */
localproto = eitherproto;
ASSERT_EQ(
-1, /* sizeof(proto) insufficient, memccpy failure */
LookupServicesByPort(22, localproto, 1, name, sizeof(name), "services"));
ASSERT_STREQ(eitherproto, ""); /* cleaned up after memccpy failed */
/* localproto = proto1; */
/* ASSERT_EQ(0, LookupServicesByPort(22, localproto, sizeof(proto1), name, */
/* sizeof(name), "services")); */
/* ASSERT_STREQ(name, "ssh"); */
/* ASSERT_STREQ(proto1, "tcp"); */
localproto = proto1;
ASSERT_EQ(0, LookupServicesByPort(22, localproto, sizeof(proto1), name,
sizeof(name), "services"));
ASSERT_STREQ(name, "ssh");
ASSERT_STREQ(proto1, "tcp");
/* localproto = proto2; */
/* ASSERT_EQ(0, LookupServicesByPort(19, localproto, sizeof(proto2), name, */
/* sizeof(name), "services")); */
/* ASSERT_STREQ(name, "chargen"); */
/* ASSERT_STREQ(proto2, "udp"); */
localproto = proto2;
ASSERT_EQ(0, LookupServicesByPort(19, localproto, sizeof(proto2), name,
sizeof(name), "services"));
ASSERT_STREQ(name, "chargen");
ASSERT_STREQ(proto2, "udp");
/* localproto = eitherproto; */
/* ASSERT_EQ(0, /\* pick first matching protocol *\/ */
/* LookupServicesByPort(19, localproto, sizeof(eitherproto), name,
*/
/* sizeof(name), "services")); */
/* ASSERT_STREQ(name, "chargen"); */
/* ASSERT_NE('\0', localproto[0]); /\* buffer filled during the call *\/ */
/* ASSERT_STREQ(eitherproto, "tcp"); */
/* } */
localproto = eitherproto;
ASSERT_EQ(0, /* pick first matching protocol */
LookupServicesByPort(19, localproto, sizeof(eitherproto), name,
sizeof(name), "services"));
ASSERT_STREQ(name, "chargen");
ASSERT_NE('\0', localproto[0]); /* buffer filled during the call */
ASSERT_STREQ(eitherproto, "tcp");
}
TEST(LookupServicesByName, GetPortWhenNameOrAlias) {
char name[8]; /* service names are of length 3 */
@ -132,42 +127,36 @@ TEST(LookupServicesByName, GetPortWhenNameOrAlias) {
strcpy(eitherproto, "");
strcpy(name, "");
/* localproto = eitherproto; */
/* ASSERT_EQ(-1, /\* non-existent name *\/ */
/* LookupServicesByName("http", localproto, sizeof(eitherproto),
* name, */
/* sizeof(name), "services")); */
/* ASSERT_EQ('\0', localproto[0]); */
localproto = eitherproto;
ASSERT_EQ(-1, /* non-existent name */
LookupServicesByName("http", localproto, sizeof(eitherproto), name,
sizeof(name), "services"));
ASSERT_EQ('\0', localproto[0]);
/* localproto = proto2; */
/* ASSERT_EQ(-1, /\* name exists but wrong protocol *\/ */
/* LookupServicesByName("ssh", localproto, sizeof(proto2), name, */
/* sizeof(name), "services")); */
/* ASSERT_STREQ(proto2, "udp"); */
localproto = proto2;
ASSERT_EQ(-1, /* name exists but wrong protocol */
LookupServicesByName("ssh", localproto, sizeof(proto2), name,
sizeof(name), "services"));
ASSERT_STREQ(proto2, "udp");
/* localproto = proto2; */
/* ASSERT_EQ(-1, /\* protocol is non-NULL/length must be nonzero *\/ */
/* LookupServicesByName("ssh", localproto, sizeof(proto2), name, */
/* sizeof(name), "services")); */
/* ASSERT_STREQ(proto2, "udp"); */
localproto = proto2;
ASSERT_EQ(-1, /* protocol is non-NULL/length must be nonzero */
LookupServicesByName("ssh", localproto, sizeof(proto2), name,
sizeof(name), "services"));
ASSERT_STREQ(proto2, "udp");
/* localproto = proto1; */
/* ASSERT_EQ(-1, /\* sizeof(name) insufficient, memccpy failure *\/ */
/* LookupServicesByName("ssh", localproto, sizeof(proto1), name, 1,
*/
/* "services")); */
/* ASSERT_STREQ(proto1, "tcp"); */
/* ASSERT_STREQ(name, ""); /\* cleaned up after memccpy failed *\/ */
localproto = proto1;
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
LookupServicesByName("ssh", localproto, sizeof(proto1), name, 1,
"services"));
ASSERT_STREQ(proto1, "tcp");
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
/* localproto = eitherproto; */
/* ASSERT_EQ(-1, /\* sizeof(proto) insufficient, memccpy failure *\/ */
/* LookupServicesByName("ssh", localproto, 1, name, sizeof(name), */
/* "services")); */
/* ASSERT_STREQ(eitherproto, ""); /\* cleaned up after memccpy failed *\/ */
ftrace_install();
strace_enabled(+1);
ftrace_enabled(+1);
localproto = eitherproto;
ASSERT_EQ(-1, /* sizeof(proto) insufficient, memccpy failure */
LookupServicesByName("ssh", localproto, 1, name, sizeof(name),
"services"));
ASSERT_STREQ(eitherproto, ""); /* cleaned up after memccpy failed */
localproto = proto1;
ASSERT_EQ(22, LookupServicesByName("ssh", localproto, sizeof(proto1), name,

85
test/libc/sock/connect_test.c Normal file
View file

@ -0,0 +1,85 @@
/*-*- 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 2023 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/atomic.h"
#include "libc/calls/calls.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/kprintf.h"
#include "libc/runtime/runtime.h"
#include "libc/sock/sock.h"
#include "libc/sock/struct/pollfd.h"
#include "libc/sock/struct/sockaddr.h"
#include "libc/sysv/consts/af.h"
#include "libc/sysv/consts/ipproto.h"
#include "libc/sysv/consts/limits.h"
#include "libc/sysv/consts/poll.h"
#include "libc/sysv/consts/sock.h"
#include "libc/testlib/subprocess.h"
#include "libc/testlib/testlib.h"
#include "libc/thread/thread.h"
TEST(connect, nonblocking) {
if (IsFreebsd()) return; // TODO(jart): why did this start flaking?
char buf[16] = {0};
atomic_uint *sem = _mapshared(sizeof(unsigned));
uint32_t addrsize = sizeof(struct sockaddr_in);
struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_addr.s_addr = htonl(0x7f000001),
};
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
SPAWN(fork);
while (!*sem) pthread_yield();
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 2, read(4, buf, 16)); // hi
ASSERT_SYS(0, 5, write(4, "hello", 5));
ASSERT_SYS(0, 3, read(4, buf, 16)); // bye
PARENT();
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP));
ASSERT_SYS(EINPROGRESS, -1,
connect(3, (struct sockaddr *)&addr, sizeof(addr)));
if (!(IsLinux() || IsNetbsd())) {
// this doens't work on rhel7 and netbsd
ASSERT_SYS(EALREADY, -1,
connect(3, (struct sockaddr *)&addr, sizeof(addr)));
}
ASSERT_SYS(EAGAIN, -1, read(3, buf, 16));
*sem = 1;
{ // wait until connected
struct pollfd pfd = {3, POLLOUT};
ASSERT_SYS(0, 1, poll(&pfd, 1, -1));
ASSERT_TRUE(!!(POLLOUT & pfd.revents));
}
ASSERT_SYS(0, 2, write(3, "hi", 2));
{ // wait for other process to send us stuff
struct pollfd pfd = {3, POLLIN};
ASSERT_SYS(0, 1, poll(&pfd, 1, -1));
ASSERT_TRUE(!!(POLLIN & pfd.revents));
}
ASSERT_SYS(0, 5, read(3, buf, 16));
ASSERT_STREQ("hello", buf);
ASSERT_SYS(0, 3, write(3, "bye", 3));
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
munmap(sem, sizeof(unsigned));
}

24
test/libc/sock/socket_test.c
View file

@ -49,12 +49,12 @@ TEST(ipv4, test) {
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
PARENT();
EXPECT_SYS(0, 0, close(3));
EXPECT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
EXPECT_SYS(0, 5, read(3, buf, 16));
EXPECT_STREQ("hello", buf);
EXPECT_SYS(0, 0, close(3));
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
ASSERT_SYS(0, 5, read(3, buf, 16));
ASSERT_STREQ("hello", buf);
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
}
@ -77,12 +77,12 @@ TEST(ipv6, test) {
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
PARENT();
EXPECT_SYS(0, 0, close(3));
EXPECT_SYS(0, 3, socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP));
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
EXPECT_SYS(0, 5, read(3, buf, 16));
EXPECT_STREQ("hello", buf);
EXPECT_SYS(0, 0, close(3));
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
ASSERT_SYS(0, 5, read(3, buf, 16));
ASSERT_STREQ("hello", buf);
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
}

3
test/libc/stdio/fwrite_test.c
View file

@ -18,6 +18,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/struct/sigaction.h"
#include "libc/calls/struct/sigset.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/mem/gc.internal.h"
@ -172,7 +173,7 @@ TEST(fwrite, signalStorm) {
if (!pid) {
do {
ASSERT_NE(-1, kill(getppid(), SIGINT));
usleep(25);
usleep(5000);
} while (!gotsigint);
_exit(0);
}

6
test/libc/stdio/memory_test.c
View file

@ -28,12 +28,12 @@ void *Worker(void *arg) {
int i;
char *volatile p;
char *volatile q;
for (i = 0; i < 256; ++i) {
for (i = 0; i < 3000; ++i) {
p = malloc(17);
free(p);
p = malloc(17);
q = malloc(17);
sched_yield();
pthread_yield();
free(p);
free(q);
}
@ -45,7 +45,7 @@ void SetUpOnce(void) {
}
TEST(memory, test) {
int i, n = 32;
int i, n = 8;
pthread_t *t = gc(malloc(sizeof(pthread_t) * n));
for (i = 0; i < n; ++i) {
ASSERT_EQ(0, pthread_create(t + i, 0, Worker, 0));

3
test/libc/thread/pthread_kill_test.c
View file

@ -21,6 +21,7 @@
#include "libc/calls/struct/sigaction.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/kprintf.h"
#include "libc/runtime/runtime.h"
#include "libc/sock/sock.h"
#include "libc/sock/struct/sockaddr.h"
@ -61,7 +62,7 @@ void OnSig(int sig) {
void WaitUntilReady(void) {
while (!ready) pthread_yield();
ASSERT_EQ(0, errno);
ASSERT_SYS(0, 0, usleep(1000));
ASSERT_SYS(0, 0, usleep(100000));
}
void *SleepWorker(void *arg) {