Rewrite special file handling on Windows

This change gets GNU grep working. What caused it to not work, is it
wouldn't write to an output file descriptor when its dev/ino equaled
/dev/null's. So now we invent special dev/ino values for these files
This commit is contained in:
Justine Tunney 2023-10-14 01:06:00 -07:00
parent aca2261cda
commit 2db2f40a98
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
53 changed files with 485 additions and 299 deletions

View file

@ -620,9 +620,8 @@ RetryOnEtxtbsyRaceCondition:
goto TerminateJob;
}
if (received > 0) {
WARNF("%s client sent %d unexpected bytes so killing job", origname,
received);
goto HangupClientAndTerminateJob;
WARNF("%s client sent %d unexpected bytes", origname, received);
continue;
}
if (received == MBEDTLS_ERR_SSL_WANT_READ) { // EAGAIN SO_RCVTIMEO
WARNF("%s (pid %d) is taking a really long time", origname,

View file

@ -178,14 +178,18 @@ __static_yoink("blink_xnu_aarch64"); // is apple silicon
#define MONITOR_MICROS 150000
#define READ(F, P, N) readv(F, &(struct iovec){P, N}, 1)
#define WRITE(F, P, N) writev(F, &(struct iovec){P, N}, 1)
#define LockInc(P) (*(_Atomic(typeof(*(P))) *)(P))++
#define LockDec(P) (*(_Atomic(typeof(*(P))) *)(P))--
#define AppendCrlf(P) mempcpy(P, "\r\n", 2)
#define HasHeader(H) (!!cpm.msg.headers[H].a)
#define HeaderData(H) (inbuf.p + cpm.msg.headers[H].a)
#define HeaderLength(H) (cpm.msg.headers[H].b - cpm.msg.headers[H].a)
#define HeaderEqualCase(H, S) \
SlicesEqualCase(S, strlen(S), HeaderData(H), HeaderLength(H))
#define LockInc(P) \
atomic_fetch_add_explicit((_Atomic(typeof(*(P))) *)(P), +1, \
memory_order_relaxed)
#define LockDec(P) \
atomic_fetch_add_explicit((_Atomic(typeof(*(P))) *)(P), -1, \
memory_order_relaxed)
#define TRACE_BEGIN \
do { \

View file

@ -60,7 +60,6 @@ static char msg[128];
static uint32_t msglen;
static const char *prog;
static atomic_int a_termsig;
static atomic_long a_errors;
static atomic_long a_requests;
static atomic_bool a_finished;
@ -125,23 +124,21 @@ static void NewClient(struct Client *client, const struct sockaddr_in *addr) {
static void *Worker(void *arg) {
while (!a_finished) {
bool32 ok;
uint32_t i;
uint32_t dwFlags;
uint32_t dwBytes;
struct Client *client;
uint64_t CompletionKey;
struct NtOverlapped *lpOverlapped;
if (!(ok = GetQueuedCompletionStatus(iocp, &dwBytes, &CompletionKey,
&lpOverlapped, -1u)) &&
!lpOverlapped) {
uint32_t dwRecordCount;
struct NtOverlappedEntry records[8];
if (!GetQueuedCompletionStatusEx(iocp, records, ARRAYLEN(records),
&dwRecordCount, -1u, false)) {
fprintf(stderr, "GetQueuedCompletionStatus() failed w/ %d\n",
GetLastError());
exit(1);
}
client = (struct Client *)CompletionKey;
switch (client->state) {
case SENDING:
if (ok) {
for (i = 0; i < dwRecordCount; ++i) {
uint32_t dwBytes = records[i].dwNumberOfBytesTransferred;
struct Client *client = (struct Client *)records[i].lpCompletionKey;
switch (client->state) {
case SENDING:
dwFlags = 0;
client->state = RECEIVING;
client->iov.buf = client->buf;
@ -153,15 +150,8 @@ static void *Worker(void *arg) {
fprintf(stderr, "WSARecv() failed w/ %d\n", WSAGetLastError());
exit(1);
}
} else {
fprintf(stderr, "WSAConnect() or WSASend() failed w/ %d\n",
WSAGetLastError());
__imp_closesocket(client->handle);
++a_errors;
}
break;
case RECEIVING:
if (ok) {
break;
case RECEIVING:
if (!dwBytes) {
fprintf(stderr, "got disconnect\n");
break;
@ -183,14 +173,10 @@ static void *Worker(void *arg) {
fprintf(stderr, "WSASend() failed w/ %d\n", WSAGetLastError());
exit(1);
}
} else {
fprintf(stderr, "WSARecv() failed w/ %d\n", WSAGetLastError());
__imp_closesocket(client->handle);
++a_errors;
}
break;
default:
__builtin_unreachable();
break;
default:
__builtin_unreachable();
}
}
}
return 0;
@ -209,12 +195,12 @@ int main(int argc, char *argv[]) {
prog = argv[0];
if (!prog) {
prog = "ab";
prog = "winbench";
}
int opt;
int nclients = 20;
int nthreads = GetMaximumProcessorCount(0xffff) * 2;
int nclients = 1000;
int nthreads = GetMaximumProcessorCount(0xffff);
struct sockaddr_in destaddr = {AF_INET, htons(8080), {htonl(0x7f000001)}};
while ((opt = getopt(argc, argv, "hH:P:")) != -1) {
switch (opt) {
@ -280,7 +266,7 @@ int main(int argc, char *argv[]) {
NewClient(clients + i, &destaddr);
}
sleep(5);
sleep(10);
a_finished = true;
long request_count = a_requests;