svn commit: r213100 - head/lib/libthr/thread

[David Xu]

Author: davidxu
Date: Fri Sep 24 13:01:01 2010
New Revision: 213100
URL: http://svn.freebsd.org/changeset/base/213100

Log:
  inline testcancel() into thr_cancel_leave(), because cancel_pending is
  almost false, this makes a slight better branch predicting.

Modified:
  head/lib/libthr/thread/thr_cancel.c

Modified: head/lib/libthr/thread/thr_cancel.c
==============================================================================
--- head/lib/libthr/thread/thr_cancel.c	Fri Sep 24 10:40:17 2010	(r213099)
+++ head/lib/libthr/thread/thr_cancel.c	Fri Sep 24 13:01:01 2010	(r213100)
@@ -158,6 +158,7 @@ void
 _thr_cancel_leave(struct pthread *curthread, int maycancel)
 {
 	curthread->cancel_point = 0;
-	if (maycancel)
-		testcancel(curthread);
+	if (__predict_false(SHOULD_CANCEL(curthread) &&
+	    !THR_IN_CRITICAL(curthread) && maycancel))
+		_pthread_exit(PTHREAD_CANCELED);
 }