diff options
| author | davidxu <davidxu@FreeBSD.org> | 2006-12-05 05:01:57 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2006-12-05 05:01:57 +0000 |
| commit | 19c999e75fbde10d2803892046968bccc1b5d309 (patch) | |
| tree | 5dfa824ffb9df1de743ede58c0b06ea1f4ec582a /lib/libthr | |
| parent | 8d87f5baaa75c2a2b7056fbb972938279cee88f7 (diff) | |
| download | FreeBSD-src-19c999e75fbde10d2803892046968bccc1b5d309.zip FreeBSD-src-19c999e75fbde10d2803892046968bccc1b5d309.tar.gz | |
Tweak _thr_cancel_leave_defer a bit to fix a possible race.
Diffstat (limited to 'lib/libthr')
| -rw-r--r-- | lib/libthr/thread/thr_cancel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 3222948..bf93fdc 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -170,9 +170,13 @@ void _thr_cancel_leave_defer(struct pthread *curthread, int check) { if (curthread->cancel_enable) { - curthread->cancel_defer--; - if (check) + if (!check) { + curthread->cancel_point--; + curthread->cancel_defer--; + } else { + curthread->cancel_defer--; testcancel(curthread); - curthread->cancel_point--; + curthread->cancel_point--; + } } } |
