Introduce sigtimedwait() on Windows

This commit is contained in:
Justine Tunney 2024-09-14 20:32:46 -07:00
parent 37e2660c7f
commit c260144843
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
17 changed files with 280 additions and 130 deletions

View file

@ -100,8 +100,6 @@ TEST(commandv, test_DirPaths_wontConsiderDirectoriesExecutable2) {
}
TEST(commandv, test_nonExecutableFile_willEacces) {
if (IsWindows())
return; // TODO: fixme
setenv("PATH", "foo", true);
EXPECT_SYS(0, 0, mkdir("foo", 0755));
EXPECT_SYS(0, 0, touch("foo/bar", 0400));

View file

@ -59,11 +59,9 @@ void *TortureWorker(void *arg) {
ASSERT_SYS(0, 0, sigprocmask(SIG_SETMASK, &ss, 0));
ready = true;
while (!done) {
if (!IsWindows())
pthread_kill(parent, SIGUSR1);
pthread_kill(parent, SIGUSR1);
usleep(1);
if (!IsWindows())
pthread_kill(parent, SIGUSR2);
pthread_kill(parent, SIGUSR2);
usleep(1);
}
return 0;

View file

@ -17,6 +17,7 @@
PERFORMANCE OF THIS SOFTWARE.
*/
#include "libc/calls/sigtimedwait.h"
#include "libc/atomic.h"
#include "libc/calls/calls.h"
#include "libc/calls/struct/siginfo.h"
#include "libc/calls/struct/siginfo.internal.h"
@ -28,22 +29,17 @@
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "libc/testlib/testlib.h"
#include "libc/thread/thread.h"
void SetUp(void) {
if (IsXnu())
exit(0);
if (IsMetal())
exit(0);
if (IsWindows())
exit(0);
if (IsOpenbsd())
exit(0);
}
TEST(sigtimedwait, nullSet_efault) {
ASSERT_SYS(EFAULT, -1, sigtimedwait(0, 0, 0));
}
TEST(sigtimedwait, emptySet_timesOut) {
sigset_t ss = {0};
struct timespec ts = {0, 0};
@ -56,24 +52,28 @@ TEST(sigtimedwait, badTimestamp_einval) {
ASSERT_SYS(EINVAL, -1, sigtimedwait(&ss, 0, &ts));
}
TEST(sigtimedwait, test) {
int pid, ws;
atomic_bool g_ready;
void *worker(void *arg) {
sigset_t ss;
siginfo_t info;
sigset_t ss, oldss;
struct timespec ts = {1, 0};
sigemptyset(&ss);
sigaddset(&ss, SIGUSR1);
ASSERT_SYS(0, 0, sigprocmask(SIG_BLOCK, &ss, &oldss));
ASSERT_NE(-1, (pid = fork()));
if (!pid) {
ASSERT_SYS(0, SIGUSR1, sigtimedwait(&ss, &info, &ts));
ASSERT_EQ(SIGUSR1, info.si_signo);
ASSERT_EQ(SI_USER, info.si_code);
ASSERT_EQ(getuid(), info.si_uid);
_Exit(0);
}
ASSERT_SYS(0, 0, kill(pid, SIGUSR1));
ASSERT_SYS(0, pid, wait(&ws));
ASSERT_EQ(0, ws);
ASSERT_SYS(0, 0, sigprocmask(SIG_SETMASK, &oldss, 0));
ASSERT_EQ(0, sigemptyset(&ss));
ASSERT_EQ(0, sigaddset(&ss, SIGUSR1));
ASSERT_SYS(0, 0, sigprocmask(SIG_BLOCK, &ss, 0));
g_ready = true;
ASSERT_SYS(0, SIGUSR1, sigtimedwait(&ss, &info, 0));
ASSERT_EQ(SIGUSR1, info.si_signo);
ASSERT_EQ(SI_TKILL, info.si_code);
ASSERT_EQ(getuid(), info.si_uid);
return 0;
}
TEST(sigtimedwait, test) {
pthread_t th;
ASSERT_EQ(0, pthread_create(&th, 0, worker, 0));
for (;;)
if (g_ready)
break;
ASSERT_EQ(0, pthread_kill(th, SIGUSR1));
ASSERT_EQ(0, pthread_join(th, 0));
}

View file

@ -103,8 +103,6 @@ TEST(pthread_cancel, synchronous) {
TEST(pthread_cancel, synchronous_deferred) {
void *rc;
pthread_t th;
if (!IsWindows())
return;
ASSERT_SYS(0, 0, pipe(pfds));
ASSERT_EQ(0, pthread_create(&th, 0, Worker, 0));
while (!ready)

View file

@ -193,8 +193,6 @@ void *SocketAcceptWorker(void *arg) {
}
TEST(pthread_kill, canInterruptSocketAcceptOperation) {
if (IsWindows())
return; // TODO(jart): BAH
pthread_t t;
struct sigaction oldsa;
struct sigaction sa = {.sa_handler = OnSig};