From owner-svn-src-head@FreeBSD.ORG  Mon Dec  1 21:00:25 2008
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 C50FF10656E4;
	Mon,  1 Dec 2008 21:00:25 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B0E548FC1D;
	Mon,  1 Dec 2008 21:00:25 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB1L0Puu037143;
	Mon, 1 Dec 2008 21:00:25 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB1L0Pec037142;
	Mon, 1 Dec 2008 21:00:25 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <200812012100.mB1L0Pec037142@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Mon, 1 Dec 2008 21:00:25 +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: r185531 - 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: Mon, 01 Dec 2008 21:00:25 -0000

Author: kan
Date: Mon Dec  1 21:00:25 2008
New Revision: 185531
URL: http://svn.freebsd.org/changeset/base/185531

Log:
  Invoke _rtld_atfork_post earlier, before we reinitialize rtld locks
  by switching into single-thread mode.
  
  libthr ignores broken use of lock bitmaps used by default rtld locking
  implementation, this in turn turns lock handoff in _rtld_thread_init
  into NOP. This in turn makes child processes of forked multi-threaded
  programs to run with _thr_signal_block still in effect, with most
  signals blocked.
  
  Reported by: phk, kib

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

Modified: head/lib/libthr/thread/thr_fork.c
==============================================================================
--- head/lib/libthr/thread/thr_fork.c	Mon Dec  1 20:33:22 2008	(r185530)
+++ head/lib/libthr/thread/thr_fork.c	Mon Dec  1 21:00:25 2008	(r185531)
@@ -158,6 +158,9 @@ _fork(void)
 		/* clear other threads locked us. */
 		_thr_umutex_init(&curthread->lock);
 		_thr_umutex_init(&_thr_atfork_lock);
+
+		if (unlock_malloc)
+			_rtld_atfork_post(rtld_locks);
 		_thr_setthreaded(0);
 
 		/* reinitialize libc spinlocks. */
@@ -170,10 +173,8 @@ _fork(void)
 		/* Ready to continue, unblock signals. */ 
 		_thr_signal_unblock(curthread);
 
-		if (unlock_malloc) {
-			_rtld_atfork_post(rtld_locks);
+		if (unlock_malloc)
 			_malloc_postfork();
-		}
 
 		/* Run down atfork child handlers. */
 		TAILQ_FOREACH(af, &_thr_atfork_list, qe) {