Date: Wed, 26 Jun 2013 05:49:29 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252245 - stable/9/lib/libthr/thread Message-ID: <201306260549.r5Q5nTU6004625@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Wed Jun 26 05:49:29 2013 New Revision: 252245 URL: http://svnweb.freebsd.org/changeset/base/252245 Log: MFC r251985: When enabling the cancellation, only process the pending cancellation for asynchronous mode. Modified: stable/9/lib/libthr/thread/thr_cancel.c Directory Properties: stable/9/lib/libthr/ (props changed) Modified: stable/9/lib/libthr/thread/thr_cancel.c ============================================================================== --- stable/9/lib/libthr/thread/thr_cancel.c Wed Jun 26 05:36:51 2013 (r252244) +++ stable/9/lib/libthr/thread/thr_cancel.c Wed Jun 26 05:49:29 2013 (r252245) @@ -87,7 +87,8 @@ _pthread_setcancelstate(int state, int * break; case PTHREAD_CANCEL_ENABLE: curthread->cancel_enable = 1; - testcancel(curthread); + if (curthread->cancel_async) + testcancel(curthread); break; default: return (EINVAL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306260549.r5Q5nTU6004625>