svn commit: r252245 - stable/9/lib/libthr/thread

[Konstantin Belousov]

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);