From owner-svn-src-head@FreeBSD.ORG  Fri Sep 24 13:01:01 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D86F41065693;
	Fri, 24 Sep 2010 13:01:01 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C72D78FC13;
	Fri, 24 Sep 2010 13:01:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8OD117F020782;
	Fri, 24 Sep 2010 13:01:01 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OD11dr020780;
	Fri, 24 Sep 2010 13:01:01 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201009241301.o8OD11dr020780@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Fri, 24 Sep 2010 13:01:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213100 - head/lib/libthr/thread
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Sep 2010 13:01:01 -0000

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