PERFORCE change 99098 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=99098

Change 99098 by jb at jb_freebsd2 on 2006/06/13 00:45:43

	Back out the non-standard functions. These cause upgrade problems.
	I'll need to add them back again if I find code that really needs
	them for anything other than an assert.

Affected files ...

.. //depot/projects/dtrace/src/lib/libpthread/pthread.map#4 edit
.. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#5 edit
.. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libpthread/pthread.map#4 (text+ko) ====

@@ -258,7 +258,6 @@
 	pthread_multi_np;
 	pthread_mutex_destroy;
 	pthread_mutex_getprioceiling;
-	pthread_mutex_held_np;
 	pthread_mutex_init;
 	pthread_mutex_lock;
 	pthread_mutex_setprioceiling;
@@ -281,8 +280,6 @@
 	pthread_resume_all_np;
 	pthread_resume_np;
 	pthread_rwlock_destroy;
-	pthread_rwlock_rdheld_np;
-	pthread_rwlock_wrheld_np;
 	pthread_rwlock_init;
 	pthread_rwlock_rdlock;
 	pthread_rwlock_timedrdlock;

==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#5 (text+ko) ====

@@ -107,8 +107,6 @@
 LT10_COMPAT_DEFAULT(pthread_mutex_destroy);
 LT10_COMPAT_PRIVATE(_pthread_mutex_unlock);
 LT10_COMPAT_DEFAULT(pthread_mutex_unlock);
-LT10_COMPAT_PRIVATE(_pthread_mutex_held_np);
-LT10_COMPAT_DEFAULT(pthread_mutex_held_np);
 
 /* Single underscore versions provided for libc internal usage: */
 __weak_reference(__pthread_mutex_init, pthread_mutex_init);
@@ -119,7 +117,6 @@
 /* No difference between libc and application usage of these: */
 __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy);
 __weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock);
-__weak_reference(_pthread_mutex_held_np, pthread_mutex_held_np);
 
 
 
@@ -1585,12 +1582,6 @@
 	}
 }
 
-int
-_pthread_mutex_held_np(pthread_mutex_t *m)
-{
-	return((*m)->m_owner == _get_curthread());
-}
-
 /*
  * This is called by the current thread when it wants to back out of a
  * mutex_lock in order to run a signal handler.

==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#4 (text+ko) ====

@@ -56,10 +56,6 @@
 LT10_COMPAT_DEFAULT(pthread_rwlock_wrlock);
 LT10_COMPAT_PRIVATE(_pthread_rwlock_timedwrlock);
 LT10_COMPAT_DEFAULT(pthread_rwlock_timedwrlock);
-LT10_COMPAT_PRIVATE(_pthread_rwlock_rdheld_np);
-LT10_COMPAT_DEFAULT(pthread_rwlock_rdheld_np);
-LT10_COMPAT_PRIVATE(_pthread_rwlock_wrheld_np);
-LT10_COMPAT_DEFAULT(pthread_rwlock_wrheld_np);
 
 __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy);
 __weak_reference(_pthread_rwlock_init, pthread_rwlock_init);
@@ -70,8 +66,6 @@
 __weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock);
 __weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock);
 __weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);
-__weak_reference(_pthread_rwlock_rdheld_np, pthread_rwlock_rdheld_np);
-__weak_reference(_pthread_rwlock_wrheld_np, pthread_rwlock_wrheld_np);
 
 /*
  * Prototypes
@@ -442,15 +436,3 @@
 {
 	return (rwlock_wrlock_common (rwlock, abstime));
 }
-
-int
-_pthread_rwlock_rdheld_np(pthread_rwlock_t *rwlock)
-{
-	return((*rwlock)->state > 0);
-}
-
-int
-_pthread_rwlock_wrheld_np(pthread_rwlock_t *rwlock)
-{
-	return((*rwlock)->state < 0);
-}