diff options
| author | davidxu <davidxu@FreeBSD.org> | 2003-07-17 23:02:30 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2003-07-17 23:02:30 +0000 |
| commit | 8cbb5ce67318a92b9504e120b732fb3b549c6023 (patch) | |
| tree | 501dc66c4a1aec9b0ce29190b9613a1163a1f18a /lib/libkse/thread/thr_cancel.c | |
| parent | 97d2d9dfed7fc1f9fa26e38c42c4de810d167012 (diff) | |
| download | FreeBSD-src-8cbb5ce67318a92b9504e120b732fb3b549c6023.zip FreeBSD-src-8cbb5ce67318a92b9504e120b732fb3b549c6023.tar.gz | |
o Eliminate upcall for PTHREAD_SYSTEM_SCOPE thread, now it
is system bound thread and when it is blocked, no upcall is generated.
o Add ability to libkse to allow it run in pure 1:1 threading mode,
defining SYSTEM_SCOPE_ONLY in Makefile can turn on this option.
o Eliminate code for installing dummy signal handler for sigwait call.
o Add hash table to find thread.
Reviewed by: deischen
Diffstat (limited to 'lib/libkse/thread/thr_cancel.c')
| -rw-r--r-- | lib/libkse/thread/thr_cancel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libkse/thread/thr_cancel.c b/lib/libkse/thread/thr_cancel.c index 905891c..731a9aa 100644 --- a/lib/libkse/thread/thr_cancel.c +++ b/lib/libkse/thread/thr_cancel.c @@ -107,9 +107,11 @@ _pthread_cancel(pthread_t pthread) /* Ignore - only here to silence -Wall: */ break; } - if ((pthread->blocked != 0) && - ((pthread->cancelflags & THR_AT_CANCEL_POINT) != 0)) - kse_thr_interrupt(&pthread->tmbx, -1); + if ((pthread->cancelflags & THR_AT_CANCEL_POINT) && + (pthread->blocked != 0 || + pthread->attr.flags & PTHREAD_SCOPE_SYSTEM)) + kse_thr_interrupt(&pthread->tmbx, + KSE_INTR_INTERRUPT, 0); } /* |
