PERFORCE change 177159 for review

[Jonathan Anderson]

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

Change 177159 by jona at 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);