d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check cancellation state carefully to see we really need to call

Browse Source 
_pthread_testcancel(). Preserve errno in _thr_suspend_check().
This commit is contained in:
David Xu 2006-03-26 01:57:03 +00:00
parent e61dc6cac4
commit d448272d3c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libthr/thread/thr_sig.c
View File

@ -57,8 +57,8 @@ void
_thr_ast(struct pthread *curthread)
{
if (!THR_IN_CRITICAL(curthread)) {
if (__predict_false(curthread->cancelflags &
THR_CANCEL_AT_POINT))
if (__predict_false(
SHOULD_ASYNC_CANCEL(curthread->cancelflags)))
_pthread_testcancel();
if (__predict_false((curthread->flags &
(THR_FLAGS_NEED_SUSPEND | THR_FLAGS_SUSPENDED))
@ -71,7 +71,9 @@ void
_thr_suspend_check(struct pthread *curthread)
{
umtx_t cycle;
int err;
err = errno;
/*
* Blocks SIGCANCEL which other threads must send.
*/
@ -115,6 +117,7 @@ _thr_suspend_check(struct pthread *curthread)
* have one nesting signal frame, this should be fine.
*/
_thr_signal_unblock(curthread);
errno = err;
}
void