mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-06-27 14:58:30 +00:00
Improve Windows Console I/O
- Blocking read operations on the Windows Console can now EINTR - Blocking read operations on Windows pipes now EINTR more reliably - setitimer() will no longer be inherited across fork() on Windows - It's now possible to use ECHO when the console is in raw mode - The ECHOCTL flag now works correctly on the Windows Console - The ICRNL flag now works correctly on the Windows Console - pread() and pwrite() will now raise ESPIPE on Windows - Opening /dev/tty on Windows is improved (untested) - Overlapped I/O is now implemented in a better way
This commit is contained in:
parent
decf216655
commit
33d280c8ba
34 changed files with 580 additions and 376 deletions
|
@ -18,14 +18,18 @@
|
|||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/assert.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/cp.internal.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/struct/iovec.h"
|
||||
#include "libc/calls/struct/iovec.internal.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/syscall-sysv.internal.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sysv/consts/nr.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/ezbench.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
|
@ -43,10 +47,35 @@ TEST(read, eof) {
|
|||
ASSERT_SYS(0, 0, close(3));
|
||||
}
|
||||
|
||||
volatile bool got_sigalrm;
|
||||
|
||||
void OnSigalrm(int sig) {
|
||||
got_sigalrm = true;
|
||||
}
|
||||
|
||||
TEST(read_pipe, canBeInterruptedByAlarm) {
|
||||
int fds[2];
|
||||
char buf[1];
|
||||
struct sigaction sa;
|
||||
alarm(1);
|
||||
sa.sa_flags = 0;
|
||||
sa.sa_handler = OnSigalrm;
|
||||
sigemptyset(&sa.sa_mask);
|
||||
sigaction(SIGALRM, &sa, 0);
|
||||
ASSERT_SYS(0, 0, pipe(fds));
|
||||
ASSERT_SYS(ESPIPE, -1, pread(fds[0], buf, 1, 777));
|
||||
ASSERT_SYS(EINTR, -1, read(fds[0], buf, 1));
|
||||
ASSERT_TRUE(got_sigalrm);
|
||||
signal(SIGALRM, SIG_DFL);
|
||||
close(fds[1]);
|
||||
close(fds[0]);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
BENCH(read, bench) {
|
||||
char buf[16];
|
||||
BEGIN_CANCELLATION_POINT;
|
||||
ASSERT_SYS(0, 3, open("/dev/zero", O_RDONLY));
|
||||
EZBENCH2("read", donothing, read(3, buf, 5));
|
||||
EZBENCH2("pread", donothing, pread(3, buf, 5, 0));
|
||||
|
@ -59,4 +88,5 @@ BENCH(read, bench) {
|
|||
EZBENCH2("sys_read", donothing, sys_read(3, buf, 5));
|
||||
EZBENCH2("sys_readv", donothing, sys_readv(3, &(struct iovec){buf, 5}, 1));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
END_CANCELLATION_POINT;
|
||||
}
|
||||
|
|
|
@ -21,18 +21,21 @@
|
|||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/calls/struct/timeval.h"
|
||||
#include "libc/calls/ucontext.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/sysv/consts/itimer.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
#include "libc/sysv/consts/sicode.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/subprocess.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "libc/time/time.h"
|
||||
|
||||
bool gotsig;
|
||||
|
||||
void SetUpOnce(void) {
|
||||
ASSERT_SYS(0, 0, pledge("stdio", 0));
|
||||
ASSERT_SYS(0, 0, pledge("stdio proc", 0));
|
||||
}
|
||||
|
||||
void OnSigAlrm(int sig, siginfo_t *si, void *ctx) {
|
||||
|
@ -59,3 +62,15 @@ TEST(setitimer, testSingleShot) {
|
|||
EXPECT_EQ(0, sigaction(SIGUSR1, &oldalrm, 0));
|
||||
EXPECT_EQ(true, gotsig);
|
||||
}
|
||||
|
||||
TEST(setitimer, notInheritedAcrossFork) {
|
||||
struct itimerval disarm = {0};
|
||||
struct itimerval singleshot = {{0}, {100}};
|
||||
ASSERT_SYS(0, 0, setitimer(ITIMER_REAL, &singleshot, 0));
|
||||
SPAWN(fork);
|
||||
struct itimerval it;
|
||||
ASSERT_SYS(0, 0, setitimer(ITIMER_REAL, 0, &it));
|
||||
ASSERT_TRUE(timeval_iszero(it.it_value));
|
||||
EXITS(0);
|
||||
ASSERT_SYS(0, 0, setitimer(ITIMER_REAL, &disarm, 0));
|
||||
}
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/struct/timespec.h"
|
||||
#include "libc/calls/struct/timeval.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/limits.h"
|
||||
#include "libc/stdio/rand.h"
|
||||
|
@ -84,6 +85,15 @@ TEST(timespec_tonanos, test) {
|
|||
EXPECT_EQ(INT64_MIN, timespec_tonanos((struct timespec){INT64_MIN, 0}));
|
||||
}
|
||||
|
||||
TEST(timeval_toseconds, test) {
|
||||
ASSERT_EQ(0, timeval_toseconds((struct timeval){0, 0}));
|
||||
ASSERT_EQ(1, timeval_toseconds((struct timeval){0, 1}));
|
||||
ASSERT_EQ(1, timeval_toseconds((struct timeval){0, 2}));
|
||||
ASSERT_EQ(1, timeval_toseconds((struct timeval){1, 0}));
|
||||
ASSERT_EQ(2, timeval_toseconds((struct timeval){1, 1}));
|
||||
ASSERT_EQ(INT64_MAX, timeval_toseconds(timeval_max));
|
||||
}
|
||||
|
||||
static long mod(long x, long y) {
|
||||
if (y == -1) return 0;
|
||||
return x - y * (x / y - (x % y && (x ^ y) < 0));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue