From owner-p4-projects@FreeBSD.ORG  Wed Apr 21 02:35:30 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE0F91065676; Wed, 21 Apr 2010 02:35:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92547106566C
	for <perforce@FreeBSD.org>; Wed, 21 Apr 2010 02:35:30 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 807C78FC1A
	for <perforce@FreeBSD.org>; Wed, 21 Apr 2010 02:35:30 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3L2ZU1N027544
	for <perforce@FreeBSD.org>; Wed, 21 Apr 2010 02:35:30 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3L2ZUmk027542
	for perforce@freebsd.org; Wed, 21 Apr 2010 02:35:30 GMT
	(envelope-from jona@FreeBSD.org)
Date: Wed, 21 Apr 2010 02:35:30 GMT
Message-Id: <201004210235.o3L2ZUmk027542@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177159 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Apr 2010 02:35:31 -0000

http://p4web.freebsd.org/@@177159?ac=10

Change 177159 by jona@jona-belle-freebsd8 on 2010/04/21 02:34:57

	More locks (for synchronizing FD lists like library directories and preload libraries

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.c#5 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.c#5 (text+ko) ====

@@ -173,7 +173,7 @@
 	lockinfo.thread_clr_flag(mask);
 }
 
-#define	RTLD_LOCK_CNT	3
+#define	RTLD_LOCK_CNT	5
 struct rtld_lock {
 	void	*handle;
 	int	 mask;
@@ -182,6 +182,8 @@
 rtld_lock_t	rtld_bind_lock = &rtld_locks[0];
 rtld_lock_t	rtld_libc_lock = &rtld_locks[1];
 rtld_lock_t	rtld_phdr_lock = &rtld_locks[2];
+rtld_lock_t	rtld_dirs_lock = &rtld_locks[3];
+rtld_lock_t	rtld_preloads_lock = &rtld_locks[4];
 
 int
 rlock_acquire(rtld_lock_t lock)

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld_lock.h#4 (text+ko) ====

@@ -56,6 +56,8 @@
 extern rtld_lock_t	rtld_bind_lock;
 extern rtld_lock_t	rtld_libc_lock;
 extern rtld_lock_t	rtld_phdr_lock;
+extern rtld_lock_t	rtld_dirs_lock;
+extern rtld_lock_t	rtld_preloads_lock;
 
 int	rlock_acquire(rtld_lock_t);
 int 	wlock_acquire(rtld_lock_t);