Date: Sun, 18 Jul 2004 21:36:19 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 57651 for review Message-ID: <200407182136.i6ILaJeH004435@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=57651 Change 57651 by marcel@marcel_nfs on 2004/07/18 21:35:27 IFC @57649 Affected files ... .. //depot/projects/gdb/MAINTAINERS#13 integrate .. //depot/projects/gdb/Makefile#8 integrate .. //depot/projects/gdb/contrib/smbfs/examples/dot.nsmbrc#2 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#13 integrate .. //depot/projects/gdb/etc/rc.d/gbde#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/tar/Makefile#5 integrate .. //depot/projects/gdb/include/proc_service.h#5 integrate .. //depot/projects/gdb/lib/Makefile#8 integrate .. //depot/projects/gdb/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/gdb/lib/libc/gen/glob.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/vis.3#5 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_private.h#5 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/gdb/lib/libthread_db/Makefile#6 integrate .. //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/alpha/libpthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/amd64/libc_r_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/amd64/libpthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#2 integrate .. //depot/projects/gdb/lib/libthread_db/arch/i386/libpthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/ia64/libc_r_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/ia64/libpthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/sparc64/libc_r_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/sparc64/libpthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/include/thread_db.h#2 delete .. //depot/projects/gdb/lib/libthread_db/include/thread_db_int.h#2 delete .. //depot/projects/gdb/lib/libthread_db/libc_r_db.c#4 integrate .. //depot/projects/gdb/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/gdb/lib/libthread_db/libpthread_db.h#1 branch .. //depot/projects/gdb/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/gdb/lib/libthread_db/pthread/Makefile#2 delete .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db.c#2 delete .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db.h#2 delete .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db_i386.c#2 delete .. //depot/projects/gdb/lib/libthread_db/src/Makefile#2 delete .. //depot/projects/gdb/lib/libthread_db/src/thread_db.c#2 delete .. //depot/projects/gdb/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/gdb/lib/libthread_db/thread_db.h#6 integrate .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#4 integrate .. //depot/projects/gdb/lib/msun/src/math.h#12 integrate .. //depot/projects/gdb/sbin/dumpon/dumpon.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#7 integrate .. //depot/projects/gdb/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/gdb/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/gdb/sbin/geom/class/label/glabel.8#6 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/geom_stripe.c#5 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#8 integrate .. //depot/projects/gdb/sbin/mount_unionfs/mount_unionfs.8#4 integrate .. //depot/projects/gdb/share/man/man4/axe.4#4 integrate .. //depot/projects/gdb/share/man/man4/netgraph.4#3 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/gdb/share/man/man9/suser.9#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#15 integrate .. //depot/projects/gdb/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/gdb/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/gdb/sys/conf/NOTES#35 integrate .. //depot/projects/gdb/sys/conf/options#32 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_isa.c#5 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/gdb/sys/dev/random/randomdev.c#12 integrate .. //depot/projects/gdb/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#9 integrate .. //depot/projects/gdb/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/gdb/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/gdb/sys/kern/bus_if.m#2 integrate .. //depot/projects/gdb/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#14 integrate .. //depot/projects/gdb/sys/kern/sys_process.c#8 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/gdb/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/gdb/sys/net/if.c#12 integrate .. //depot/projects/gdb/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/gdb/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#11 integrate .. //depot/projects/gdb/sys/pc98/pc98/fdc_cbus.c#4 integrate .. //depot/projects/gdb/sys/pc98/pc98/fdcvar.h#3 integrate .. //depot/projects/gdb/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/gdb/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/gdb/sys/sys/bus.h#5 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#14 integrate .. //depot/projects/gdb/sys/sys/mount.h#12 integrate .. //depot/projects/gdb/sys/sys/resourcevar.h#6 integrate .. //depot/projects/gdb/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/gdb/tools/regression/netatalk/simple_send/Makefile#1 branch .. //depot/projects/gdb/tools/regression/netatalk/simple_send/simple_send.c#1 branch .. //depot/projects/gdb/tools/regression/security/proc_to_proc/scenario.c#2 integrate .. //depot/projects/gdb/tools/regression/sockets/accept_fd_leak/Makefile#1 branch .. //depot/projects/gdb/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#1 branch .. //depot/projects/gdb/usr.bin/apply/apply.1#2 integrate .. //depot/projects/gdb/usr.bin/finger/finger.1#3 integrate .. //depot/projects/gdb/usr.bin/fmt/fmt.1#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/Makefile#3 integrate .. //depot/projects/gdb/usr.bin/look/look.1#3 integrate .. //depot/projects/gdb/usr.bin/make/make.1#6 integrate .. //depot/projects/gdb/usr.bin/sed/sed.1#5 integrate .. //depot/projects/gdb/usr.bin/tar/Makefile#6 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#23 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#12 integrate .. //depot/projects/gdb/usr.bin/truss/alpha-fbsd.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/extern.h#3 integrate .. //depot/projects/gdb/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/main.c#3 integrate .. //depot/projects/gdb/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/gdb/usr.bin/truss/syscall.h#4 integrate .. //depot/projects/gdb/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/gdb/usr.bin/wall/wall.1#3 integrate .. //depot/projects/gdb/usr.bin/write/write.1#3 integrate .. //depot/projects/gdb/usr.sbin/lptcontrol/lptcontrol.8#3 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.93 2004/07/16 21:47:43 alfred Exp $ +$FreeBSD: src/MAINTAINERS,v 1.95 2004/07/17 20:22:24 alfred Exp $ subsystem login notes ----------------------------- @@ -97,8 +97,9 @@ geom_nop pjd Pre-commit review requested. geom_stripe pjd Pre-commit review requested. sbin/geom pjd Pre-commit review requested. -nfs alfred Pre-commit review requested. -rpc.lockd alfred Pre-commit review requested. +nfs alfred Will be happy to review code, but not mandatory. +rpc.lockd alfred Will be happy to review code, but not mandatory. +truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. ==== //depot/projects/gdb/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.301 2004/07/16 02:51:28 marcel Exp $ +# $FreeBSD: src/Makefile,v 1.304 2004/07/18 18:55:31 markm Exp $ # # The user-driven targets are: # @@ -144,7 +144,7 @@ # Set a reasonable default .MAIN: all -.if defined(DESTDIR) +.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) .if make(world) STARTTIME!= LC_ALL=C date .endif @@ -187,8 +187,12 @@ @echo "installation without also building and installing a new" @echo "kernel. This can be dangerous. Please read the handbook," @echo "'Using make world', for how to upgrade your system." - @echo "Define DESTDIR to the where you want to install FreeBSD, + @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." + @echo "You may get the historical 'make world' behavior by defining" + @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" + @echo "before doing this." + @echo "" @echo "Bailing out now..." @false .endif ==== //depot/projects/gdb/contrib/smbfs/examples/dot.nsmbrc#2 (text+ko) ==== @@ -1,10 +1,11 @@ # $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $ +# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2 2004/07/17 14:38:42 bp Exp $ # # Example for .nsmbrc file # # smbfs lookups configuration files in next order: # 1. ~/.nsmbrc -# 2. /usr/local/etc/nsmb.conf - if this file found it will +# 2. /etc/nsmb.conf - if this file found it will # override values with same keys from user files. # # ==== //depot/projects/gdb/etc/defaults/rc.conf#13 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.210 2004/06/30 15:58:46 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.211 2004/07/18 18:01:47 simon Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -50,6 +50,8 @@ # Experimental - test before enabling gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab gbde_devices="NO" # Devices to automatically attach (list, or AUTO) +gbde_attach_attempts="3" # Number of times to attempt attaching gbde devices +gbde_lockdir="/etc" # Where to look for gbde lockfiles gbde_swap_enable="NO" # Set to YES to automatically initialize gbde swap # devices listed in fstab with a random one-shot key ==== //depot/projects/gdb/etc/rc.d/gbde#4 (text+ko) ==== @@ -3,7 +3,7 @@ # This file, originally written by Garrett A. Wollman, is in the public # domain. # -# $FreeBSD: src/etc/rc.d/gbde,v 1.4 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/gbde,v 1.5 2004/07/18 18:01:47 simon Exp $ # # PROVIDE: disks @@ -81,10 +81,20 @@ for device in $gbde_devices; do parentdev=${device%.bde} parent=${parentdev#/dev/} - eval "lock=\${gbde_lock_${parent}-\"/etc/${parent}.lock\"}" - if [ -e $lock ]; then + eval "lock=\${gbde_lock_${parent}-\"${gbde_lockdir}/${parent}.lock\"}" + if [ -e "${lock}" -a ! -e "${device}" ]; then echo "Configuring Disk Encryption for ${device}." - gbde attach ${parentdev} -l ${lock} + + count=1 + while [ ${count} -le ${gbde_attach_attempts} ]; do + gbde attach ${parentdev} -l ${lock} + if [ -e ${device} ]; then + break + fi + echo "Attach failed; attempt ${count} of ${gbde_attach_attempts}." + count=$((${count} + 1)) + done + fi done } ==== //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.2 2004/07/16 06:11:48 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.3 2004/07/17 17:08:13 marcel Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -997,26 +997,13 @@ } ps_err_e -ps_pdread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) +ps_pread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) { return target_read_memory ((CORE_ADDR) addr, buf, len); } ps_err_e -ps_pdwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t len) -{ - return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); -} - -ps_err_e -ps_ptread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) -{ - return target_read_memory ((CORE_ADDR) addr, buf, len); -} - -ps_err_e -ps_ptwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, +ps_pwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, size_t len) { return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); @@ -1090,10 +1077,3 @@ return PS_ERR; return PS_OK; } - -pid_t -ps_getpid (struct ps_prochandle *ph) -{ - return ph->pid; -} - ==== //depot/projects/gdb/gnu/usr.bin/tar/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.23 2004/06/04 00:39:46 kientzle Exp $ +# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.24 2004/07/17 06:03:47 kientzle Exp $ TARDIR= ${.CURDIR}/../../../contrib/tar .PATH: ${TARDIR}/lib ${TARDIR}/src PROG= gtar -.if !defined(WITH_BSDTAR) +.if defined(WITH_GTAR) SYMLINKS= ${BINDIR}/gtar ${BINDIR}/tar MLINKS= gtar.1 tar.1 .endif ==== //depot/projects/gdb/include/proc_service.h#5 (text+ko) ==== @@ -1,29 +1,30 @@ /* + * Copyright (c) 2004 David Xu <davidxu@freebsd.org> * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY 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$ + * $FreeBSD: src/include/proc_service.h,v 1.2 2004/07/17 17:05:12 marcel Exp $ */ #ifndef _PROC_SERVICE_H_ @@ -47,9 +48,9 @@ __BEGIN_DECLS ps_err_e ps_lcontinue(struct ps_prochandle *, lwpid_t); ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, prfpregset_t *); -ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t *); +ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t); ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const prfpregset_t *); -ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t *); +ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t); ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t); ps_err_e ps_pcontinue(struct ps_prochandle *); ps_err_e ps_pdmodel(struct ps_prochandle *, int *); ==== //depot/projects/gdb/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.186 2004/07/07 22:48:30 emax Exp $ +# $FreeBSD: src/lib/Makefile,v 1.187 2004/07/18 04:36:22 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,8 +31,8 @@ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ - ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ - ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz + ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ + libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -102,6 +102,10 @@ _libthr= libthr .endif +.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc" +_libthread_db= libthread_db +.endif + .if !defined(NO_USB) _libusbhid= libusbhid .endif ==== //depot/projects/gdb/lib/libc/gen/fnmatch.3#3 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fnmatch.3 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.17 2004/07/03 22:30:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.18 2004/07/18 06:56:40 tjr Exp $ .\" -.Dd April 28, 1995 +.Dd July 18, 2004 .Dt FNMATCH 3 .Os .Sh NAME @@ -134,10 +134,14 @@ .Xr glob 3 , .Xr regex 3 .Sh STANDARDS -The +The current implementation of the .Fn fnmatch -function conforms to +function +.Em does not +conform to .St -p1003.2 . +Collating symbol expressions, equivalence class expressions and +character class expressions are not supported. .Sh HISTORY The .Fn fnmatch ==== //depot/projects/gdb/lib/libc/gen/glob.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)glob.3 8.3 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.25 2003/09/10 19:24:32 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.26 2004/07/18 10:11:27 tjr Exp $ .\" -.Dd April 16, 1994 +.Dd July 18, 2004 .Dt GLOB 3 .Os .Sh NAME @@ -423,12 +423,15 @@ .Xr fnmatch 3 , .Xr regexp 3 .Sh STANDARDS -The +The current implementation of the .Fn glob -function is expected to be -.St -p1003.2 -compatible with the exception -that the flags +function +.Em does not +conform to +.St -p1003.2 . +Collating symbol expressions, equivalence class expressions and +character class expressions are not supported. +The flags .Dv GLOB_ALTDIRFUNC , .Dv GLOB_BRACE , .Dv GLOB_LIMIT , @@ -440,8 +443,10 @@ .Fa gl_matchc and .Fa gl_flags +are extensions to the +.Tn POSIX +standard and should not be used by applications striving for strict -.Tn POSIX conformance. .Sh HISTORY The ==== //depot/projects/gdb/lib/libc/gen/vis.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.25 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.26 2004/07/17 12:27:25 tjr Exp $ .\" .Dd March 21, 2004 .Dt VIS 3 @@ -182,7 +182,7 @@ Use an .Ql M to represent meta characters (characters with the 8th -bit set), and use carat +bit set), and use caret .Ql ^ to represent control characters see .Pf ( Xr iscntrl 3 ) . ==== //depot/projects/gdb/lib/libpthread/thread/thr_private.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.115 2004/07/13 22:49:58 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.116 2004/07/18 04:22:01 marcel Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,8 +54,10 @@ #include <pthread.h> #include <pthread_np.h> +#ifndef LIBTHREAD_DB #include "lock.h" #include "pthread_md.h" +#endif /* * Evaluate the storage class specifier. ==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.38 2004/07/02 00:40:07 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.39 2004/07/18 04:23:30 marcel Exp $ */ #ifndef _THR_PRIVATE_H ==== //depot/projects/gdb/lib/libthread_db/Makefile#6 (text+ko) ==== @@ -1,13 +1,28 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthread_db/Makefile,v 1.3 2004/07/18 19:33:56 marcel Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} LIB= thread_db SHLIB_MAJOR= 1 SRCS= thread_db.c +SRCS+= libpthread_db.c libpthread_md.c SRCS+= libc_r_db.c libc_r_md.c SRCS+= libthr_db.c INCS= thread_db.h -WARNS?= 2 +WARNS?= 1 + +CFLAGS+=-I. -I${.CURDIR} + +SRCS+= libpthread.h +CLEANFILES+= libpthread.h + +LIBPTHREAD= ${.CURDIR}/../libpthread +LIBPTHREAD_ARCH= ${LIBPTHREAD}/arch/${MACHINE_ARCH}/include + +libpthread.h: + @echo '#define LIBTHREAD_DB 1' > ${.TARGET} + @echo '#include "${LIBPTHREAD}/sys/lock.h"' >> ${.TARGET} + @echo '#include "${LIBPTHREAD_ARCH}/pthread_md.h"' >> ${.TARGET} + @echo '#include "${LIBPTHREAD}/thread/thr_private.h"' >> ${.TARGET} .include <bsd.lib.mk> ==== //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#2 (text+ko) ==== ==== //depot/projects/gdb/lib/libthread_db/libc_r_db.c#4 (text+ko) ==== ==== //depot/projects/gdb/lib/libthread_db/libpthread_db.c#2 (text+ko) ==== ==== //depot/projects/gdb/lib/libthread_db/libthr_db.c#3 (text+ko) ==== ==== //depot/projects/gdb/lib/libthread_db/thread_db.c#2 (text+ko) ==== ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#6 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (c) 2004 David Xu <davidxu@freebsd.org> * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * @@ -23,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$ + * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.2 2004/07/18 19:29:37 marcel Exp $ */ #ifndef _THREAD_DB_H_ @@ -57,44 +58,34 @@ } td_err_e; typedef struct td_thragent td_thragent_t; - -/* - * Threads. - */ +typedef long thread_t; /* Must be an integral type. */ -typedef enum { - TD_THR_UNKNOWN = -1, - TD_THR_ANY_STATE = 0, - TD_THR_ACTIVE, - TD_THR_RUN, - TD_THR_SLEEP, - TD_THR_STOPPED, - TD_THR_STOPPED_ASLEEP, - TD_THR_ZOMBIE -} td_thr_state_e; - -typedef intptr_t thread_t; /* Must be an integral type. */ - typedef struct { const td_thragent_t *th_ta; psaddr_t th_thread; + thread_t th_tid; } td_thrhandle_t; /* Used non-opaguely. */ -typedef struct { - const td_thragent_t *ti_ta; - thread_t ti_tid; - td_thr_state_e ti_state; - lwpid_t ti_lid; -} td_thrinfo_t; - /* * Events. */ typedef enum { TD_EVENT_NONE = 0, - TD_CREATE = 0x0001, - TD_DEATH = 0x0002, + TD_CATCHSIG = 0x0001, + TD_CONCURRENCY= 0x0002, + TD_CREATE = 0x0004, + TD_DEATH = 0x0008, + TD_IDLE = 0x0010, + TD_LOCK_TRY = 0x0020, + TD_PREEMPT = 0x0040, + TD_PRI_INHERIT= 0x0080, + TD_READY = 0x0100, + TD_REAP = 0x0200, + TD_SLEEP = 0x0400, + TD_SWITCHFROM = 0x0800, + TD_SWITCHTO = 0x1000, + TD_TIMEOUT = 0x2000, TD_ALL_EVENTS = ~0 } td_thr_events_e; @@ -109,10 +100,17 @@ typedef unsigned int td_thr_events_t; -/* XXX can't be it... */ +typedef enum { + NOTIFY_BPT, /* User inserted breakpoint. */ + NOTIFY_AUTOBPT, /* Automatic breakpoint. */ + NOTIFY_SYSCALL /* Invocation of system call. */ +} td_notify_e; + typedef struct { + td_notify_e type; union { psaddr_t bptaddr; + int syscallno; } u; } td_notify_t; @@ -153,9 +151,51 @@ } /* + * Thread info. + */ + +typedef enum { + TD_THR_UNKNOWN = -1, + TD_THR_ANY_STATE = 0, + TD_THR_ACTIVE, + TD_THR_RUN, + TD_THR_SLEEP, + TD_THR_STOPPED, + TD_THR_STOPPED_ASLEEP, + TD_THR_ZOMBIE +} td_thr_state_e; + +typedef enum +{ + TD_THR_SYSTEM = 1, + TD_THR_USER +} td_thr_type_e; + +typedef pthread_key_t thread_key_t; + +typedef struct { + const td_thragent_t *ti_ta_p; + thread_t ti_tid; + td_thr_state_e ti_state; + td_thr_type_e ti_type; + td_thr_events_t ti_events; + int ti_pri; + lwpid_t ti_lid; + char ti_db_suspended; + char ti_traceme; + sigset_t ti_sigmask; + sigset_t ti_pending; + psaddr_t ti_tls; + psaddr_t ti_startfunc; + psaddr_t ti_stkbase; + size_t ti_stksize; +} td_thrinfo_t; + +/* * Prototypes. */ +typedef int td_key_iter_f(thread_key_t, void (*)(void *), void *); typedef int td_thr_iter_f(const td_thrhandle_t *, void *); /* Flags for `td_ta_thr_iter'. */ @@ -177,17 +217,23 @@ td_err_e td_ta_set_event(const td_thragent_t *, td_thr_events_t *); td_err_e td_ta_thr_iter(const td_thragent_t *, td_thr_iter_f *, void *, td_thr_state_e, int, sigset_t *, unsigned int); +td_err_e td_ta_tsd_iter(const td_thragent_t *, td_key_iter_f *, void *); td_err_e td_thr_clear_event(const td_thrhandle_t *, td_thr_events_t *); +td_err_e td_thr_dbresume(const td_thrhandle_t *); +td_err_e td_thr_dbsuspend(const td_thrhandle_t *); td_err_e td_thr_event_enable(const td_thrhandle_t *, int); td_err_e td_thr_event_getmsg(const td_thrhandle_t *, td_event_msg_t *); td_err_e td_thr_get_info(const td_thrhandle_t *, td_thrinfo_t *); td_err_e td_thr_getfpregs(const td_thrhandle_t *, prfpregset_t *); -td_err_e td_thr_getgregs(const td_thrhandle_t *, prgregset_t *); +td_err_e td_thr_getgregs(const td_thrhandle_t *, prgregset_t); td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *); td_err_e td_thr_setfpregs(const td_thrhandle_t *, const prfpregset_t *); -td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t *); +td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t); td_err_e td_thr_validate(const td_thrhandle_t *); + +/* FreeBSD specific extensions. */ +td_err_e td_thr_sstep(const td_thrhandle_t *, int); __END_DECLS #endif /* _THREAD_DB_H_ */ ==== //depot/projects/gdb/lib/libthread_db/thread_db_int.h#4 (text+ko) ==== ==== //depot/projects/gdb/lib/msun/src/math.h#12 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.41 2004/07/16 06:21:56 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.42 2004/07/17 15:03:52 stefanf Exp $ */ #ifndef _MATH_H_ @@ -255,9 +255,6 @@ double erf(double); double erfc(double) __pure2; double expm1(double) __pure2; -double fdim(double, double); -double fmax(double, double) __pure2; -double fmin(double, double) __pure2; double hypot(double, double); int ilogb(double); int (isinf)(double) __pure2; @@ -265,12 +262,9 @@ double lgamma(double); double log1p(double) __pure2; double logb(double) __pure2; -double nearbyint(double) __pure2; double nextafter(double, double); double remainder(double, double); double rint(double) __pure2; -double round(double); -double trunc(double); #endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */ #if __BSD_VISIBLE || __XSI_VISIBLE @@ -289,9 +283,15 @@ #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 double copysign(double, double) __pure2; +double fdim(double, double); +double fmax(double, double) __pure2; +double fmin(double, double) __pure2; +double nearbyint(double) __pure2; +double round(double); double scalbln(double, long); double scalbn(double, int); double tgamma(double); +double trunc(double); #endif /* ==== //depot/projects/gdb/sbin/dumpon/dumpon.8#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.29 2004/04/09 19:58:27 markm Exp $ +.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.30 2004/07/18 09:57:47 maxim Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 @@ -40,7 +40,7 @@ .Ar special_file .Nm .Op Fl v -.Ar off +.Cm off .Sh DESCRIPTION The .Nm ==== //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.7 2004/07/13 12:32:20 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.8 2004/07/18 08:00:30 pjd Exp $ .\" .Dd May 21, 2004 .Dt GCONCAT 8 @@ -61,6 +61,10 @@ .Ar dev1 .Op Ar dev2 Op Ar ... .Nm +.Cm dump +.Ar dev1 +.Op Ar dev2 Op Ar ... +.Nm .Cm list .Op Ar prov Op Ar ... .Nm @@ -118,6 +122,8 @@ .Cm stop . .It Cm clear Clear metadata on the given devices. +.It Cm dump +Dump metadata stored on the given devices. .It Cm list List all or the given currently configured devices. .It Cm load ==== //depot/projects/gdb/sbin/geom/class/concat/geom_concat.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.3 2004/07/05 21:16:37 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.4 2004/07/18 08:00:30 pjd Exp $"); #include <sys/param.h> #include <errno.h> @@ -45,8 +45,9 @@ uint32_t version = G_CONCAT_VERSION; static void concat_main(struct gctl_req *req, unsigned flags); +static void concat_clear(struct gctl_req *req); +static void concat_dump(struct gctl_req *req); static void concat_label(struct gctl_req *req); -static void concat_clear(struct gctl_req *req); struct g_command class_commands[] = { { "clear", G_FLAG_VERBOSE, concat_main, G_NULL_OPTS }, @@ -57,6 +58,7 @@ G_OPT_SENTINEL } }, + { "dump", 0, concat_main, G_NULL_OPTS }, { "label", G_FLAG_VERBOSE | G_FLAG_LOADKLD, concat_main, G_NULL_OPTS }, { "stop", G_FLAG_VERBOSE, NULL, { @@ -80,6 +82,7 @@ fprintf(stderr, " %s label [-v] <name> <dev1> <dev2> [dev3 [...]]\n", name); fprintf(stderr, " %s stop [-fv] <name> [name2 [...]]\n", name); fprintf(stderr, " %s clear [-v] <dev1> [dev2 [...]]\n", name); + fprintf(stderr, " %s dump <dev1> [dev2 [...]]\n", name); } static void @@ -99,6 +102,8 @@ concat_label(req); else if (strcmp(name, "clear") == 0) concat_clear(req); + else if (strcmp(name, "dump") == 0) + concat_dump(req); else gctl_error(req, "Unknown command: %s.", name); } @@ -203,3 +208,52 @@ printf("Metadata cleared on %s.\n", name); } } + +static void +concat_metadata_dump(const struct g_concat_metadata *md) +{ + + printf(" Magic string: %s\n", md->md_magic); + printf(" Metadata version: %u\n", (u_int)md->md_version); + printf(" Device name: %s\n", md->md_name); + printf(" Device ID: %u\n", (u_int)md->md_id); + printf(" Disk number: %u\n", (u_int)md->md_no); + printf("Total number of disks: %u\n", (u_int)md->md_all); +} + +static void +concat_dump(struct gctl_req *req) +{ + struct g_concat_metadata md, tmpmd; + const char *name; + char param[16]; + int *nargs, error, i; + + nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); + if (nargs == NULL) { + gctl_error(req, "No '%s' argument.", "nargs"); + return; + } + if (*nargs < 1) { + gctl_error(req, "Too few arguments."); + return; + } + + for (i = 0; i < *nargs; i++) { + snprintf(param, sizeof(param), "arg%u", i); + name = gctl_get_asciiparam(req, param); + + error = g_metadata_read(name, (u_char *)&tmpmd, sizeof(tmpmd), + G_CONCAT_MAGIC); + if (error != 0) { + fprintf(stderr, "Can't read metadata from %s: %s.\n", + name, strerror(error)); + gctl_error(req, "Not fully done."); + continue; + } + concat_metadata_decode((u_char *)&tmpmd, &md); + printf("Metadata on %s:\n", name); + concat_metadata_dump(&md); + printf("\n"); + } +} ==== //depot/projects/gdb/sbin/geom/class/label/geom_label.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/label/geom_label.c,v 1.2 2004/07/05 21:16:37 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/label/geom_label.c,v 1.3 2004/07/18 08:00:30 pjd Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407182136.i6ILaJeH004435>