mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-26 04:20:30 +00:00
Make improvements
- We now serialize the file descriptor table when spawning / executing processes on Windows. This means you can now inherit more stuff than just standard i/o. It's needed by bash, which duplicates the console to file descriptor #255. We also now do a better job serializing the environment variables, so you're less likely to encounter E2BIG when using your bash shell. We also no longer coerce environ to uppercase - execve() on Windows now remotely controls its parent process to make them spawn a replacement for itself. Then it'll be able to terminate immediately once the spawn succeeds, without having to linger around for the lifetime as a shell process for proxying the exit code. When process worker thread running in the parent sees the child die, it's given a handle to the new child, to replace it in the process table. - execve() and posix_spawn() on Windows will now provide CreateProcess an explicit handle list. This allows us to remove handle locks which enables better fork/spawn concurrency, with seriously correct thread safety. Other codebases like Go use the same technique. On the other hand fork() still favors the conventional WIN32 inheritence approach which can be a little bit messy, but is *controlled* by guaranteeing perfectly clean slates at both the spawning and execution boundaries - sigset_t is now 64 bits. Having it be 128 bits was a mistake because there's no reason to use that and it's only supported by FreeBSD. By using the system word size, signal mask manipulation on Windows goes very fast. Furthermore @asyncsignalsafe funcs have been rewritten on Windows to take advantage of signal masking, now that it's much more pleasant to use. - All the overlapped i/o code on Windows has been rewritten for pretty good signal and cancelation safety. We're now able to ensure overlap data structures are cleaned up so long as you don't longjmp() out of out of a signal handler that interrupted an i/o operation. Latencies are also improved thanks to the removal of lots of "busy wait" code. Waits should be optimal for everything except poll(), which shall be the last and final demon we slay in the win32 i/o horror show. - getrusage() on Windows is now able to report RUSAGE_CHILDREN as well as RUSAGE_SELF, thanks to aggregation in the process manager thread.
This commit is contained in:
Justine Tunney
parent
af7cb3c82f
commit
791f79fcb3
382 changed files with 4008 additions and 4511 deletions
|
|
@ -1,320 +0,0 @@
|
|||
#if 0
|
||||
/*─────────────────────────────────────────────────────────────────╗
|
||||
│ To the extent possible under law, Justine Tunney has waived │
|
||||
│ all copyright and related or neighboring rights to this file, │
|
||||
│ as it is written in the following disclaimers: │
|
||||
│ • http://unlicense.org/ │
|
||||
│ • http://creativecommons.org/publicdomain/zero/1.0/ │
|
||||
╚─────────────────────────────────────────────────────────────────*/
|
||||
#endif
|
||||
#include "ape/sections.internal.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/conv.h"
|
||||
#include "libc/intrin/bits.h"
|
||||
#include "libc/log/check.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/macros.internal.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/nexgen32e/x86feature.h"
|
||||
#include "libc/nt/runtime.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/stdio/rand.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/stdio/xorshift.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/ex.h"
|
||||
#include "libc/sysv/consts/exit.h"
|
||||
#include "libc/sysv/consts/grnd.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/hyperion.h"
|
||||
#include "third_party/getopt/getopt.internal.h"
|
||||
|
||||
#define B 4096
|
||||
|
||||
bool isdone;
|
||||
bool isbinary;
|
||||
unsigned long count = -1;
|
||||
|
||||
uint64_t bcast(uint64_t f(void)) {
|
||||
unsigned i;
|
||||
uint64_t x;
|
||||
for (x = i = 0; i < 8; ++i) {
|
||||
x <<= 8;
|
||||
x |= f() & 255;
|
||||
}
|
||||
return x;
|
||||
}
|
||||
|
||||
uint64_t randv6(void) {
|
||||
static int16_t gorp;
|
||||
gorp = (gorp + 625) & 077777;
|
||||
return gorp;
|
||||
}
|
||||
|
||||
uint64_t randv7(void) {
|
||||
static uint32_t randx = 1;
|
||||
return ((randx = randx * 1103515245 + 12345) >> 16) & 077777;
|
||||
}
|
||||
|
||||
uint64_t zero(void) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64_t inc(void) {
|
||||
static uint64_t x;
|
||||
return x++;
|
||||
}
|
||||
|
||||
uint64_t unixv6(void) {
|
||||
return bcast(randv6);
|
||||
}
|
||||
|
||||
uint64_t unixv7(void) {
|
||||
return bcast(randv7);
|
||||
}
|
||||
|
||||
uint64_t ape(void) {
|
||||
static int i;
|
||||
if ((i += 8) > _end - __executable_start) i = 8;
|
||||
return READ64LE(__executable_start + i);
|
||||
}
|
||||
|
||||
uint64_t moby(void) {
|
||||
static int i;
|
||||
if ((i += 8) > kMobySize) i = 8;
|
||||
return READ64LE(kMoby + i);
|
||||
}
|
||||
|
||||
uint64_t knuth(void) {
|
||||
uint64_t a, b;
|
||||
static uint64_t x = 1;
|
||||
x *= 6364136223846793005;
|
||||
x += 1442695040888963407;
|
||||
a = x >> 32;
|
||||
x *= 6364136223846793005;
|
||||
x += 1442695040888963407;
|
||||
b = x >> 32;
|
||||
return a | b << 32;
|
||||
}
|
||||
|
||||
uint64_t rngset64(void) {
|
||||
static unsigned i;
|
||||
static uint64_t s;
|
||||
if (!i) {
|
||||
s = _rand64();
|
||||
i = (s + 1) & (511);
|
||||
}
|
||||
return MarsagliaXorshift64(&s);
|
||||
}
|
||||
|
||||
uint64_t xorshift64(void) {
|
||||
static uint64_t s = kMarsagliaXorshift64Seed;
|
||||
return MarsagliaXorshift64(&s);
|
||||
}
|
||||
|
||||
uint64_t xorshift32(void) {
|
||||
static uint32_t s = kMarsagliaXorshift32Seed;
|
||||
uint64_t a = MarsagliaXorshift32(&s);
|
||||
uint64_t b = MarsagliaXorshift32(&s);
|
||||
return (uint64_t)a << 32 | b;
|
||||
}
|
||||
|
||||
uint64_t libc(void) {
|
||||
uint64_t x;
|
||||
CHECK_EQ(8, getrandom(&x, 8, 0));
|
||||
return x;
|
||||
}
|
||||
|
||||
uint64_t GetRandom(void) {
|
||||
uint64_t x;
|
||||
CHECK_EQ(8, getrandom(&x, 8, 0));
|
||||
return x;
|
||||
}
|
||||
|
||||
uint32_t python(void) {
|
||||
#define K 0 // 624 /* wut */
|
||||
#define N 624
|
||||
#define M 397
|
||||
static int index;
|
||||
static char once;
|
||||
static uint32_t mt[N];
|
||||
static const uint32_t mag01[2] = {0, 0x9908b0dfu};
|
||||
uint32_t y;
|
||||
int kk;
|
||||
if (!once) {
|
||||
char *sp;
|
||||
ssize_t rc;
|
||||
uint32_t i, j, k, s[K];
|
||||
mt[0] = 19650218;
|
||||
for (i = 1; i < N; i++) {
|
||||
mt[i] = (1812433253u * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i);
|
||||
}
|
||||
if (K) {
|
||||
for (sp = (char *)s, i = 0; i < sizeof(s); i += rc) {
|
||||
if ((rc = getrandom(sp + i, sizeof(s) - i, 0)) == -1) {
|
||||
if (errno != EINTR) abort();
|
||||
}
|
||||
}
|
||||
for (i = 1, j = 0, k = MAX(N, K); k; k--) {
|
||||
mt[i] =
|
||||
(mt[i] ^ ((mt[i - 1] ^ (mt[i - 1] >> 30)) * 1664525u)) + s[j] + j;
|
||||
if (++i >= N) mt[0] = mt[N - 1], i = 1;
|
||||
if (++j >= K) j = 0;
|
||||
}
|
||||
for (k = N - 1; k; k--) {
|
||||
mt[i] = (mt[i] ^ ((mt[i - 1] ^ (mt[i - 1] >> 30)) * 1566083941u)) - i;
|
||||
if (++i >= N) mt[0] = mt[N - 1], i = 1;
|
||||
}
|
||||
mt[0] = 0x80000000;
|
||||
explicit_bzero(s, sizeof(s));
|
||||
}
|
||||
once = 1;
|
||||
}
|
||||
if (index >= N) {
|
||||
for (kk = 0; kk < N - M; kk++) {
|
||||
y = (mt[kk] & 0x80000000u) | (mt[kk + 1] & 0x7fffffff);
|
||||
mt[kk] = mt[kk + M] ^ (y >> 1) ^ mag01[y & 1];
|
||||
}
|
||||
for (; kk < N - 1; kk++) {
|
||||
y = (mt[kk] & 0x80000000u) | (mt[kk + 1] & 0x7fffffff);
|
||||
mt[kk] = mt[kk + (M - N)] ^ (y >> 1) ^ mag01[y & 1];
|
||||
}
|
||||
y = (mt[N - 1] & 0x80000000u) | (mt[0] & 0x7fffffffu);
|
||||
mt[N - 1] = mt[M - 1] ^ (y >> 1) ^ mag01[y & 1];
|
||||
index = 0;
|
||||
}
|
||||
y = mt[index++];
|
||||
y ^= y >> 11;
|
||||
y ^= (y << 7) & 0x9d2c5680u;
|
||||
y ^= (y << 15) & 0xefc60000u;
|
||||
y ^= y >> 18;
|
||||
return y;
|
||||
#undef M
|
||||
#undef N
|
||||
#undef K
|
||||
}
|
||||
|
||||
uint64_t pythonx2(void) {
|
||||
uint64_t x = python();
|
||||
x <<= 32;
|
||||
x |= python();
|
||||
return x;
|
||||
}
|
||||
|
||||
const struct Function {
|
||||
const char *s;
|
||||
uint64_t (*f)(void);
|
||||
} kFunctions[] = {
|
||||
{"ape", ape}, //
|
||||
{"getrandom", GetRandom}, //
|
||||
{"inc", inc}, //
|
||||
{"knuth", knuth}, //
|
||||
{"lemur64", lemur64}, //
|
||||
{"libc", libc}, //
|
||||
{"moby", moby}, //
|
||||
{"mt19937", _mt19937}, //
|
||||
{"python", pythonx2}, //
|
||||
{"rand64", _rand64}, //
|
||||
{"rdrand", rdrand}, //
|
||||
{"rdrnd", rdrand}, //
|
||||
{"rdseed", rdseed}, //
|
||||
{"rngset64", rngset64}, //
|
||||
{"unixv6", unixv6}, //
|
||||
{"unixv7", unixv7}, //
|
||||
{"vigna", vigna}, //
|
||||
{"xorshift32", xorshift32}, //
|
||||
{"xorshift64", xorshift64}, //
|
||||
{"zero", zero}, //
|
||||
};
|
||||
|
||||
void OnInt(int sig) {
|
||||
isdone = true;
|
||||
}
|
||||
|
||||
wontreturn void PrintUsage(FILE *f, int rc) {
|
||||
fprintf(f, "Usage: %s [-b] [-n NUM] [FUNC]\n", program_invocation_name);
|
||||
exit(rc);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
char *p;
|
||||
int i, opt;
|
||||
ssize_t rc;
|
||||
uint64_t x;
|
||||
static char buf[B];
|
||||
uint64_t (*f)(void);
|
||||
|
||||
while ((opt = getopt(argc, argv, "hbc:n:")) != -1) {
|
||||
switch (opt) {
|
||||
case 'b':
|
||||
isbinary = true;
|
||||
break;
|
||||
case 'c':
|
||||
case 'n':
|
||||
count = sizetol(optarg, 1024);
|
||||
break;
|
||||
case 'h':
|
||||
PrintUsage(stdout, EXIT_SUCCESS);
|
||||
default:
|
||||
PrintUsage(stderr, EX_USAGE);
|
||||
}
|
||||
}
|
||||
|
||||
if (optind == argc) {
|
||||
f = libc;
|
||||
} else {
|
||||
for (f = 0, i = 0; i < ARRAYLEN(kFunctions); ++i) {
|
||||
if (!strcasecmp(argv[optind], kFunctions[i].s)) {
|
||||
f = kFunctions[i].f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!f) {
|
||||
fprintf(stderr, "unknown function: %`'s\n", argv[optind]);
|
||||
fprintf(stderr, "try: ");
|
||||
for (i = 0; i < ARRAYLEN(kFunctions); ++i) {
|
||||
if (i) fprintf(stderr, ", ");
|
||||
fprintf(stderr, "%s", kFunctions[i].s);
|
||||
}
|
||||
fprintf(stderr, "\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
signal(SIGINT, OnInt);
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
|
||||
if (!isbinary) {
|
||||
for (; count && !isdone && !feof(stdout); --count) {
|
||||
printf("0x%016lx\n", f());
|
||||
}
|
||||
fflush(stdout);
|
||||
return ferror(stdout) ? 1 : 0;
|
||||
}
|
||||
|
||||
while (count && !isdone) {
|
||||
if (count >= B) {
|
||||
for (i = 0; i < B / 8; ++i) {
|
||||
x = f();
|
||||
p = buf + i * 8;
|
||||
WRITE64LE(p, x);
|
||||
}
|
||||
for (i = 0; i < B; i += rc) {
|
||||
rc = write(1, buf + i, B - i);
|
||||
if (rc == -1 && errno == EPIPE) exit(1);
|
||||
if (rc == -1) perror("write"), exit(1);
|
||||
}
|
||||
} else {
|
||||
x = f();
|
||||
rc = write(1, &x, MIN(8, count));
|
||||
}
|
||||
if (!rc) break;
|
||||
if (rc == -1 && errno == EPIPE) exit(1);
|
||||
if (rc == -1) perror("write"), exit(1);
|
||||
count -= rc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -13,8 +13,10 @@
|
|||
#include "libc/assert.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/struct/itimerval.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/calls/struct/winsize.h"
|
||||
#include "libc/calls/termios.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/conv.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
|
|
@ -35,11 +37,14 @@
|
|||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/ex.h"
|
||||
#include "libc/sysv/consts/exit.h"
|
||||
#include "libc/sysv/consts/f.h"
|
||||
#include "libc/sysv/consts/fileno.h"
|
||||
#include "libc/sysv/consts/itimer.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/poll.h"
|
||||
#include "libc/sysv/consts/prio.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/sysv/consts/w.h"
|
||||
#include "libc/thread/thread.h"
|
||||
#include "libc/time/time.h"
|
||||
#include "libc/x/xasprintf.h"
|
||||
|
|
@ -148,12 +153,8 @@ struct ZipGames {
|
|||
};
|
||||
|
||||
static int frame_;
|
||||
static int drain_;
|
||||
static int playfd_;
|
||||
static int playpid_;
|
||||
static bool exited_;
|
||||
static bool timeout_;
|
||||
static bool resized_;
|
||||
static size_t vtsize_;
|
||||
static bool artifacts_;
|
||||
static long tyn_, txn_;
|
||||
|
|
@ -161,6 +162,9 @@ static struct Frame vf_[2];
|
|||
static struct Audio audio_;
|
||||
static const char* inputfn_;
|
||||
static struct Status status_;
|
||||
static volatile bool exited_;
|
||||
static volatile bool timeout_;
|
||||
static volatile bool resized_;
|
||||
static struct TtyRgb* ttyrgb_;
|
||||
static unsigned char *R, *G, *B;
|
||||
static struct ZipGames zipgames_;
|
||||
|
|
@ -235,12 +239,22 @@ void InitPalette(void) {
|
|||
}
|
||||
}
|
||||
|
||||
static void WriteStringNow(const char* s) {
|
||||
ttywrite(STDOUT_FILENO, s, strlen(s));
|
||||
static ssize_t Write(int fd, const void* p, size_t n) {
|
||||
int rc;
|
||||
sigset_t ss, oldss;
|
||||
sigfillset(&ss);
|
||||
sigprocmask(SIG_SETMASK, &ss, &oldss);
|
||||
rc = write(fd, p, n);
|
||||
sigprocmask(SIG_SETMASK, &oldss, 0);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void WriteString(const char* s) {
|
||||
Write(STDOUT_FILENO, s, strlen(s));
|
||||
}
|
||||
|
||||
void Exit(int rc) {
|
||||
WriteStringNow("\r\n\e[0m\e[J");
|
||||
WriteString("\r\n\e[0m\e[J");
|
||||
if (rc && errno) {
|
||||
fprintf(stderr, "%s%s\r\n", "error: ", strerror(errno));
|
||||
}
|
||||
|
|
@ -250,11 +264,19 @@ void Exit(int rc) {
|
|||
void Cleanup(void) {
|
||||
ttyraw((enum TtyRawFlags)(-1u));
|
||||
ttyshowcursor(STDOUT_FILENO);
|
||||
if (playpid_) kill(playpid_, SIGTERM), pthread_yield();
|
||||
if (playpid_) {
|
||||
kill(playpid_, SIGKILL);
|
||||
close(playfd_);
|
||||
playfd_ = -1;
|
||||
}
|
||||
}
|
||||
|
||||
void OnCtrlC(void) {
|
||||
exited_ = true;
|
||||
}
|
||||
|
||||
void OnTimer(void) {
|
||||
timeout_ = true; // also sends EINTR to poll()
|
||||
timeout_ = true;
|
||||
}
|
||||
|
||||
void OnResize(void) {
|
||||
|
|
@ -265,12 +287,11 @@ void OnPiped(void) {
|
|||
exited_ = true;
|
||||
}
|
||||
|
||||
void OnCtrlC(void) {
|
||||
drain_ = exited_ = true;
|
||||
}
|
||||
|
||||
void OnSigChld(void) {
|
||||
exited_ = true, playpid_ = 0;
|
||||
waitpid(-1, 0, WNOHANG);
|
||||
close(playfd_);
|
||||
playpid_ = 0;
|
||||
playfd_ = -1;
|
||||
}
|
||||
|
||||
void InitFrame(struct Frame* f) {
|
||||
|
|
@ -304,7 +325,8 @@ void GetTermSize(void) {
|
|||
frame_ = 0;
|
||||
InitFrame(&vf_[0]);
|
||||
InitFrame(&vf_[1]);
|
||||
WriteStringNow("\e[0m\e[H\e[J");
|
||||
WriteString("\e[0m\e[H\e[J");
|
||||
resized_ = false;
|
||||
}
|
||||
|
||||
void IoInit(void) {
|
||||
|
|
@ -329,13 +351,14 @@ void SetStatus(const char* fmt, ...) {
|
|||
status_.wait = FPS / 2;
|
||||
}
|
||||
|
||||
void ReadKeyboard(void) {
|
||||
ssize_t ReadKeyboard(void) {
|
||||
int ch;
|
||||
char b[20];
|
||||
ssize_t i, rc;
|
||||
memset(b, -1, sizeof(b));
|
||||
char b[20] = {0};
|
||||
if ((rc = read(STDIN_FILENO, b, 16)) != -1) {
|
||||
if (!rc) exited_ = true;
|
||||
if (!rc) {
|
||||
Exit(0);
|
||||
}
|
||||
for (i = 0; i < rc; ++i) {
|
||||
ch = b[i];
|
||||
if (b[i] == '\e') {
|
||||
|
|
@ -447,6 +470,7 @@ void ReadKeyboard(void) {
|
|||
}
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
bool HasVideo(struct Frame* f) {
|
||||
|
|
@ -471,26 +495,29 @@ void TransmitVideo(void) {
|
|||
struct Frame* f;
|
||||
f = &vf_[frame_];
|
||||
if (!HasVideo(f)) f = FlipFrameBuffer();
|
||||
if ((rc = write(STDOUT_FILENO, f->w, f->p - f->w)) != -1) {
|
||||
if ((rc = Write(STDOUT_FILENO, f->w, f->p - f->w)) != -1) {
|
||||
f->w += rc;
|
||||
} else if (errno == EAGAIN) {
|
||||
// slow teletypewriter
|
||||
} else if (errno == EPIPE) {
|
||||
Exit(0);
|
||||
} else if (errno != EINTR) {
|
||||
Exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
void TransmitAudio(void) {
|
||||
ssize_t rc;
|
||||
if (!playpid_) return;
|
||||
if (!audio_.i) return;
|
||||
if ((rc = write(playfd_, audio_.p, audio_.i * sizeof(short))) != -1) {
|
||||
if (playfd_ == -1) return;
|
||||
if ((rc = Write(playfd_, audio_.p, audio_.i * sizeof(short))) != -1) {
|
||||
rc /= sizeof(short);
|
||||
memmove(audio_.p, audio_.p + rc, (audio_.i - rc) * sizeof(short));
|
||||
audio_.i -= rc;
|
||||
} else if (errno == EPIPE) {
|
||||
kill(playpid_, SIGKILL);
|
||||
close(playfd_);
|
||||
playfd_ = -1;
|
||||
Exit(0);
|
||||
} else if (errno != EINTR) {
|
||||
Exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -534,36 +561,15 @@ void KeyCountdown(struct Action* a) {
|
|||
}
|
||||
|
||||
void PollAndSynchronize(void) {
|
||||
struct pollfd fds[3];
|
||||
do {
|
||||
errno = 0;
|
||||
fds[0].fd = STDIN_FILENO;
|
||||
fds[0].events = POLLIN;
|
||||
fds[1].fd = HasPendingVideo() ? STDOUT_FILENO : -1;
|
||||
fds[1].events = POLLOUT;
|
||||
fds[2].fd = HasPendingAudio() ? playfd_ : -1;
|
||||
fds[2].events = POLLOUT;
|
||||
if (poll(fds, ARRAYLEN(fds), 1. / FPS * 1e3) != -1) {
|
||||
if (fds[0].revents & (POLLIN | POLLERR)) ReadKeyboard();
|
||||
if (fds[1].revents & (POLLOUT | POLLERR)) TransmitVideo();
|
||||
if (fds[2].revents & (POLLOUT | POLLERR)) TransmitAudio();
|
||||
} else if (errno != EINTR) {
|
||||
Exit(1);
|
||||
}
|
||||
if (exited_) {
|
||||
if (drain_) {
|
||||
while (HasPendingVideo()) {
|
||||
TransmitVideo();
|
||||
}
|
||||
}
|
||||
Exit(0);
|
||||
}
|
||||
if (resized_) {
|
||||
resized_ = false;
|
||||
GetTermSize();
|
||||
break;
|
||||
if (ReadKeyboard() == -1) {
|
||||
if (errno != EINTR) Exit(1);
|
||||
if (exited_) Exit(0);
|
||||
if (resized_) GetTermSize();
|
||||
}
|
||||
} while (!timeout_);
|
||||
TransmitVideo();
|
||||
TransmitAudio();
|
||||
timeout_ = false;
|
||||
KeyCountdown(&arrow_);
|
||||
KeyCountdown(&button_);
|
||||
|
|
@ -1701,34 +1707,41 @@ int PlayGame(const char* romfile, const char* opt_tasfile) {
|
|||
|
||||
// open speaker
|
||||
// todo: this needs plenty of work
|
||||
if ((ffplay = commandvenv("FFPLAY", "ffplay"))) {
|
||||
devnull = open("/dev/null", O_WRONLY | O_CLOEXEC);
|
||||
pipe2(pipefds, O_CLOEXEC);
|
||||
if (!(playpid_ = fork())) {
|
||||
const char* const args[] = {
|
||||
"ffplay", "-nodisp", "-loglevel", "quiet", "-fflags",
|
||||
"nobuffer", "-ac", "1", "-ar", "1789773",
|
||||
"-f", "s16le", "pipe:", NULL,
|
||||
};
|
||||
dup2(pipefds[0], 0);
|
||||
dup2(devnull, 1);
|
||||
dup2(devnull, 2);
|
||||
execv(ffplay, (char* const*)args);
|
||||
abort();
|
||||
}
|
||||
close(pipefds[0]);
|
||||
playfd_ = pipefds[1];
|
||||
} else {
|
||||
fputs("\nWARNING\n\
|
||||
if (!IsWindows()) {
|
||||
if ((ffplay = commandvenv("FFPLAY", "ffplay"))) {
|
||||
devnull = open("/dev/null", O_WRONLY | O_CLOEXEC);
|
||||
pipe2(pipefds, O_CLOEXEC);
|
||||
if (!(playpid_ = fork())) {
|
||||
const char* const args[] = {
|
||||
ffplay, //
|
||||
"-nodisp", //
|
||||
"-loglevel", "quiet", //
|
||||
"-ac", "1", //
|
||||
"-ar", "1789773", //
|
||||
"-f", "s16le", //
|
||||
"pipe:", //
|
||||
NULL,
|
||||
};
|
||||
dup2(pipefds[0], 0);
|
||||
dup2(devnull, 1);
|
||||
dup2(devnull, 2);
|
||||
execv(ffplay, (char* const*)args);
|
||||
abort();
|
||||
}
|
||||
close(pipefds[0]);
|
||||
playfd_ = pipefds[1];
|
||||
} else {
|
||||
fputs("\nWARNING\n\
|
||||
\n\
|
||||
Need `ffplay` command to play audio\n\
|
||||
Try `sudo apt install ffmpeg` on Linux\n\
|
||||
You can specify it on `PATH` or in `FFPLAY`\n\
|
||||
\n\
|
||||
Press enter to continue without sound: ",
|
||||
stdout);
|
||||
fflush(stdout);
|
||||
GetLine();
|
||||
stdout);
|
||||
fflush(stdout);
|
||||
GetLine();
|
||||
}
|
||||
}
|
||||
|
||||
// Read the ROM file header
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include "libc/calls/termios.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/log/check.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
|
|
@ -42,14 +41,19 @@ char code[512];
|
|||
int infd, outfd;
|
||||
struct winsize wsize;
|
||||
struct termios oldterm;
|
||||
volatile bool resized, killed;
|
||||
volatile bool killed, resized, resurrected;
|
||||
|
||||
void OnKilled(int sig) {
|
||||
killed = true;
|
||||
}
|
||||
|
||||
void OnResize(int sig) {
|
||||
resized = true;
|
||||
}
|
||||
|
||||
void OnKilled(int sig) {
|
||||
killed = true;
|
||||
void OnResurrect(int sig) {
|
||||
resized = true;
|
||||
resurrected = true;
|
||||
}
|
||||
|
||||
void RestoreTty(void) {
|
||||
|
|
@ -160,16 +164,20 @@ int main(int argc, char *argv[]) {
|
|||
int e, c, y, x, n, yn, xn;
|
||||
infd = 0;
|
||||
outfd = 1;
|
||||
/* infd = outfd = open("/dev/tty", O_RDWR); */
|
||||
signal(SIGTERM, OnKilled);
|
||||
signal(SIGCONT, OnResize);
|
||||
signal(SIGWINCH, OnResize);
|
||||
infd = outfd = open("/dev/tty", O_RDWR);
|
||||
signal(SIGINT, OnSignalThatWontEintrRead);
|
||||
sigaction(SIGQUIT,
|
||||
&(struct sigaction){.sa_handler = OnSignalThatWillEintrRead}, 0);
|
||||
sigaction(SIGTERM, &(struct sigaction){.sa_handler = OnKilled}, 0);
|
||||
sigaction(SIGWINCH, &(struct sigaction){.sa_handler = OnResize}, 0);
|
||||
sigaction(SIGCONT, &(struct sigaction){.sa_handler = OnResurrect}, 0);
|
||||
EnableRawMode();
|
||||
GetTtySize();
|
||||
while (!killed) {
|
||||
if (resurrected) {
|
||||
dprintf(outfd, "WE LIVE AGAIN ");
|
||||
resurrected = false;
|
||||
}
|
||||
if (resized) {
|
||||
dprintf(outfd, "SIGWINCH ");
|
||||
GetTtySize();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue