diff options
author | David Xu <davidxu@FreeBSD.org> | 2006-03-25 07:03:13 +0000 |
---|---|---|
committer | David Xu <davidxu@FreeBSD.org> | 2006-03-25 07:03:13 +0000 |
commit | efe33769b93d454351d019ba350a4f154c13aef2 (patch) | |
tree | 5951d42ff621276a0fff42db924d4ff4ccc08a27 /lib | |
parent | 0472dafab462b093820e2e08713da885ac4a6d45 (diff) | |
download | src-efe33769b93d454351d019ba350a4f154c13aef2.tar.gz src-efe33769b93d454351d019ba350a4f154c13aef2.zip |
Don't cancel thread if it is in critical region.
Notes
Notes:
svn path=/head/; revision=157116
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libthr/thread/thr_cancel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 5a3960ee1484..bedfaa9f18df 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -77,7 +77,7 @@ testcancel(struct pthread *curthread) int newval; newval = curthread->cancelflags; - if (SHOULD_CANCEL(newval)) + if (SHOULD_CANCEL(newval) && !THR_IN_CRITICAL(curthread)) pthread_exit(PTHREAD_CANCELED); } |