mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-03 11:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Unblock stalled i/o signals on windows

Browse source
This commit is contained in:
Justine Tunney 2024-12-29 00:05:59 -08:00
parent aca4214ff6
commit 9ba5b227d9
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libc/intrin/mmap.c
View file

@ -660,7 +660,7 @@ static void *__mmap_impl(char *addr, size_t size, int prot, int flags, int fd,
if (!IsWindows()) {
struct Map *deleted = 0;
__maps_lock();
if (IsWindows() || fixedmode)
if (fixedmode)
if (__muntrack(res.addr, size, &deleted, 0, 0))
STRACE("memtrack compromised by hole punch oom");
__maps_insert(map);

26
libc/intrin/sig.c
View file

@ -492,9 +492,8 @@ textwindows void __sig_generate(int sig, int sic) {
__sig_terminate(sig);
}
if (atomic_load_explicit(__sig.process, memory_order_acquire) &
(1ull << (sig - 1))) {
(1ull << (sig - 1)))
return;
}
_pthread_lock();
for (e = dll_first(_pthread_list); e; e = dll_next(_pthread_list, e)) {
pt = POSIXTHREAD_CONTAINER(e);
@ -503,9 +502,8 @@ textwindows void __sig_generate(int sig, int sic) {
continue;
// we don't want to signal a thread that isn't running
if (atomic_load_explicit(&pt->pt_status, memory_order_acquire) >=
kPosixThreadTerminated) {
kPosixThreadTerminated)
continue;
}
// choose this thread if it isn't masking sig
if (!(atomic_load_explicit(&pt->tib->tib_sigmask, memory_order_acquire) &
(1ull << (sig - 1)))) {
@ -756,11 +754,26 @@ HAIRY static uint32_t __sig_worker(void *arg) {
__sig_generate(sig, SI_KERNEL);
}
// unblock stalled i/o signals in threads
_pthread_lock();
for (struct Dll *e = dll_first(_pthread_list); e;
e = dll_next(_pthread_list, e)) {
struct PosixThread *pt = POSIXTHREAD_CONTAINER(e);
if (atomic_load_explicit(&pt->pt_status, memory_order_acquire) >=
kPosixThreadTerminated)
break;
if (atomic_load_explicit(&pt->pt_blocker, memory_order_acquire) &&
(atomic_load_explicit(&pt->tib->tib_sigpending,
memory_order_acquire) &
~atomic_load_explicit(&pt->pt_blkmask, memory_order_acquire)))
__sig_wake(pt, 0);
}
_pthread_unlock();
// unblock stalled asynchronous signals in threads
struct PosixThread *mark;
for (;;) {
sigset_t pending, mask;
mark = 0;
struct PosixThread *mark = 0;
_pthread_lock();
for (struct Dll *e = dll_first(_pthread_list); e;
e = dll_next(_pthread_list, e)) {
@ -790,6 +803,7 @@ HAIRY static uint32_t __sig_worker(void *arg) {
pending &= ~(1ull << (sig - 1));
__sig_killer(mark, sig, SI_KERNEL);
}
_pthread_unref(mark);
}
// wait until next scheduler quantum