From owner-svn-src-head@FreeBSD.ORG  Thu Apr 18 05:56:01 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 44CA19B;
 Thu, 18 Apr 2013 05:56:01 +0000 (UTC)
 (envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 37F56CDF;
 Thu, 18 Apr 2013 05:56:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3I5u1IJ021810;
 Thu, 18 Apr 2013 05:56:01 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3I5u1Yd021809;
 Thu, 18 Apr 2013 05:56:01 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201304180556.r3I5u1Yd021809@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Thu, 18 Apr 2013 05:56:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249606 - head/lib/libthr/thread
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 18 Apr 2013 05:56:01 -0000

Author: davidxu
Date: Thu Apr 18 05:56:00 2013
New Revision: 249606
URL: http://svnweb.freebsd.org/changeset/base/249606

Log:
  Avoid copying memory if SIGCANCEL is not masked.

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

Modified: head/lib/libthr/thread/thr_sig.c
==============================================================================
--- head/lib/libthr/thread/thr_sig.c	Thu Apr 18 05:34:33 2013	(r249605)
+++ head/lib/libthr/thread/thr_sig.c	Thu Apr 18 05:56:00 2013	(r249606)
@@ -732,8 +732,12 @@ _setcontext(const ucontext_t *ucp)
 {
 	ucontext_t uc;
 
+	if (ucp == NULL)
+		return (EINVAL);
+	if (!SIGISMEMBER(uc.uc_sigmask, SIGCANCEL))
+		return __sys_setcontext(ucp);
 	(void) memcpy(&uc, ucp, sizeof(uc));
-	remove_thr_signals(&uc.uc_sigmask);
+	SIGDELSET(uc.uc_sigmask, SIGCANCEL);
 	return __sys_setcontext(&uc);
 }
 
@@ -743,7 +747,13 @@ _swapcontext(ucontext_t *oucp, const uco
 {
 	ucontext_t uc;
 
-	(void) memcpy(&uc, ucp, sizeof(uc));
-	remove_thr_signals(&uc.uc_sigmask);
-	return __sys_swapcontext(oucp, &uc);
+	if (oucp == NULL || ucp == NULL)
+		return (EINVAL);
+	if (SIGISMEMBER(ucp->uc_sigmask, SIGCANCEL)) {
+	 	stdout_debug("remove SIGCANCEL\n");	
+		(void) memcpy(&uc, ucp, sizeof(uc));
+		SIGDELSET(uc.uc_sigmask, SIGCANCEL);
+		ucp = &uc;
+	}
+	return __sys_swapcontext(oucp, ucp);
 }