svn commit: r208705 - projects/capabilities8/libexec/rtld-elf

[Robert Watson]

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);