svn commit: r263258 - stable/10/lib/libc/gen

[David Xu]

Author: davidxu
Date: Mon Mar 17 05:03:53 2014
New Revision: 263258
URL: http://svnweb.freebsd.org/changeset/base/263258

Log:
  MFC r263107:
  
  To avoid missing a chance to cancel thread, call _pthread_testcancel at the
  beginning of _sem_timedwait.
  
  Submitted by:	Eric van Gyzen < eric at vangyzen dot net >

Modified:
  stable/10/lib/libc/gen/sem_new.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/gen/sem_new.c
==============================================================================
--- stable/10/lib/libc/gen/sem_new.c	Mon Mar 17 04:38:10 2014	(r263257)
+++ stable/10/lib/libc/gen/sem_new.c	Mon Mar 17 05:03:53 2014	(r263258)
@@ -381,6 +381,7 @@ _sem_timedwait(sem_t * __restrict sem,
 		return (-1);
 
 	retval = 0;
+	_pthread_testcancel();
 	for (;;) {
 		while ((val = sem->_kern._count) > 0) {
 			if (atomic_cmpset_acq_int(&sem->_kern._count, val, val - 1))