mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-23 05:42:29 +00:00
Make signal handling work well across platforms
- Fix sigsuspend() on XNU - Fix strsignal() on non-Linux - Add unit tests for strsignal() - Add unit tests for setitimer() - Add unit tests for sigsuspend() - Rewrite setitimer() for New Technology - Rewrite nanosleep() for New Technology - Polyfill SIGALRM on the New Technology - select(0,0,0,0) on NT now calls pause() - Remove some NTDLL calls that aren't needed - Polyfill SA_NOCLDWAIT on the New Technology - Polyfill SA_RESETHAND on the New Technology - Polyfill sigprocmask() on the New Technology - Polyfill SIGCHLD+SIG_IGN on the New Technology - Polyfill SA_RESTART masking on the New Technology - Deliver console signals from main thread on New Technology - Document SA_RESTART behavior w/ @sarestartable / @norestart - System call trace in MODE=dbg now prints inherited FDs and signal mask
This commit is contained in:
Justine Tunney
parent
3b9e66ecba
commit
072e1d2910
82 changed files with 1388 additions and 450 deletions
57
test/libc/calls/setitimer_test.c
Normal file
57
test/libc/calls/setitimer_test.c
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
/*-*- 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 2022 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/calls/calls.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/calls/ucontext.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/testlib.h"
|
||||
#include "libc/time/time.h"
|
||||
|
||||
bool gotsig;
|
||||
|
||||
void OnSigAlrm(int sig, siginfo_t *si, ucontext_t *ctx) {
|
||||
EXPECT_EQ(SIGALRM, sig);
|
||||
EXPECT_EQ(SIGALRM, si->si_signo);
|
||||
gotsig = true;
|
||||
}
|
||||
|
||||
TEST(setitimer, testSingleShot) {
|
||||
sigset_t block, oldmask;
|
||||
struct sigaction oldalrm;
|
||||
struct itimerval it = {{0, 0}, {0, 10000}};
|
||||
struct sigaction sa = {.sa_sigaction = OnSigAlrm,
|
||||
.sa_flags = SA_RESETHAND | SA_SIGINFO};
|
||||
gotsig = false;
|
||||
sigemptyset(&block);
|
||||
sigaddset(&block, SIGALRM);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &block, &oldmask));
|
||||
ASSERT_EQ(0, sigaction(SIGALRM, &sa, &oldalrm));
|
||||
ASSERT_EQ(0, setitimer(ITIMER_REAL, &it, 0));
|
||||
sigdelset(&block, SIGALRM);
|
||||
EXPECT_EQ(-1, sigsuspend(&block));
|
||||
EXPECT_EQ(0, sigprocmask(SIG_SETMASK, &oldmask, 0));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR1, &oldalrm, 0));
|
||||
EXPECT_EQ(true, gotsig);
|
||||
}
|
||||
77
test/libc/calls/sigprocmask_test.c
Normal file
77
test/libc/calls/sigprocmask_test.c
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/*-*- 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 2022 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/calls/calls.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/calls/ucontext.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
int n;
|
||||
|
||||
void OnSig(int sig, siginfo_t *si, ucontext_t *ctx) {
|
||||
++n;
|
||||
}
|
||||
|
||||
TEST(sigprocmask, testMultipleBlockedDeliveries) {
|
||||
int pid, ws;
|
||||
sigset_t neu, old;
|
||||
struct sigaction oldusr1, oldusr2;
|
||||
struct sigaction sa = {.sa_sigaction = OnSig, .sa_flags = SA_SIGINFO};
|
||||
n = 0;
|
||||
sigemptyset(&neu);
|
||||
sigaddset(&neu, SIGUSR1);
|
||||
sigaddset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &neu, &old));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR1, &sa, &oldusr1));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR2, &sa, &oldusr2));
|
||||
ASSERT_EQ(0, raise(SIGUSR1));
|
||||
ASSERT_EQ(0, raise(SIGUSR2));
|
||||
EXPECT_EQ(0, n);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_SETMASK, &old, NULL));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR1, &oldusr1, 0));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR2, &oldusr2, 0));
|
||||
ASSERT_EQ(2, n);
|
||||
}
|
||||
|
||||
TEST(sigprocmask, testMultipleBlockedDeliveriesOfSameSignal) {
|
||||
int pid, ws;
|
||||
sigset_t neu, old;
|
||||
struct sigaction oldusr2;
|
||||
struct sigaction sa = {.sa_sigaction = OnSig, .sa_flags = SA_SIGINFO};
|
||||
n = 0;
|
||||
sigemptyset(&neu);
|
||||
sigaddset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &neu, &old));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR2, &sa, &oldusr2));
|
||||
ASSERT_EQ(0, raise(SIGUSR2));
|
||||
ASSERT_EQ(0, raise(SIGUSR2));
|
||||
EXPECT_EQ(0, n);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_SETMASK, &old, NULL));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR2, &oldusr2, 0));
|
||||
if (IsFreebsd() || IsWindows()) {
|
||||
EXPECT_EQ(2, n);
|
||||
} else {
|
||||
EXPECT_EQ(1, n);
|
||||
}
|
||||
}
|
||||
120
test/libc/calls/sigsuspend_test.c
Normal file
120
test/libc/calls/sigsuspend_test.c
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
/*-*- 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 2022 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/calls/calls.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "libc/x/x.h"
|
||||
|
||||
volatile bool gotsig1;
|
||||
volatile bool gotsig2;
|
||||
volatile bool finished;
|
||||
|
||||
void OnSigQueuing(int sig, siginfo_t *si, ucontext_t *ctx) {
|
||||
if (!finished) {
|
||||
EXPECT_EQ(SIGUSR2, sig);
|
||||
EXPECT_EQ(SIGUSR2, si->si_signo);
|
||||
gotsig2 = true;
|
||||
} else {
|
||||
EXPECT_EQ(SIGUSR1, sig);
|
||||
EXPECT_EQ(SIGUSR1, si->si_signo);
|
||||
gotsig1 = true;
|
||||
}
|
||||
}
|
||||
|
||||
TEST(sigsuspend, testSignalQueuingSelf) {
|
||||
if (IsWindows()) {
|
||||
// xxx: probably need a signal server to do this kind of signalling
|
||||
return;
|
||||
}
|
||||
sigset_t neu, old, bits;
|
||||
struct sigaction oldusr1, oldusr2;
|
||||
struct sigaction sa = {.sa_sigaction = OnSigQueuing, .sa_flags = SA_SIGINFO};
|
||||
gotsig1 = false;
|
||||
gotsig2 = false;
|
||||
finished = false;
|
||||
sigemptyset(&neu);
|
||||
sigaddset(&neu, SIGUSR1);
|
||||
sigaddset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &neu, &old));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR1, &sa, &oldusr1));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR2, &sa, &oldusr2));
|
||||
raise(SIGUSR1);
|
||||
raise(SIGUSR2);
|
||||
sigdelset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(false, gotsig2);
|
||||
memcpy(&bits, &neu, sizeof(bits));
|
||||
ASSERT_EQ(-1, sigsuspend(&neu)); // raises SIGUSR2
|
||||
EXPECT_EQ(0, memcmp(&bits, &neu, sizeof(bits))); // constness respected
|
||||
EXPECT_EQ(EINTR, errno);
|
||||
EXPECT_EQ(true, gotsig2);
|
||||
EXPECT_EQ(false, gotsig1);
|
||||
finished = true;
|
||||
EXPECT_EQ(0, sigprocmask(SIG_SETMASK, &old, NULL)); // raises SIGUSR1
|
||||
EXPECT_EQ(true, gotsig1);
|
||||
EXPECT_EQ(0, sigaction(SIGUSR1, &oldusr1, 0));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR2, &oldusr2, 0));
|
||||
}
|
||||
|
||||
TEST(sigsuspend, testSignalQueuingIpc) {
|
||||
if (IsWindows()) {
|
||||
// xxx: probably need a signal server to do this kind of signalling
|
||||
return;
|
||||
}
|
||||
int pid, ws;
|
||||
sigset_t neu, old, bits;
|
||||
struct sigaction oldusr1, oldusr2;
|
||||
struct sigaction sa = {.sa_sigaction = OnSigQueuing, .sa_flags = SA_SIGINFO};
|
||||
gotsig1 = false;
|
||||
gotsig2 = false;
|
||||
finished = false;
|
||||
sigemptyset(&neu);
|
||||
sigaddset(&neu, SIGUSR1);
|
||||
sigaddset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &neu, &old));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR1, &sa, &oldusr1));
|
||||
ASSERT_EQ(0, sigaction(SIGUSR2, &sa, &oldusr2));
|
||||
pid = getpid();
|
||||
ASSERT_NE(-1, (ws = xspawn(0)));
|
||||
if (ws == -2) {
|
||||
kill(pid, SIGUSR1);
|
||||
kill(pid, SIGUSR2);
|
||||
_exit(0);
|
||||
}
|
||||
sigdelset(&neu, SIGUSR2);
|
||||
EXPECT_EQ(false, gotsig2);
|
||||
memcpy(&bits, &neu, sizeof(bits));
|
||||
ASSERT_EQ(-1, sigsuspend(&neu)); // raises SIGUSR2
|
||||
EXPECT_EQ(0, memcmp(&bits, &neu, sizeof(bits))); // constness respected
|
||||
EXPECT_EQ(EINTR, errno);
|
||||
EXPECT_EQ(true, gotsig2);
|
||||
EXPECT_EQ(false, gotsig1);
|
||||
finished = true;
|
||||
EXPECT_EQ(0, sigprocmask(SIG_SETMASK, &old, NULL)); // raises SIGUSR1
|
||||
EXPECT_EQ(true, gotsig1);
|
||||
EXPECT_EQ(0, sigaction(SIGUSR1, &oldusr1, 0));
|
||||
EXPECT_EQ(0, sigaction(SIGUSR2, &oldusr2, 0));
|
||||
}
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
#include "libc/time/time.h"
|
||||
|
||||
TEST(select, allZero) {
|
||||
/* blocks indefinitely not worth supporting */
|
||||
/* EXPECT_SYS(0, 0, select(0, 0, 0, 0, 0)); */
|
||||
// todo: figure out how to test block until signal w/ select
|
||||
// EXPECT_SYS(0, 0, select(0, 0, 0, 0, 0));
|
||||
}
|
||||
|
||||
TEST(select, testSleep) {
|
||||
|
|
@ -35,8 +35,7 @@ TEST(select, testSleep) {
|
|||
EXPECT_SYS(0, 0, select(0, 0, 0, 0, &t));
|
||||
e = (nowl() - n) * 1e6;
|
||||
EXPECT_GT(e, 1000);
|
||||
if (!IsBsd()) {
|
||||
/* maybe we should polyfill */
|
||||
if (IsLinux()) {
|
||||
EXPECT_EQ(0, t.tv_sec);
|
||||
EXPECT_EQ(0, t.tv_usec);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*-*- 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 2020 Justine Alexandra Roberts Tunney │
|
||||
│ Copyright 2022 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 │
|
||||
|
|
@ -16,32 +16,18 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/calls/struct/sigset.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/nexgen32e/nexgen32e.h"
|
||||
#include "libc/sysv/consts/clock.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "libc/time/time.h"
|
||||
#include "libc/x/x.h"
|
||||
|
||||
TEST(fastdiv, test) {
|
||||
long x = 123000000321;
|
||||
EXPECT_EQ(123, div1000000000int64(x));
|
||||
EXPECT_EQ(321, rem1000000000int64(x));
|
||||
}
|
||||
|
||||
TEST(dsleep, test) {
|
||||
long double t1, t2;
|
||||
sigset_t mask, oldmask;
|
||||
sigfillset(&mask);
|
||||
sigprocmask(SIG_BLOCK, &mask, &oldmask);
|
||||
sched_yield();
|
||||
t1 = dtime(CLOCK_MONOTONIC);
|
||||
dsleep(0.001L);
|
||||
t2 = dtime(CLOCK_MONOTONIC);
|
||||
sigprocmask(SIG_SETMASK, &oldmask, NULL);
|
||||
ASSERT_LDBL_GT(t2 - t1, 0.0005L);
|
||||
TEST(strsignal, test) {
|
||||
EXPECT_STREQ("SIGUNKNOWN", strsignal(0));
|
||||
EXPECT_STREQ("SIGINT", strsignal(SIGINT));
|
||||
EXPECT_STREQ("SIGQUIT", strsignal(SIGQUIT));
|
||||
EXPECT_STREQ("SIGALRM", strsignal(SIGALRM));
|
||||
EXPECT_STREQ("SIGUSR1", strsignal(SIGUSR1));
|
||||
EXPECT_STREQ("SIGSTOP", strsignal(SIGSTOP));
|
||||
EXPECT_STREQ("SIG099", strsignal(99));
|
||||
EXPECT_STREQ("SIG100", strsignal(100));
|
||||
EXPECT_STREQ("SIGWUT", strsignal(-1));
|
||||
EXPECT_STREQ("SIGWUT", strsignal(9001));
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue