From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:49:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A199816A476; Tue, 13 Jun 2006 00:49:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 657F716A46F for ; Tue, 13 Jun 2006 00:49:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10E6A43D7E for ; Tue, 13 Jun 2006 00:49:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0kgQg044779 for ; Tue, 13 Jun 2006 00:46:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0kgxE044776 for perforce@freebsd.org; Tue, 13 Jun 2006 00:46:42 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:46:42 GMT Message-Id: <200606130046.k5D0kgxE044776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jun 2006 00:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99098 Change 99098 by jb@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); -}