From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  1 14:47:46 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1484106564A;
	Tue,  1 Jun 2010 14:47:46 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A0EBD8FC14;
	Tue,  1 Jun 2010 14:47:46 +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 o51ElkOL061379;
	Tue, 1 Jun 2010 14:47:46 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51ElkP6061376;
	Tue, 1 Jun 2010 14:47:46 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006011447.o51ElkP6061376@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jun 2010 14:47:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208705 - projects/capabilities8/libexec/rtld-elf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jun 2010 14:47:46 -0000

Author: rwatson
Date: Tue Jun  1 14:47:46 2010
New Revision: 208705
URL: http://svn.freebsd.org/changeset/base/208705

Log:
  Merge 177159 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    More locks (for synchronizing FD lists like library directories and
    preload libraries.
  
  Submitted by:	jona

Modified:
  projects/capabilities8/libexec/rtld-elf/rtld_lock.c
  projects/capabilities8/libexec/rtld-elf/rtld_lock.h

Modified: projects/capabilities8/libexec/rtld-elf/rtld_lock.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld_lock.c	Tue Jun  1 14:42:15 2010	(r208704)
+++ projects/capabilities8/libexec/rtld-elf/rtld_lock.c	Tue Jun  1 14:47:46 2010	(r208705)
@@ -173,7 +173,7 @@ thread_mask_clear(int mask)
 	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 @@ struct rtld_lock {
 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)

Modified: projects/capabilities8/libexec/rtld-elf/rtld_lock.h
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld_lock.h	Tue Jun  1 14:42:15 2010	(r208704)
+++ projects/capabilities8/libexec/rtld-elf/rtld_lock.h	Tue Jun  1 14:47:46 2010	(r208705)
@@ -56,6 +56,8 @@ typedef struct rtld_lock *rtld_lock_t;
 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);