From owner-svn-src-all@FreeBSD.ORG  Tue Aug 17 02:50:13 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 207051065694;
	Tue, 17 Aug 2010 02:50:13 +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 105048FC20;
	Tue, 17 Aug 2010 02:50:13 +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 o7H2oChu016464;
	Tue, 17 Aug 2010 02:50:12 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7H2oCa8016462;
	Tue, 17 Aug 2010 02:50:12 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201008170250.o7H2oCa8016462@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Tue, 17 Aug 2010 02:50:12 +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: r211409 - head/lib/libthr/thread
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Aug 2010 02:50:13 -0000

Author: davidxu
Date: Tue Aug 17 02:50:12 2010
New Revision: 211409
URL: http://svn.freebsd.org/changeset/base/211409

Log:
  Tweak code a bit to be POSIX compatible, when a cancellation request
  is acted upon, or when a thread calls pthread_exit(), the thread first
  disables cancellation by setting its cancelability state to
  PTHREAD_CANCEL_DISABLE and its cancelability type to
  PTHREAD_CANCEL_DEFERRED. The cancelability state remains set to
  PTHREAD_CANCEL_DISABLE until the thread has terminated.
  
  It has no effect if a cancellation cleanup handler or thread-specific
  data destructor routine changes the cancelability state to
  PTHREAD_CANCEL_ENABLE.

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

Modified: head/lib/libthr/thread/thr_exit.c
==============================================================================
--- head/lib/libthr/thread/thr_exit.c	Mon Aug 16 22:23:19 2010	(r211408)
+++ head/lib/libthr/thread/thr_exit.c	Tue Aug 17 02:50:12 2010	(r211409)
@@ -81,6 +81,8 @@ _pthread_exit(void *status)
 
 	/* Flag this thread as exiting. */
 	curthread->cancelling = 1;
+	curthread->cancel_enable = 0;
+	curthread->cancel_async = 0;
 	
 	_thr_exit_cleanup();