Date: Fri, 24 Sep 2010 13:01:01 +0000 (UTC) From: David Xu <davidxu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213100 - head/lib/libthr/thread Message-ID: <201009241301.o8OD11dr020780@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009241301.o8OD11dr020780>