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

Make clock_nanosleep() cancel faster

Browse source
This commit is contained in:
Justine Tunney 2023-11-18 18:12:09 -08:00
parent 0c89516ac5
commit e4dea37b8e
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/calls/checkcancel.c
View file

@ -20,9 +20,8 @@
#include "libc/intrin/atomic.h" #include "libc/intrin/atomic.h"
#include "libc/intrin/weaken.h" #include "libc/intrin/weaken.h"
#include "libc/thread/posixthread.internal.h" #include "libc/thread/posixthread.internal.h"
#ifdef __x86_64__
textwindows int _check_cancel(void) { int _check_cancel(void) {
if (_weaken(_pthread_cancel_ack) && // if (_weaken(_pthread_cancel_ack) && //
_pthread_self() && !(_pthread_self()->pt_flags & PT_NOCANCEL) && _pthread_self() && !(_pthread_self()->pt_flags & PT_NOCANCEL) &&
atomic_load_explicit(&_pthread_self()->pt_canceled, atomic_load_explicit(&_pthread_self()->pt_canceled,
@ -31,5 +30,3 @@ textwindows int _check_cancel(void) {
} }
return 0; return 0;
} }
#endif /* __x86_64__ */

16
libc/calls/clock_nanosleep.c
View file

@ -18,6 +18,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h" #include "libc/assert.h"
#include "libc/calls/cp.internal.h" #include "libc/calls/cp.internal.h"
#include "libc/calls/internal.h"
#include "libc/calls/struct/timespec.h" #include "libc/calls/struct/timespec.h"
#include "libc/calls/struct/timespec.internal.h" #include "libc/calls/struct/timespec.internal.h"
#include "libc/dce.h" #include "libc/dce.h"
@ -27,6 +28,7 @@
#include "libc/intrin/strace.internal.h" #include "libc/intrin/strace.internal.h"
#include "libc/intrin/weaken.h" #include "libc/intrin/weaken.h"
#include "libc/runtime/clktck.h" #include "libc/runtime/clktck.h"
#include "libc/runtime/runtime.h"
#include "libc/sysv/consts/clock.h" #include "libc/sysv/consts/clock.h"
#include "libc/sysv/consts/timer.h" #include "libc/sysv/consts/timer.h"
#include "libc/sysv/errfuns.h" #include "libc/sysv/errfuns.h"
@ -108,9 +110,17 @@ static int cosmo_clock_nanosleep(int clock, int flags,
} }
// spin through final scheduling quantum // spin through final scheduling quantum
do unassert(!clock_gettime(time_clock, &now)); int rc = 0;
while (timespec_cmp(now, deadline) < 0); ftrace_enabled(-1);
return 0; do {
if (_check_cancel()) {
rc = -1;
break;
}
unassert(!clock_gettime(time_clock, &now));
} while (timespec_cmp(now, deadline) < 0);
ftrace_enabled(+1);
return rc;
} }
/** /**