From owner-p4-projects@FreeBSD.ORG Sun Feb 27 06:59:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36DD016A4D0; Sun, 27 Feb 2005 06:59:48 +0000 (GMT) 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 0E2B916A4CE for ; Sun, 27 Feb 2005 06:59:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CCDC43D41 for ; Sun, 27 Feb 2005 06:59:47 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1R6xlxo067339 for ; Sun, 27 Feb 2005 06:59:47 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1R6xlEe067336 for perforce@freebsd.org; Sun, 27 Feb 2005 06:59:47 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Feb 2005 06:59:47 GMT Message-Id: <200502270659.j1R6xlEe067336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 71965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2005 06:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=71965 Change 71965 by davidxu@davidxu_tiger on 2005/02/27 06:59:10 Init RCSID. Style fixes. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#11 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/support/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/sys/thr_error.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrier.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrierattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#9 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_clean.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_concurrency.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_detach.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_equal.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#11 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getprio.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getschedparam.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#13 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#15 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kill.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_main_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_multi_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#18 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_prioceiling.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_protocol.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutexattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_once.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#22 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_resume_np.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlockattr.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#12 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_seterrno.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setprio.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setschedparam.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_single_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spec.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_stack.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_suspend_np.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_switch_np.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_symbols.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.h#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_yield.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.53 2004/10/24 15:32:32 ru Exp $ +# $FreeBSD$ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/alpha/Makefile.inc,v 1.2 2003/08/09 05:44:27 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#5 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/alpha/alpha/pthread_md.c,v 1.2 2004/08/15 16:28:04 dfr Exp $"); #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.7 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ #ifndef _PTHREAD_MD_H_ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/amd64/Makefile.inc,v 1.2 2003/08/05 22:45:59 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.4 2004/11/06 03:33:19 peter Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.10 2004/08/25 23:42:40 davidxu Exp $ + * $FreeBSD$ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -34,7 +34,6 @@ #include #include -#include #include #include @@ -52,17 +51,17 @@ }; /* - * Evaluates to the byte offset of the per-kse variable name. + * Evaluates to the byte offset of the per-tcb variable name. */ #define __tcb_offset(name) __offsetof(struct tcb, name) /* - * Evaluates to the type of the per-kse variable name. + * Evaluates to the type of the per-tcb variable name. */ #define __tcb_type(name) __typeof(((struct tcb *)0)->name) /* - * Evaluates to the value of the per-kse variable name. + * Evaluates to the value of the per-tcb variable name. */ #define TCB_GET64(name) ({ \ __tcb_type(name) __result; \ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/i386/Makefile.inc,v 1.3 2003/08/05 22:45:59 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#5 (text+ko) ==== @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ -#include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.4 2004/11/06 03:35:51 peter Exp $"); - #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.13 2004/11/06 03:35:51 peter Exp $ + * $FreeBSD$ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -50,17 +50,17 @@ }; /* - * Evaluates to the byte offset of the per-thread variable name. + * Evaluates to the byte offset of the per-tcb variable name. */ #define __tcb_offset(name) __offsetof(struct tcb, name) /* - * Evaluates to the type of the per-thread variable name. + * Evaluates to the type of the per-tcb variable name. */ #define __tcb_type(name) __typeof(((struct tcb *)0)->name) /* - * Evaluates to the value of the per-kse variable name. + * Evaluates to the value of the per-tcb variable name. */ #define TCB_GET32(name) ({ \ __tcb_type(name) __result; \ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.4 2003/08/05 22:46:00 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/ia64/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.16 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ #ifndef _PTHREAD_MD_H_ @@ -52,7 +52,7 @@ struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); -/* Called from the KSE to set its private data. */ +/* Called from the thread to set its private data. */ static __inline void _tcb_set(struct tcb *tcb) { ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/lib/libpthread/arch/powerpc/Makefile.inc,v 1.1 2004/07/19 12:19:04 grehan Exp $ +# $FreeBSD$ -# XXX temporary -CFLAGS+=-DSYSTEM_SCOPE_ONLY - .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= enter_uts.S context.S pthread_md.c +SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/powerpc/include/pthread_md.h,v 1.3 2004/08/16 05:41:38 grehan Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/arch/sparc64/Makefile.inc,v 1.1 2003/10/09 02:32:28 deischen Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.5 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#6 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include + #include "rtld_tls.h" #include "pthread_md.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.13 2004/09/26 06:50:14 deischen Exp $ +# $FreeBSD$ LIBTHREAD_1_0 { global: ___creat; ==== //depot/projects/davidxu_thread/src/lib/libthread/support/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.7 2003/09/05 18:08:19 kan Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys @@ -6,11 +6,10 @@ CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} SYSCALLS= clock_gettime \ - kse_create \ - kse_exit \ - kse_release \ - kse_thr_interrupt \ - kse_wakeup \ + thr_create \ + thr_exit \ + thr_kill \ + _umtx_op \ sigaction \ sigprocmask \ sigtimedwait \ @@ -36,4 +35,3 @@ thr_libc.So: ${SYSCALL_OBJ} ${LIBC_OBJS} ${CC} -fPIC -nostdlib -o ${.TARGET} -r ${.ALLSRC} - ==== //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/support/thr_support.c,v 1.3 2003/06/28 09:55:01 davidxu Exp $ + * $FreeBSD$ */ #include @@ -34,28 +34,26 @@ #include "thr_private.h" -__strong_reference(clock_gettime, _thr_clock_gettime); -__strong_reference(kse_exit, _thr_kse_exit); -__strong_reference(kse_wakeup, _thr_kse_wakeup); -__strong_reference(kse_create, _thr_kse_create); -__strong_reference(kse_thr_interrupt, _thr_kse_thr_interrupt); -__strong_reference(kse_release, _thr_kse_release); +__strong_reference(clock_gettime, __thr_clock_gettime); +__strong_reference(thr_exit, __thr_thr_exit); +__strong_reference(thr_create, __thr_thr_create); +__strong_reference(thr_kill, __thr_thr_kill); +__strong_reference(_umtx_op, __thr_umtx_op); +__strong_reference(sigaction, __thr_sigaction); +__strong_reference(sigprocmask, __thr_sigprocmask); +__strong_reference(sigemptyset, __thr_sigemptyset); +__strong_reference(sigaddset, __thr_sigaddset); +__strong_reference(sigfillset, __thr_sigfillset); +__strong_reference(sigismember, __thr_sigismember); +__strong_reference(sigdelset, __thr_sigdelset); -__strong_reference(sigaction, _thr_sigaction); -__strong_reference(sigprocmask, _thr_sigprocmask); -__strong_reference(sigemptyset, _thr_sigemptyset); -__strong_reference(sigaddset, _thr_sigaddset); -__strong_reference(sigfillset, _thr_sigfillset); -__strong_reference(sigismember, _thr_sigismember); -__strong_reference(sigdelset, _thr_sigdelset); +__strong_reference(memset, __thr_memset); +__strong_reference(memcpy, __thr_memcpy); +__strong_reference(strcpy, __thr_strcpy); +__strong_reference(strlen, __thr_strlen); +__strong_reference(bzero, __thr_bzero); +__strong_reference(bcopy, __thr_bcopy); -__strong_reference(memset, _thr_memset); -__strong_reference(memcpy, _thr_memcpy); -__strong_reference(strcpy, _thr_strcpy); -__strong_reference(strlen, _thr_strlen); -__strong_reference(bzero, _thr_bzero); -__strong_reference(bcopy, _thr_bcopy); - -__strong_reference(__sys_write, _thr__sys_write); -__strong_reference(__sys_sigtimedwait, _thr__sys_sigtimedwait); +__strong_reference(__sys_write, __thr__sys_write); +__strong_reference(__sys_sigtimedwait, __thr__sys_sigtimedwait); ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.15 2003/06/23 04:28:31 marcel Exp $ +# $FreeBSD$ .PATH: ${.CURDIR}/sys ==== //depot/projects/davidxu_thread/src/lib/libthread/sys/thr_error.c#3 (text+ko) ==== @@ -31,9 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.7 2003/04/23 21:46:50 deischen Exp $ + * $FreeBSD$ */ + #include + #include "libc_private.h" #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/thread/Makefile.inc,v 1.49 2004/09/26 06:50:15 deischen Exp $ +# $FreeBSD$ # thr sources .PATH: ${.CURDIR}/thread ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrier.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_barrier.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrierattr.c#4 (text+ko) ==== @@ -25,12 +25,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_barrierattr.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $ + * $FreeBSD$ */ #include #include #include + #include "thr_private.h" __weak_reference(_pthread_barrierattr_destroy, pthread_barrierattr_destroy); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#9 (text+ko) ==== @@ -28,6 +28,7 @@ */ #include + #include "thr_private.h" __weak_reference(_pthread_cancel, pthread_cancel); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_clean.c#4 (text+ko) ==== @@ -29,12 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.9 2004/12/18 18:07:37 deischen Exp $ + * $FreeBSD$ */ + #include #include #include #include + #include "thr_private.h" __weak_reference(_pthread_cleanup_push, pthread_cleanup_push); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_concurrency.c#8 (text+ko) ==== @@ -24,8 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ + * $FreeBSD$ */ + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#5 (text+ko) ==== @@ -31,10 +31,12 @@ * * $FreeBSD$ */ + #include #include #include #include + #include "thr_private.h" __weak_reference(_pthread_condattr_init, pthread_condattr_init); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#8 (text+ko) ==== @@ -30,8 +30,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.58 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_detach.c#5 (text+ko) ==== @@ -29,12 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_detach.c,v 1.23 2003/07/23 02:11:07 deischen Exp $ + * $FreeBSD$ */ + #include -#include #include #include + #include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_equal.c#4 (text+ko) ==== @@ -29,9 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_equal.c,v 1.6 2002/09/16 08:45:34 mini Exp $ + * $FreeBSD$ */ + #include + #include "thr_private.h" __weak_reference(_pthread_equal, pthread_equal); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#8 (text+ko) ==== @@ -29,15 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.39 2004/10/23 23:37:54 davidxu Exp $ + * $FreeBSD$ */ + #include -#include -#include #include #include -#include #include + #include "thr_private.h" void _pthread_exit(void *status); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_atfork.c,v 1.1 2003/11/05 03:42:10 davidxu Exp $ + * $FreeBSD$ */ /* @@ -58,13 +58,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.34 2003/11/05 18:18:45 deischen Exp $ */ + #include #include #include #include -#include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getprio.c#4 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_getprio.c,v 1.9 2002/09/16 08:45:34 mini Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_getprio, pthread_getprio); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getschedparam.c#5 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_getschedparam.c,v 1.10 2003/07/07 04:28:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_getschedparam, pthread_getschedparam); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_info.c,v 1.27 2003/09/22 00:40:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include @@ -38,6 +39,7 @@ #include #include #include + #include "thr_private.h" #ifndef NELEMENTS ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.66 2004/08/21 11:49:19 davidxu Exp $ + * $FreeBSD$ */ /* Allocate space for global thread variables here: */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#6 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_join.c,v 1.28 2003/12/09 02:20:56 davidxu Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_join, pthread_join); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#15 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include + #include "thr_private.h" /*#define DEBUG_THREAD_KERN */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kill.c#5 (text+ko) ==== @@ -29,11 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_kill.c,v 1.16 2003/06/28 09:55:02 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include + #include "thr_private.h" __weak_reference(_pthread_kill, pthread_kill); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_main_np.c#4 (text+ko) ==== @@ -24,11 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_main_np.c,v 1.5 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ #include #include + #include "thr_private.h" __weak_reference(_pthread_main_np, pthread_main_np); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_multi_np.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_multi_np.c,v 1.7 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD$ */ + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#18 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.46 2004/10/31 05:03:50 green Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_prioceiling.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex_prioceiling.c,v 1.8 2003/07/07 04:28:23 davidxu Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_protocol.c#4 (text+ko) ==== @@ -29,8 +29,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex_protocol.c,v 1.7 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ + #include #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutexattr.c#4 (text+ko) ==== @@ -63,7 +63,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_once.c#5 (text+ko) ==== @@ -29,11 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_once.c,v 1.9 2003/09/09 22:38:12 davidxu Exp $ + * $FreeBSD$ */ + #include "namespace.h" #include #include "un-namespace.h" + #include "thr_private.h" __weak_reference(_pthread_once, pthread_once); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#22 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $ + * $FreeBSD$ */ #ifndef _THR_PRIVATE_H ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_pspinlock.c,v 1.2 2003/11/04 19:56:12 deischen Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_resume_np.c#6 (text+ko) ==== @@ -29,10 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.18 2003/07/23 02:11:07 deischen Exp $ + * $FreeBSD$ */ + #include #include + #include "thr_private.h" __weak_reference(_pthread_resume_np, pthread_resume_np); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#6 (text+ko) ==== @@ -25,9 +25,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rtld.c,v 1.5 2003/11/05 18:19:24 deischen Exp $ + * $FreeBSD$ */ -#include + #include #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.14 2004/01/08 15:37:09 deischen Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlockattr.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlockattr.c,v 1.8 2002/09/16 08:45:35 mini Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#5 (text+ko) ==== @@ -29,9 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_self.c,v 1.7 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD$ */ + #include + #include "thr_private.h" __weak_reference(_pthread_self, pthread_self); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sem.c,v 1.16 2004/12/18 18:07:37 deischen Exp $ + * $FreeBSD$ */ #include "namespace.h" @@ -40,6 +40,7 @@ #include #include <_semaphore.h> #include "un-namespace.h" + #include "thr_private.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<