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

[David Xu]

Author: davidxu
Date: Wed Nov 23 00:01:45 2011
New Revision: 227853
URL: http://svn.freebsd.org/changeset/base/227853

Log:
  MFC r227604:
  Pass CVWAIT flags to kernel, this should handle
  Timeout correctly for pthread_cond_timedwait when
  it uses kernel-based condition variable.
  
  Approved by:	re (kib)

Modified:
  stable/9/lib/libthr/thread/thr_umtx.c
Directory Properties:
  stable/9/lib/libthr/   (props changed)

Modified: stable/9/lib/libthr/thread/thr_umtx.c
==============================================================================
--- stable/9/lib/libthr/thread/thr_umtx.c	Tue Nov 22 23:46:56 2011	(r227852)
+++ stable/9/lib/libthr/thread/thr_umtx.c	Wed Nov 23 00:01:45 2011	(r227853)
@@ -231,7 +231,7 @@ _thr_ucond_init(struct ucond *cv)
 
 int
 _thr_ucond_wait(struct ucond *cv, struct umutex *m,
-	const struct timespec *timeout, int check_unparking)
+	const struct timespec *timeout, int flags)
 {
 	if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 &&
 	    timeout->tv_nsec <= 0))) {
@@ -239,8 +239,7 @@ _thr_ucond_wait(struct ucond *cv, struct
 		_thr_umutex_unlock(m, TID(curthread));
                 return (ETIMEDOUT);
 	}
-	return _umtx_op_err(cv, UMTX_OP_CV_WAIT,
-		     check_unparking ? UMTX_CHECK_UNPARKING : 0, 
+	return _umtx_op_err(cv, UMTX_OP_CV_WAIT, flags,
 		     m, __DECONST(void*, timeout));
 }