diff options
| author | davidxu <davidxu@FreeBSD.org> | 2010-09-24 07:52:07 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2010-09-24 07:52:07 +0000 |
| commit | 722a516400bd9a03211f28a90b2dd42b7dce5d0e (patch) | |
| tree | cbbca5f7206c7ad83e07597815477b6c62599da9 /lib/libthr/thread/thr_cancel.c | |
| parent | cc9d3a376dc5d0be14e05fa9543b5d21203c46ec (diff) | |
| download | FreeBSD-src-722a516400bd9a03211f28a90b2dd42b7dce5d0e.zip FreeBSD-src-722a516400bd9a03211f28a90b2dd42b7dce5d0e.tar.gz | |
In most cases, cancel_point and cancel_async needn't be checked again,
because cancellation is almostly checked at cancellation points.
Diffstat (limited to 'lib/libthr/thread/thr_cancel.c')
| -rw-r--r-- | lib/libthr/thread/thr_cancel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 6a6e9ec..8552e57 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -131,9 +131,7 @@ _pthread_testcancel(void) { struct pthread *curthread = _get_curthread(); - curthread->cancel_point = 1; testcancel(curthread); - curthread->cancel_point = 0; } void @@ -159,7 +157,7 @@ _thr_cancel_enter2(struct pthread *curthread, int maycancel) void _thr_cancel_leave(struct pthread *curthread, int maycancel) { + curthread->cancel_point = 0; if (maycancel) testcancel(curthread); - curthread->cancel_point = 0; } |
