From owner-p4-projects@FreeBSD.ORG Sun Jul 18 02:58:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAD0F16A4D0; Sun, 18 Jul 2004 02:58:18 +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 76BB716A4CE for ; Sun, 18 Jul 2004 02:58:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AFF143D3F for ; Sun, 18 Jul 2004 02:58:18 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I2wI7B071053 for ; Sun, 18 Jul 2004 02:58:18 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I2wHo0071050 for perforce@freebsd.org; Sun, 18 Jul 2004 02:58:17 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 02:58:17 GMT Message-Id: <200407180258.i6I2wHo0071050@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 57578 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, 18 Jul 2004 02:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=57578 Change 57578 by davidxu@davidxu_alona on 2004/07/18 02:57:48 IFC @57576 Affected files ... .. //depot/projects/davidxu_ksedbg/src/MAINTAINERS#3 integrate .. //depot/projects/davidxu_ksedbg/src/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/UPDATING#5 integrate .. //depot/projects/davidxu_ksedbg/src/bin/date/date.1#4 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/smbfs/examples/dot.nsmbrc#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#12 edit .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/tar/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/wchar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/vis.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetwln.3#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetwln.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/local.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/recv.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#8 edit .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/math.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/scripts/print-cdrom-packages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/mount_unionfs/mount_unionfs.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/kld/cdev/module/cdev.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/kld/cdev/module/cdevmod.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/fdc.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/suser.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.amd64#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cy/cy.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rc/rc.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sab/sab.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/si/si.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sx/sx.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/zs/zs.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/isa/psm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#7 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#11 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_switch.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_prof.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#4 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#13 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty_conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/libkern/qsort.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/libkern/qsort_r.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/sound/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/net/ppp_tty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdcvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/security/mac_biba/mac_biba.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/security/mac_mls/mac_mls.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/libkern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/mount.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#9 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/socket.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/systm.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/netatalk/simple_send/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/netatalk/simple_send/simple_send.c#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/security/proc_to_proc/scenario.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/sockets/accept_fd_leak/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/apply/apply.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/colrm/colrm.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/finger/finger.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fmt/fmt.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/hexdump/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/hexdump/conv.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/jot/jot.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/look/look.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/make.1#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/rev/rev.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/rs/rs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/alpha-fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/extern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/ul/ul.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/wall/wall.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/write/write.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/amd/include/config.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/lptcontrol/lptcontrol.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/log.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/log.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/ppp.8.m4#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/radius.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/radius.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rpc.lockd/lock_proc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.92 2004/07/02 19:40:36 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.95 2004/07/17 20:22:24 alfred Exp $ subsystem login notes ----------------------------- @@ -97,7 +97,10 @@ geom_nop pjd Pre-commit review requested. geom_stripe pjd Pre-commit review requested. sbin/geom pjd 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. Please remove stale entries from both their origin, and this file. ==== //depot/projects/davidxu_ksedbg/src/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $ +# $FreeBSD: src/Makefile,v 1.303 2004/07/18 01:19:33 obrien Exp $ # # The user-driven targets are: # @@ -144,14 +144,17 @@ # Set a reasonable default .MAIN: all +.if defined(I_KNOW_WHAT_IM_DOING_THANKYOU_VERY_MUCH) || defined(DESTDIR) .if make(world) STARTTIME!= LC_ALL=C date .endif # # world # -# Attempt to rebuild and reinstall *everything*, with reasonable chance of -# success, regardless of how old your existing system is. +# Attempt to rebuild and reinstall everything. This target is not to be +# used for upgrading an existing FreeBSD system, because the kernel is +# not included. One can argue that this target doesn't build everything +# then. # world: upgrade_checks @echo "--------------------------------------------------------------" @@ -178,6 +181,17 @@ @echo ">>> make world completed on `LC_ALL=C date`" @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" +.else +world: + @echo "WARNING: make world will overwrite your existing FreeBSD" + @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 "including /, to override this warning and proceed as usual." + @echo "Bailing out now..." + @false +.endif # # kernel ==== //depot/projects/davidxu_ksedbg/src/UPDATING#5 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20040716: + The sound device drivers are renamed. `sound' is always required, + while `snd_*' should be configured accordingly to your hardware. + Refer to NOTES for the detail of the drivers. + 20040710: __FreeBSD_version bumped to 502122. @@ -1714,4 +1719,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ +$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $ ==== //depot/projects/davidxu_ksedbg/src/bin/date/date.1#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.66 2004/07/03 00:03:25 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.67 2004/07/17 00:26:31 alfred Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -328,6 +328,14 @@ sets the time to .Li "2:32 PM" , without modifying the date. +.Pp +Finally the command: +.Pp +.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s""" +.Pp +can be used to parse the ouput from +.Nm +and express it in epoch time. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : ==== //depot/projects/davidxu_ksedbg/src/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/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/amd64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/ia64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/sparc64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.1 2004/06/25 06:48:54 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#12 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.2 2004/07/16 06:11:48 davidxu Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -69,7 +70,7 @@ static td_thragent_t *thread_agent; /* The last thread we are single stepping */ -static ptid_t last_single_step_thread; +static lwpid_t last_single_step_lwp; /* Pointers to the libthread_db functions. */ @@ -382,7 +383,7 @@ td_thrinfo_t ti; ptid_t work_ptid; int resume_all, ret; - long lwp, thvalid = 0; + long lwp; #if 0 printf_filtered("%s ptid=%ld.%ld.%ld step=%d\n", __func__, @@ -398,7 +399,7 @@ return; } - if (GET_PID(ptid) != -1 && step != 0) + if (GET_PID (ptid) != -1 && step != 0) { resume_all = 0; work_ptid = ptid; @@ -431,49 +432,59 @@ ret = td_thr_get_info_p (&th, &ti); if (ret) error (thread_db_err_str (ret)); - thvalid = 1; lwp = ti.ti_lid; } + if (!resume_all && lwp == 0) + { + error ("sorry this version of FreeBSD can not resume inactivated thread"); + } + if (lwp) { int req = step ? PT_SETSTEP : PT_CLEARSTEP; - if (ptrace (req, (pid_t) lwp, (caddr_t) 1, target_signal_to_host(signo))) + if (ptrace (req, (pid_t) lwp, 0, 0)) perror_with_name ("PT_SETSTEP/PT_CLEARSTEP"); } - if (!ptid_equal (last_single_step_thread, null_ptid)) + int nlwps = ptrace (PT_GETNUMLWPS, proc_handle.pid, 0, 0); + if (nlwps == -1) + perror_with_name ("PT_GETNUMLWPS"); + lwpid_t *lwps = malloc (nlwps * sizeof(lwpid_t)); + nlwps = ptrace (PT_GETLWPLIST, proc_handle.pid, (caddr_t)lwps, nlwps); + if (nlwps == -1) { - ret = td_ta_thr_iter_p (thread_agent, resume_thread_callback, NULL, - TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, - TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); - if (ret != TD_OK) - error ("resume error: %s", thread_db_err_str (ret)); + perror_with_name ("PT_GETLWPLIST"); + free (lwps); } - if (!resume_all) + int i; + if (last_single_step_lwp != 0) { - ret = td_ta_thr_iter_p (thread_agent, suspend_thread_callback, NULL, - TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, - TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); - if (ret != TD_OK) - error ("suspend error: %s", thread_db_err_str (ret)); - last_single_step_thread = work_ptid; + /* resume all threads if ever suspend them */ + for (i = 0; i < nlwps; ++i) + { + if (ptrace (PT_RESUME, lwps[i], 0, 0)) + perror_with_name ("PT_SUSPEND"); + } } - else - last_single_step_thread = null_ptid; - if (thvalid) + if (!resume_all) { - ret = td_thr_dbresume_p (&th); - if (ret != TD_OK) - error ("resume error: %s", thread_db_err_str (ret)); + for (i = 0; i < nlwps; ++i) + { + if (lwps[i] == lwp) + continue; + if (ptrace (PT_SUSPEND, lwps[i], 0, 0)) + perror_with_name ("PT_SUSPEND"); + } + last_single_step_lwp = lwp; } else - { - /* it is not necessary, put it here for completness */ - ret = ptrace(PT_RESUME, lwp, 0, 0); - } + last_single_step_lwp = 0; + + free (lwps); +/* ret = ptrace(PT_RESUME, lwp, 0, 0); */ /* now continue the process, suspended thread wont run */ if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1, @@ -1024,66 +1035,50 @@ ps_err_e ps_lgetregs (struct ps_prochandle *ph, lwpid_t lwpid, prgregset_t gregset) { - struct cleanup *old_chain; - - old_chain = save_inferior_ptid (); - inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); - target_fetch_registers (-1); - fill_gregset (gregset, -1); - do_cleanups (old_chain); - return PS_OK; + if (ptrace (PT_GETREGS, lwpid, (caddr_t)gregset, 0) == 0) + return PS_OK; + return PS_ERR; } ps_err_e ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset) { - struct cleanup *old_chain; - - old_chain = save_inferior_ptid (); - inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); - supply_gregset (gregset); - target_store_registers (-1); - do_cleanups (old_chain); - return PS_OK; + if (ptrace (PT_SETREGS, lwpid, (caddr_t)gregset, 0) == 0) + return PS_OK; + return PS_ERR; } ps_err_e ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, prfpregset_t *fpregset) { - struct cleanup *old_chain; - - old_chain = save_inferior_ptid (); - inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); - target_fetch_registers (-1); - fill_fpregset (fpregset, -1); - do_cleanups (old_chain); - return PS_OK; + if (ptrace (PT_GETFPREGS, lwpid, (caddr_t)fpregset, 0) == 0) + return PS_OK; + return PS_ERR; } ps_err_e ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, const prfpregset_t *fpregset) { - struct cleanup *old_chain; - - old_chain = save_inferior_ptid (); - inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); - supply_fpregset (fpregset); - target_store_registers (-1); - do_cleanups (old_chain); - return PS_OK; + if (ptrace (PT_SETFPREGS, lwpid, (caddr_t)fpregset, 0) == 0) + return PS_OK; + return PS_ERR; } ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid) { - return (ptrace (lwpid, PT_SUSPEND, 0, 0) == 0); + if (ptrace (PT_SUSPEND, lwpid, 0, 0) == -1) + return PS_ERR; + return PS_OK; } ps_err_e ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid) { - return (ptrace (lwpid, PT_RESUME, 0, 0) == 0); + if (ptrace (PT_RESUME, lwpid, 0, 0) == -1) + return PS_ERR; + return PS_OK; } pid_t ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/tar/Makefile#2 (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/davidxu_ksedbg/src/include/wchar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.41 2004/06/07 10:31:10 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $ */ /*- @@ -208,6 +208,7 @@ #endif #if __BSD_VISIBLE +wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/davidxu_ksedbg/src/lib/libc/gen/vis.3#4 (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/davidxu_ksedbg/src/lib/libc/stdio/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,12 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $ # stdio sources .PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ - fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ + fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetwln.c \ + fgetws.c \ fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ @@ -22,7 +23,8 @@ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c -MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 flockfile.3 \ +MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ + flockfile.3 \ fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ ==== //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetln.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.7 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.8 2004/07/16 06:07:12 tjr Exp $ .\" .Dd April 19, 1994 .Dt FGETLN 3 @@ -118,6 +118,7 @@ .Sh SEE ALSO .Xr ferror 3 , .Xr fgets 3 , +.Xr fgetwln 3 , .Xr fopen 3 , .Xr putc 3 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetln.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.9 2004/03/10 09:28:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $"); #include "namespace.h" #include @@ -55,8 +55,8 @@ * so we add 1 here. #endif */ -static int -slbexpand(FILE *fp, size_t newsize) +int +__slbexpand(FILE *fp, size_t newsize) { void *p; @@ -132,7 +132,7 @@ * file buffer to line buffer, refill file and look for * newline. The loop stops only when we find a newline. */ - if (slbexpand(fp, len + OPTIMISTIC)) + if (__slbexpand(fp, len + OPTIMISTIC)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, len - off); @@ -146,7 +146,7 @@ p++; diff = p - fp->_p; len += diff; - if (slbexpand(fp, len)) + if (__slbexpand(fp, len)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, diff); ==== //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/local.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $ */ #include /* for off_t */ @@ -57,6 +57,7 @@ extern wint_t __fputwc(wchar_t, FILE *); extern int __sflush(FILE *); extern FILE *__sfp(void); +extern int __slbexpand(FILE *, size_t); extern int __srefill(FILE *); extern int __sread(void *, char *, int); extern int __swrite(void *, char const *, int); ==== //depot/projects/davidxu_ksedbg/src/lib/libc/sys/getfsstat.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.16 2003/11/21 01:30:28 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $ .\" .Dd November 20, 2003 .Dt GETFSSTAT 2 @@ -63,8 +63,13 @@ The buffer is filled with an array of .Fa fsstat structures, one for each mounted file system -up to the size specified by +up to the byte count specified by .Fa bufsize . +Note, the +.Fa bufsize +argument is the number of bytes that +.Fa buf +can hold, not the count of statfs structures it will hold. .Pp If .Fa buf ==== //depot/projects/davidxu_ksedbg/src/lib/libc/sys/recv.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.20 2003/12/24 18:52:41 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.21 2004/07/16 17:15:37 harti Exp $ .\" .Dd February 21, 1994 .Dt RECV 2 @@ -124,10 +124,11 @@ function is formed by .Em or Ap ing one or more of the values: -.Bl -column MSG_WAITALL -offset indent +.Bl -column MSG_DONTWAIT -offset indent .It Dv MSG_OOB Ta process out-of-band data .It Dv MSG_PEEK Ta peek at incoming message .It Dv MSG_WAITALL Ta wait for full request or error +.It Dv MSG_DONTWAIT Ta don't block .El .Pp The @@ -145,6 +146,12 @@ However, the call may still return less data than requested if a signal is caught, an error or disconnect occurs, or the next data to be received is of a different type than that returned. +The MSG_DONTWAIT flag requests the call to return when it would block otherwise. +If no data is available +.Va errno +is set to +.Er EAGAIN . +This flag is not available in strict ANSI or C99 compilation mode. .Pp The .Fn recvmsg ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db.h#2 (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/libthread_db/include/thread_db.h,v 1.1 2004/07/15 03:36:35 davidxu Exp $ + * $FreeBSD: src/lib/libthread_db/include/thread_db.h,v 1.2 2004/07/17 17:09:12 marcel Exp $ */ #ifndef _THREAD_DB_H_ @@ -267,7 +267,7 @@ td_err_e td_thr_getxregs(const td_thrhandle_t *, void *); td_err_e td_thr_getxregsize(const td_thrhandle_t *, int *); td_err_e td_thr_setfpregs(const td_thrhandle_t *, const prfpregset_t *); -td_err_e td_thr_setgregs(const td_thrhandle_t *, prgregset_t); +td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t); td_err_e td_thr_setxregs(const td_thrhandle_t *, const void *); td_err_e td_thr_event_enable(const td_thrhandle_t *, int); td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *); ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/pthread/pthread_db.c,v 1.1 2004/07/15 03:36:35 davidxu Exp $"); #include #include @@ -842,34 +842,37 @@ ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); + ret = ps_pdread(ta->ph, + tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), + &dflags, sizeof(dflags)); + if (ret != 0) + return (P2T(ret)); + + if (suspend) + dflags |= TMDF_DONOTRUNUSER; + else + dflags &= ~TMDF_DONOTRUNUSER; + ret = ps_pdwrite(ta->ph, + tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), + &dflags, sizeof(dflags)); + if (ret) + return (P2T(ret)); /* * don't stop lwp assigned to a M:N thread, it belongs * to UTS, UTS shouldn't be stopped. */ - if (lwp != 0 && (attrflags & PTHREAD_SCOPE_SYSTEM)) { + if (lwp != 0) {/* && (attrflags & PTHREAD_SCOPE_SYSTEM)) { */ /* dont' suspend signal thread */ +#if 0 if (attrflags & THR_SIGNAL_THREAD) return 0; +#endif if (suspend) ret = ps_lstop(ta->ph, lwp); else ret = ps_lcontinue(ta->ph, lwp); - return (P2T(ret)); } - ret = ps_pdread(ta->ph, - tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), - &dflags, sizeof(dflags)); - if (ret != 0) - return (P2T(ret)); - - if (suspend) - dflags |= TMDF_DONOTRUNUSER; - else - dflags &= ~TMDF_DONOTRUNUSER; - ret = ps_pdwrite(ta->ph, - tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), - &dflags, sizeof(dflags)); return (P2T(ret)); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 18 03:12:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89FE16A4D0; Sun, 18 Jul 2004 03:12:36 +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 AE8A416A4CE for ; Sun, 18 Jul 2004 03:12:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A276443D1D for ; Sun, 18 Jul 2004 03:12:36 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I3Cagm071773 for ; Sun, 18 Jul 2004 03:12:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I3Cata071770 for perforce@freebsd.org; Sun, 18 Jul 2004 03:12:36 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 03:12:36 GMT Message-Id: <200407180312.i6I3Cata071770@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 57580 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, 18 Jul 2004 03:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=57580 Change 57580 by davidxu@davidxu_alona on 2004/07/18 03:11:49 resolve conflict with @57576 Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#13 integrate .. //depot/projects/davidxu_ksedbg/src/include/proc_service.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db_int.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#9 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db_i386.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/thread_db.c#3 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#13 (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. @@ -70,7 +70,7 @@ static td_thragent_t *thread_agent; /* The last thread we are single stepping */ -static lwpid_t last_single_step_lwp; +static ptid_t last_single_step_thread; /* Pointers to the libthread_db functions. */ @@ -383,7 +383,7 @@ td_thrinfo_t ti; ptid_t work_ptid; int resume_all, ret; - long lwp; + long lwp, thvalid = 0; #if 0 printf_filtered("%s ptid=%ld.%ld.%ld step=%d\n", __func__, @@ -399,7 +399,7 @@ return; } - if (GET_PID (ptid) != -1 && step != 0) + if (GET_PID(ptid) != -1 && step != 0) { resume_all = 0; work_ptid = ptid; @@ -432,59 +432,49 @@ ret = td_thr_get_info_p (&th, &ti); if (ret) error (thread_db_err_str (ret)); + thvalid = 1; lwp = ti.ti_lid; } - if (!resume_all && lwp == 0) - { - error ("sorry this version of FreeBSD can not resume inactivated thread"); - } - if (lwp) { int req = step ? PT_SETSTEP : PT_CLEARSTEP; - if (ptrace (req, (pid_t) lwp, 0, 0)) + if (ptrace (req, (pid_t) lwp, (caddr_t) 1, target_signal_to_host(signo))) perror_with_name ("PT_SETSTEP/PT_CLEARSTEP"); } - int nlwps = ptrace (PT_GETNUMLWPS, proc_handle.pid, 0, 0); - if (nlwps == -1) - perror_with_name ("PT_GETNUMLWPS"); - lwpid_t *lwps = malloc (nlwps * sizeof(lwpid_t)); - nlwps = ptrace (PT_GETLWPLIST, proc_handle.pid, (caddr_t)lwps, nlwps); - if (nlwps == -1) + if (!ptid_equal (last_single_step_thread, null_ptid)) { - perror_with_name ("PT_GETLWPLIST"); - free (lwps); + ret = td_ta_thr_iter_p (thread_agent, resume_thread_callback, NULL, + TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, + TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); + if (ret != TD_OK) + error ("resume error: %s", thread_db_err_str (ret)); } - int i; - if (last_single_step_lwp != 0) + if (!resume_all) { - /* resume all threads if ever suspend them */ - for (i = 0; i < nlwps; ++i) - { - if (ptrace (PT_RESUME, lwps[i], 0, 0)) - perror_with_name ("PT_SUSPEND"); - } + ret = td_ta_thr_iter_p (thread_agent, suspend_thread_callback, NULL, + TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, + TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); + if (ret != TD_OK) + error ("suspend error: %s", thread_db_err_str (ret)); + last_single_step_thread = work_ptid; } + else + last_single_step_thread = null_ptid; - if (!resume_all) + if (thvalid) { - for (i = 0; i < nlwps; ++i) - { - if (lwps[i] == lwp) - continue; - if (ptrace (PT_SUSPEND, lwps[i], 0, 0)) - perror_with_name ("PT_SUSPEND"); - } - last_single_step_lwp = lwp; + ret = td_thr_dbresume_p (&th); + if (ret != TD_OK) + error ("resume error: %s", thread_db_err_str (ret)); } else - last_single_step_lwp = 0; - - free (lwps); -/* ret = ptrace(PT_RESUME, lwp, 0, 0); */ + { + /* it is not necessary, put it here for completness */ + ret = ptrace(PT_RESUME, lwp, 0, 0); + } /* now continue the process, suspended thread wont run */ if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1, @@ -1007,62 +997,69 @@ } 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, +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); } ps_err_e -ps_ptread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) +ps_lgetregs (struct ps_prochandle *ph, lwpid_t lwpid, prgregset_t gregset) { - return target_read_memory ((CORE_ADDR) addr, buf, len); -} + struct cleanup *old_chain; -ps_err_e -ps_ptwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t len) -{ - return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); + old_chain = save_inferior_ptid (); + inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); + target_fetch_registers (-1); + fill_gregset (gregset, -1); + do_cleanups (old_chain); + return PS_OK; } ps_err_e -ps_lgetregs (struct ps_prochandle *ph, lwpid_t lwpid, prgregset_t gregset) +ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset) { - if (ptrace (PT_GETREGS, lwpid, (caddr_t)gregset, 0) == 0) - return PS_OK; - return PS_ERR; -} + struct cleanup *old_chain; -ps_err_e -ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset) -{ - if (ptrace (PT_SETREGS, lwpid, (caddr_t)gregset, 0) == 0) - return PS_OK; - return PS_ERR; + old_chain = save_inferior_ptid (); + inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); + supply_gregset (gregset); + target_store_registers (-1); + do_cleanups (old_chain); + return PS_OK; } ps_err_e ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, prfpregset_t *fpregset) { - if (ptrace (PT_GETFPREGS, lwpid, (caddr_t)fpregset, 0) == 0) - return PS_OK; - return PS_ERR; + struct cleanup *old_chain; + + old_chain = save_inferior_ptid (); + inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); + target_fetch_registers (-1); + fill_fpregset (fpregset, -1); + do_cleanups (old_chain); + return PS_OK; } ps_err_e ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, const prfpregset_t *fpregset) { - if (ptrace (PT_SETFPREGS, lwpid, (caddr_t)fpregset, 0) == 0) - return PS_OK; - return PS_ERR; + struct cleanup *old_chain; + + old_chain = save_inferior_ptid (); + inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); + supply_fpregset (fpregset); + target_store_registers (-1); + do_cleanups (old_chain); + return PS_OK; } ps_err_e @@ -1080,10 +1077,3 @@ return PS_ERR; return PS_OK; } - -pid_t -ps_getpid (struct ps_prochandle *ph) -{ - return ph->pid; -} - ==== //depot/projects/davidxu_ksedbg/src/include/proc_service.h#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 David Xu + * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,18 +11,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * 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 REGENTS OR CONTRIBUTORS BE LIABLE + * 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) @@ -30,74 +24,42 @@ * 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_ -#define _PROC_SERVICE_H_ +#define _PROC_SERVICE_H_ #include #include -struct ps_prochandle; +typedef enum { + PS_OK = 0, /* No errors. */ + PS_ERR, /* Generic error. */ + PS_BADADDR, /* Bad address. */ + PS_BADLID, /* Bad LWP Id. */ + PS_BADPID, /* Bad process Id. */ + PS_NOFREGS, /* FPU register set not available. */ + PS_NOSYM /* Symbol not found. */ +} ps_err_e; -typedef enum -{ - PS_OK, - PS_ERR, - PS_BADPID, - PS_BADLID, - PS_BADADDR, - PS_NOSYM, - PS_NOFREGS -} ps_err_e; +struct ps_prochandle; /* Opaque type. Defined by the implementor. */ -/* - * Every program that links libthread_db must provide a set of process control - * primitives to access memory and registers in the target process, to start - * and to stop the target process, and to look up symbols in the target process. - */ +__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_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_lstop(struct ps_prochandle *, lwpid_t); +ps_err_e ps_pcontinue(struct ps_prochandle *); +ps_err_e ps_pdmodel(struct ps_prochandle *, int *); +ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, + psaddr_t *); +void ps_plog(const char *, ...); +ps_err_e ps_pread(struct ps_prochandle *, psaddr_t, void *, size_t); +ps_err_e ps_pstop(struct ps_prochandle *); +ps_err_e ps_pwrite(struct ps_prochandle *, psaddr_t, const void *, size_t); +__END_DECLS -#if 0 -ps_err_e ps_pdmodel(struct ps_prochandle *ph, int *data_model); -#endif -ps_err_e ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name, - const char *sym_name , psaddr_t *sym_addr); -#if 0 -ps_err_e ps_pglobal_sym(struct ps_prochandle *ph, const char *object_name, - const char *sym_name , ps_sym_t *sym); -ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -#endif -ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -ps_err_e ps_ptread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_ptwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -ps_err_e ps_pstop(struct ps_prochandle *ph); -ps_err_e ps_pcontinue(struct ps_prochandle *ph); -ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid); -ps_err_e ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid); -ps_err_e ps_lgetregs(struct ps_prochandle *ph, lwpid_t lwpid, - prgregset_t gregset); -ps_err_e ps_lsetregs(struct ps_prochandle *ph, lwpid_t lwpid, - const prgregset_t gregset); -ps_err_e ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lwpid, - prfpregset_t *fpregset); -ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lwpid, - const prfpregset_t *fpregset); -#if 0 -ps_err_e ps_pauxv(struct ps_prochandle *ph, const auxv_t **auxp); -ps_err_e ps_kill(struct ps_prochandle *ph, int sig); -ps_err_e ps_lrolltoaddr(struct ps_prochandle *ph, lwpid_t lwpid, - psaddr_t go_addr, psaddr_t stop_addr); -#endif -void ps_plog(const char *fmt, ...); -pid_t ps_getpid (struct ps_prochandle *ph); - -#endif +#endif /* _PROC_SERVICE_H_ */ ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthread_db/Makefile,v 1.1 2004/07/15 03:36:35 davidxu Exp $ SUBDIR=pthread src ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db_int.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/lib/libthread_db/include/thread_db_int.h,v 1.2 2004/07/17 17:09:12 marcel Exp $ */ #ifndef _THREAD_DB_INT_H @@ -64,7 +64,7 @@ td_err_e (*to_thr_getxregs)(const td_thrhandle_t *, void *); td_err_e (*to_thr_getxregsize)(const td_thrhandle_t *, int *); td_err_e (*to_thr_setfpregs)(const td_thrhandle_t *, const prfpregset_t *); - td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, prgregset_t); + td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, const prgregset_t); td_err_e (*to_thr_setxregs)(const td_thrhandle_t *, const void *); td_err_e (*to_thr_event_enable)(const td_thrhandle_t *, int); td_err_e (*to_thr_set_event)(const td_thrhandle_t *, td_thr_events_t *); ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthread_db/pthread/Makefile,v 1.1 2004/07/15 03:36:35 davidxu Exp $ LIB=pthread_db INTERNALLIB=yes ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/pthread/pthread_db.c,v 1.1 2004/07/15 03:36:35 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/pthread/pthread_db.c,v 1.2 2004/07/17 17:09:12 marcel Exp $"); #include #include @@ -662,7 +662,7 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, prgregset_t gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) { struct kse_thr_mailbox tmbx; pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; @@ -842,6 +842,21 @@ ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); + /* + * don't stop lwp assigned to a M:N thread, it belongs + * to UTS, UTS shouldn't be stopped. + */ + if (lwp != 0 && (attrflags & PTHREAD_SCOPE_SYSTEM)) { + /* dont' suspend signal thread */ + if (attrflags & THR_SIGNAL_THREAD) + return 0; + if (suspend) + ret = ps_lstop(ta->ph, lwp); + else + ret = ps_lcontinue(ta->ph, lwp); + return (P2T(ret)); + } + ret = ps_pdread(ta->ph, tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), &dflags, sizeof(dflags)); @@ -855,24 +870,6 @@ ret = ps_pdwrite(ta->ph, tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), &dflags, sizeof(dflags)); - if (ret) - return (P2T(ret)); - /* - * don't stop lwp assigned to a M:N thread, it belongs - * to UTS, UTS shouldn't be stopped. - */ - if (lwp != 0) {/* && (attrflags & PTHREAD_SCOPE_SYSTEM)) { */ - /* dont' suspend signal thread */ -#if 0 - if (attrflags & THR_SIGNAL_THREAD) - return 0; -#endif - if (suspend) - ret = ps_lstop(ta->ph, lwp); - else - ret = ps_lcontinue(ta->ph, lwp); - } - return (P2T(ret)); } ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/lib/libthread_db/pthread/pthread_db.h,v 1.1 2004/07/15 03:36:35 davidxu Exp $ */ #ifndef _PTHREAD_DB_H ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/pthread/pthread_db_i386.c,v 1.1 2004/07/15 03:36:35 davidxu Exp $"); #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthread_db/src/Makefile,v 1.1 2004/07/15 03:36:35 davidxu Exp $ SHLIB_NAME=libthread_db.so.1 NOPROFILE=yes @@ -10,5 +10,6 @@ .PATH: ${.CURDIR} SRCS+=thread_db.c +INCS=../include/thread_db.h .include ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/thread_db.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/src/thread_db.c,v 1.2 2004/07/17 17:09:12 marcel Exp $"); #include #include @@ -232,7 +232,7 @@ } td_err_e -td_thr_setgregs(const td_thrhandle_t *th, prgregset_t gregs) +td_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) { td_thragent_t *ta = th->th_ta_p; From owner-p4-projects@FreeBSD.ORG Sun Jul 18 03:23:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEC9216A4CE; Sun, 18 Jul 2004 03:23:50 +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 99D3C16A4CE for ; Sun, 18 Jul 2004 03:23:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AD9743D31 for ; Sun, 18 Jul 2004 03:23:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I3NoWr072009 for ; Sun, 18 Jul 2004 03:23:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I3NojM072006 for perforce@freebsd.org; Sun, 18 Jul 2004 03:23:50 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 03:23:50 GMT Message-Id: <200407180323.i6I3NojM072006@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 57581 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, 18 Jul 2004 03:23:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=57581 Change 57581 by davidxu@davidxu_alona on 2004/07/18 03:23:37 Remove. it is in libthread_db/include Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/thread_db.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 18 03:25:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E777316A4D0; Sun, 18 Jul 2004 03:25:53 +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 912E016A4CE for ; Sun, 18 Jul 2004 03:25:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85F5043D1D for ; Sun, 18 Jul 2004 03:25:53 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I3PrTS072098 for ; Sun, 18 Jul 2004 03:25:53 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I3Prwk072095 for perforce@freebsd.org; Sun, 18 Jul 2004 03:25:53 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 03:25:53 GMT Message-Id: <200407180325.i6I3Prwk072095@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 57582 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, 18 Jul 2004 03:25:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=57582 Change 57582 by davidxu@davidxu_alona on 2004/07/18 03:25:10 Use ps_pwrite ps_pread Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#10 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#10 (text+ko) ==== @@ -129,7 +129,7 @@ * If this fails it probably means we're debugging a core file and * can't write to it. */ - ps_pdwrite(ph, ta->libkse_debug_addr, &dbg, sizeof(int)); + ps_pwrite(ph, ta->libkse_debug_addr, &dbg, sizeof(int)); *pta = ta; return (0); @@ -150,7 +150,7 @@ * Error returns from this write are not really a problem; * the process doesn't exist any more. */ - ps_pdwrite(ta->ph, ta->libkse_debug_addr, &dbg, sizeof(int)); + ps_pwrite(ta->ph, ta->libkse_debug_addr, &dbg, sizeof(int)); if (ta->map) free(ta->map); free(ta); @@ -164,7 +164,7 @@ TDBG_FUNC(); - ret = ps_pdread(ta->ph, ta->thread_active_threads_addr, np, + ret = ps_pread(ta->ph, ta->thread_active_threads_addr, np, sizeof(int)); return (P2T(ret)); } @@ -191,7 +191,7 @@ if (id < 0 || id >= ta->map_len || ta->map[id].type == PT_NONE) return (TD_NOTHR); - ret = ps_pdread(ta->ph, ta->thread_list_addr, &thread_list, + ret = ps_pread(ta->ph, ta->thread_list_addr, &thread_list, sizeof(thread_list)); if (ret != 0) return (P2T(ret)); @@ -202,12 +202,12 @@ * mapped to user thread. */ while (pt != 0) { - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_lwp), &lwp, sizeof(lwp)); @@ -222,7 +222,7 @@ return (TD_NOTHR); } /* get next thread */ - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tle.tqe_next), &pt, sizeof(pt)); if (ret != 0) @@ -237,13 +237,13 @@ } } else { while (pt != 0 && ta->map[id].thr != pt) { - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); /* get next thread */ - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tle.tqe_next), &pt, sizeof(pt)); if (ret != 0) @@ -271,18 +271,18 @@ TDBG_FUNC(); - ret = ps_pdread(ta->ph, ta->thread_list_addr, &thread_list, + ret = ps_pread(ta->ph, ta->thread_list_addr, &thread_list, sizeof(thread_list)); if (ret != 0) return (P2T(ret)); pt = (psaddr_t)thread_list.tqh_first; while (pt != 0) { - ret = ps_pdread(ta->ph, pt + offsetof(struct pthread, tcb), + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tcb), &ptr, sizeof(ptr)); if (ret != 0) return (P2T(ret)); ptr += offsetof(struct tcb, tcb_tmbx.tm_lwp); - ret = ps_pdread(ta->ph, ptr, &tmp_lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &tmp_lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); if (tmp_lwp == lwp) { @@ -295,7 +295,7 @@ } /* get next thread */ - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tle.tqe_next), &pt, sizeof(pt)); if (ret != 0) @@ -324,7 +324,7 @@ return (P2T(ret)); if (!activated) return (0); - ret = ps_pdread(ta->ph, ta->thread_list_addr, &thread_list, + ret = ps_pread(ta->ph, ta->thread_list_addr, &thread_list, sizeof(thread_list)); if (ret != 0) return (P2T(ret)); @@ -338,7 +338,7 @@ if ((*callback)(&th, cbdata_p)) return (TD_DBERR); /* get next thread */ - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, pt + offsetof(struct pthread, tle.tqe_next), &pt, sizeof(pt)); if (ret != 0) @@ -355,7 +355,7 @@ TDBG_FUNC(); - ret = ps_pdread(ta->ph, (psaddr_t)ta->thread_keytable_addr, keytable, + ret = ps_pread(ta->ph, (psaddr_t)ta->thread_keytable_addr, keytable, sizeof(keytable)); if (ret != 0) return (P2T(ret)); @@ -464,19 +464,19 @@ return (TD_OK); } - ret = ps_pdread(ta->ph, (psaddr_t)(ta->map[th->th_unique].thr), + ret = ps_pread(ta->ph, (psaddr_t)(ta->map[th->th_unique].thr), &pt, sizeof(pt)); if (ret != 0) return (P2T(ret)); if (pt.magic != THR_MAGIC) return (TD_BADTH); tcb_addr = (psaddr_t) pt.tcb; - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_lwp), &info->ti_lid, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_dflags), &dflags, sizeof(dflags)); info->ti_ta_p = th->th_ta_p; @@ -538,14 +538,14 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); ptr = tmbx_addr + offsetof(struct kse_thr_mailbox, tm_lwp); - ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); if (lwp != 0) { @@ -553,7 +553,7 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret != 0) return (P2T(ret)); pt_ucontext_to_fpreg(&tmbx.tm_context, fpregs); @@ -581,21 +581,21 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); ptr = tmbx_addr + offsetof(struct kse_thr_mailbox, tm_lwp); - ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); if (lwp != 0) { ret = ps_lgetregs(ta->ph, lwp, gregs); return (P2T(ret)); } - ret = ps_pdread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret != 0) return (P2T(ret)); pt_ucontext_to_reg(&tmbx.tm_context, gregs); @@ -634,14 +634,14 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); ptr = tmbx_addr + offsetof(struct kse_thr_mailbox, tm_lwp); - ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); if (lwp != 0) { @@ -652,12 +652,12 @@ * Read a copy of context, this makes sure that registers * not covered by structure reg won't be clobbered */ - ret = ps_pdread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret != 0) return (P2T(ret)); pt_fpreg_to_ucontext(fpregs, &tmbx.tm_context); - ret = ps_pdwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); return (P2T(ret)); } @@ -681,14 +681,14 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); ptr = tmbx_addr + offsetof(struct kse_thr_mailbox, tm_lwp); - ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); if (lwp != 0) { @@ -700,11 +700,11 @@ * Read a copy of context, make sure that registers * not covered by structure reg won't be clobbered */ - ret = ps_pdread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret != 0) return (P2T(ret)); pt_reg_to_ucontext(gregs, &tmbx.tm_context); - ret = ps_pdwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); return (P2T(ret)); } @@ -786,7 +786,7 @@ return (TD_OK); } - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, specific), &spec, sizeof(spec)); @@ -795,7 +795,7 @@ *data = NULL; return (0); } - ret = ps_pdread(ta->ph, (psaddr_t)&spec[key], + ret = ps_pread(ta->ph, (psaddr_t)&spec[key], &elem, sizeof(elem)); if (ret == 0) *data = (void *)elem.data; @@ -827,19 +827,19 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, attr.flags), &attrflags, sizeof(attrflags)); if (ret != 0) return (P2T(ret)); - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) return (P2T(ret)); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); ptr = tmbx_addr + offsetof(struct kse_thr_mailbox, tm_lwp); - ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); + ret = ps_pread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); /* @@ -857,7 +857,7 @@ return (P2T(ret)); } - ret = ps_pdread(ta->ph, + ret = ps_pread(ta->ph, tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), &dflags, sizeof(dflags)); if (ret != 0) @@ -867,7 +867,7 @@ dflags |= TMDF_DONOTRUNUSER; else dflags &= ~TMDF_DONOTRUNUSER; - ret = ps_pdwrite(ta->ph, + ret = ps_pwrite(ta->ph, tmbx_addr + offsetof(struct kse_thr_mailbox, tm_dflags), &dflags, sizeof(dflags)); return (P2T(ret)); @@ -898,7 +898,7 @@ *a = ta->thread_activated; return (TD_OK); } - ret = ps_pdread(ta->ph, ta->thread_activated_addr, + ret = ps_pread(ta->ph, ta->thread_activated_addr, &ta->thread_activated, sizeof(int)); if (ret == 0) *a = ta->thread_activated; @@ -927,7 +927,7 @@ return (0); } - ret = ps_pdread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -935,12 +935,12 @@ /* Clear or set single step flag in thread mailbox */ tmp = step ? TMDF_SSTEP : 0; - ret = ps_pdwrite(ta->ph, tcb_addr + offsetof(struct tcb, + ret = ps_pwrite(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_dflags), &tmp, sizeof(tmp)); if (ret != 0) return (P2T(ret)); /* Get lwp */ - ret = ps_pdread(ta->ph, tcb_addr + offsetof(struct tcb, + ret = ps_pread(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_lwp), &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); @@ -953,13 +953,13 @@ * single step status in registers, we should change * these registers. */ - ret = ps_pdread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); + ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret == 0) { pt_ucontext_to_reg(&tmbx.tm_context, ®s); /* only write out if it is really changed. */ if (pt_reg_sstep(®s, step) != 0) { pt_reg_to_ucontext(®s, &tmbx.tm_context); - ret = ps_pdwrite(ta->ph, tmbx_addr, &tmbx, + ret = ps_pwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); } } From owner-p4-projects@FreeBSD.ORG Sun Jul 18 03:28:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD62316A4D0; Sun, 18 Jul 2004 03:28:57 +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 B898016A4CE for ; Sun, 18 Jul 2004 03:28:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF96A43D54 for ; Sun, 18 Jul 2004 03:28:57 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I3SvM2072137 for ; Sun, 18 Jul 2004 03:28:57 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I3SvAA072134 for perforce@freebsd.org; Sun, 18 Jul 2004 03:28:57 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 03:28:57 GMT Message-Id: <200407180328.i6I3SvAA072134@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 57583 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, 18 Jul 2004 03:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=57583 Change 57583 by davidxu@davidxu_alona on 2004/07/18 03:28:41 Call thread_user_enter() in ast(), so thread_userret needn't call it. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#8 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#5 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#8 (text+ko) ==== @@ -373,7 +373,8 @@ error = copyout(&sigset, &ku->ku_mailbox->km_sigscaught, sizeof(sigset)); } else { - if (! kg->kg_completed && !(ku->ku_flags & KUF_DOUPCALL)) { + if (((ku->ku_mflags & KMF_NOCOMPLETED) || + !kg->kg_completed) && !(ku->ku_flags & KUF_DOUPCALL)) { kg->kg_upsleeps++; td->td_kflags |= TDK_KSEREL; error = msleep(&kg->kg_completed, &p->p_mtx, @@ -424,7 +425,7 @@ kg = td->td_ksegrp; if (kg->kg_upsleeps) { mtx_unlock_spin(&sched_lock); - wakeup_one(&kg->kg_completed); + wakeup(&kg->kg_completed); PROC_UNLOCK(p); return (0); } @@ -1135,18 +1136,6 @@ td->td_pflags &= ~TDP_USTATCLOCK; } -#if 0 - /* - * Check if we should unbind and schedule upcall - * after returned from interrupt or etcs, this - * is usually true when process is being debugged. - */ - if (td->td_mailbox == NULL && ku != NULL && - !(td->td_pflags & TDP_UPCALLING) && - (kg->kg_completed || ku->ku_flags & KUF_DOUPCALL)) - thread_user_enter(p, td); -#endif - uts_crit = (td->td_mailbox == NULL); /* * Optimisation: @@ -1190,7 +1179,7 @@ * XXXKSE Maybe wake all of them up. */ if (kg->kg_upsleeps) - wakeup_one(&kg->kg_completed); + wakeup(&kg->kg_completed); mtx_lock_spin(&sched_lock); thread_stopped(p); thread_exit(); @@ -1336,7 +1325,6 @@ PROC_LOCK_ASSERT(p, MA_OWNED); mtx_assert(&sched_lock, MA_OWNED); - return; if (!(p->p_flag & P_SA)) return; ==== //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 18 03:35:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B469D16A4D0; Sun, 18 Jul 2004 03:35:05 +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 7954D16A4CE for ; Sun, 18 Jul 2004 03:35:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 708B543D2F for ; Sun, 18 Jul 2004 03:35:05 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I3Z54j072287 for ; Sun, 18 Jul 2004 03:35:05 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I3Z5Tu072284 for perforce@freebsd.org; Sun, 18 Jul 2004 03:35:05 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 03:35:05 GMT Message-Id: <200407180335.i6I3Z5Tu072284@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 57584 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, 18 Jul 2004 03:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=57584 Change 57584 by davidxu@davidxu_alona on 2004/07/18 03:34:42 Remove unused function. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/thread_db.c#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/thread_db.c#4 (text+ko) ==== @@ -329,22 +329,6 @@ } td_err_e -td_get_ta(int pid, td_thragent_t **ta_p) -{ - td_thragent_t *ta; - struct ps_prochandle *ph; - - TAILQ_FOREACH(ta, &proclist, ta_next) { - td_ta_get_ph(ta, &ph); - if (ps_getpid(ph) == pid) { - *ta_p = ta; - return (TD_OK); - } - } - return (TD_ERR); -} - -td_err_e td_ta_activated(td_thragent_t *ta, int *a) { return ta->ta_ops->to_ta_activated(ta, a); From owner-p4-projects@FreeBSD.ORG Sun Jul 18 05:40:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2A4A16A4D0; Sun, 18 Jul 2004 05:40:43 +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 74E1E16A4CE for ; Sun, 18 Jul 2004 05:40:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6924F43D49 for ; Sun, 18 Jul 2004 05:40:43 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I5ehYa076213 for ; Sun, 18 Jul 2004 05:40:43 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I5efmp076209 for perforce@freebsd.org; Sun, 18 Jul 2004 05:40:41 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 05:40:41 GMT Message-Id: <200407180540.i6I5efmp076209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57596 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, 18 Jul 2004 05:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=57596 Change 57596 by scottl@scottl-junior on 2004/07/18 05:40:04 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/include/param.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/autoconf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/float.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/frame.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_subr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.alpha#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.alpha#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/README#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/fla.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/genfiles#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_break.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_elf.c#3 delete .. //depot/projects/scottl-camlock/src/sys/ddb/db_kld.c#2 delete .. //depot/projects/scottl-camlock/src/sys/ddb/db_main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_print.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_sysctl.c#2 delete .. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/db_trap.c#2 delete .. //depot/projects/scottl-camlock/src/sys/ddb/db_variables.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_variables.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ct/ct.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_pccard.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdcvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gfb/gfb_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/led/led.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/null/null.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rc/rc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sab/sab.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sx/sx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sx/sx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vinum/vinumhdr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vinum/vinumioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vinum/vinummemory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/zs/zs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/doc/Doxyfile#1 branch .. //depot/projects/scottl-camlock/src/sys/doc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_fileno.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gdb/gdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_int.h#1 branch .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_int.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/ext2fs/ext2_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_toshiba.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/autoconf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/scottl-camlock/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/locore.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/frame.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/isa.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/isa_dma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/autoconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/isa/orm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/isa/psm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_rrip.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/device_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mac.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prof.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_conf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_init.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/qsort.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/qsort_r.c#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ahb/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/de/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sound/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sound/pcm/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_disc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ppp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_sl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/ppp_tty.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_async.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_gif_demux.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_fw.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/fdc_cbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/fdcvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/isa_dma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/pc98.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp_via.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_dc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_de.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_devar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_sis.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_ti.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_vr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_mls/mac_mls.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/creator/creator_upa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/iommu.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/event.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/exec.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kdb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/kse.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/libkern.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/linker.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/module.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/procfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ptrace.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/rman.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sched.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socket.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/thr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/tty.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/uio.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/user.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/tools/makeobjops.awk#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -25,10 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $"); - -#include "opt_ddb.h" -#include "opt_dev_sc.h" +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $"); #include #include @@ -49,18 +46,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void api_up1000_init(void); static void api_up1000_cons_init(void); @@ -85,40 +70,15 @@ irongate_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/autoconf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.57 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.59 2004/07/08 22:35:33 brian Exp $"); #include "opt_bootp.h" #include "opt_isa.h" ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $"); #include #include @@ -66,6 +66,7 @@ int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; + bus_dma_segment_t *segments; }; struct bounce_page { @@ -221,7 +222,9 @@ newtag->lockfunc = dflt_lock; newtag->lockfuncarg = NULL; } - + + newtag->segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); @@ -290,6 +293,8 @@ parent = dmat->parent; atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -332,6 +337,14 @@ return (0); } + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if (dmat->lowaddr < ptoa(Maxmem)) { /* Must bounce */ int maxpages; @@ -425,6 +438,14 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -477,11 +498,6 @@ { vm_offset_t vaddr; vm_offset_t paddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_dma_segment_t *sg; int seg; int error; @@ -496,16 +512,16 @@ * of the bus address space. */ vaddr = trunc_page((vm_offset_t) buf); - dm_segments[0].ds_addr = + dmat->segments[0].ds_addr = map->busaddress + (vm_offset_t) buf - vaddr; - dm_segments[0].ds_len = buflen; + dmat->segments[0].ds_len = buflen; buflen = round_page((vm_offset_t) buf + buflen) - vaddr; sgmap_load_region(chipset.sgmap, map->busaddress, vaddr, buflen); map->buflen = buflen; - (*callback)(callback_arg, dm_segments, 1, error); + (*callback)(callback_arg, dmat->segments, 1, error); return (0); } @@ -560,7 +576,7 @@ } vaddr = (vm_offset_t)buf; - sg = &dm_segments[0]; + sg = &dmat->segments[0]; seg = 1; sg->ds_len = 0; @@ -604,7 +620,7 @@ error = EFBIG; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 18 06:29:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE61416A4D0; Sun, 18 Jul 2004 06:29:45 +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 8B12516A4CE for ; Sun, 18 Jul 2004 06:29:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 827AA43D2D for ; Sun, 18 Jul 2004 06:29:45 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I6TjwP077530 for ; Sun, 18 Jul 2004 06:29:45 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I6Tj4b077527 for perforce@freebsd.org; Sun, 18 Jul 2004 06:29:45 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 06:29:45 GMT Message-Id: <200407180629.i6I6Tj4b077527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57604 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, 18 Jul 2004 06:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=57604 Change 57604 by scottl@scottl-junior on 2004/07/18 06:29:15 Move the CCB allocator to use UMA instead of malloc. This mainly affects xpt_alloc_ccb/xpt_free_ccb, but many places were doing their own allocation of ccbs and then passing them to the XPT for ownership, so they are changed to use xpt_alloc_ccb also. This gives about a 2-3% performance improvement under SMP. It seems to take a while to warm up the UMA caches, and it doesn't perform nearly as well in it's current form as when you pre-allocate a significant number of objects. However, Doing such over-preallocation is extremely wasteful of memory. There was a bit of code to try to dynamically grow and shrink the ccb pool. This largely remains, but provides no direct pressure to UMA. Small tests involving dynamically growing the UMA zone in response to this pressure provided neglible benefits. We instead rely on UMA's own mechanisms for adjusting the zone size. Furture optimizaters might want to look at making use of the ctor/dtors that UMA provides. It would also be useful to tie the pools to per-CPU and/or per-interface zones to achieve better locality and fewer UMA locks in the slow path. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#5 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#3 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#3 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#5 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #ifdef PC98 #include /* geometry translation */ @@ -482,6 +483,8 @@ struct cam_periph *xpt_periph; +static uma_zone_t ccb_zone; + static periph_init_t xpt_periph_init; static struct periph_driver xpt_driver = @@ -874,7 +877,7 @@ case XPT_ENG_INQ: case XPT_SCAN_LUN: - ccb = xpt_alloc_ccb(); + ccb = xpt_alloc_ccb(M_WAITOK); /* * Create a path using the bus, target, and lun the @@ -1206,6 +1209,10 @@ SLIST_INIT(&ccb_freeq); STAILQ_INIT(&highpowerq); + /* Create the CCB zone */ + ccb_zone = uma_zcreate("CAM CCB Pool", sizeof(union ccb), NULL, NULL, + NULL, NULL, 0, 0); + /* * The xpt layer is, itself, the equivelent of a SIM. * Allow 16 ccbs in the ccb pool for it. This should @@ -1222,6 +1229,7 @@ /*max_tagged_dev_transactions*/0, devq); xpt_max_ccbs = 16; + uma_prealloc(ccb_zone, xpt_max_ccbs); xpt_bus_register(xpt_sim, /*bus #*/0); @@ -4685,20 +4693,18 @@ } union ccb * -xpt_alloc_ccb() +xpt_alloc_ccb(int wait) { union ccb *new_ccb; - GIANT_REQUIRED; - - new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_WAITOK); + new_ccb = uma_zalloc(ccb_zone, wait); return (new_ccb); } void xpt_free_ccb(union ccb *free_ccb) { - free(free_ccb, M_DEVBUF); + uma_zfree(ccb_zone, free_ccb); } @@ -4720,7 +4726,7 @@ s = splsoftcam(); if ((new_ccb = (union ccb *)SLIST_FIRST(&ccb_freeq)) == NULL) { - new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_NOWAIT); + new_ccb = xpt_alloc_ccb(M_NOWAIT); if (new_ccb == NULL) { splx(s); return (NULL); @@ -5031,7 +5037,7 @@ u_int initiator_id; /* Find out the characteristics of the bus */ - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb(M_WAITOK); xpt_setup_ccb(&work_ccb->ccb_h, request_ccb->ccb_h.path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_PATH_INQ; @@ -5086,7 +5092,7 @@ status); break; } - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb(M_WAITOK); xpt_setup_ccb(&work_ccb->ccb_h, path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_SCAN_LUN; @@ -5896,7 +5902,7 @@ cam_status status; int can_negotiate; - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb(M_WAITOK); if ((status = xpt_create_path(&path, xpt_periph, bus->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD)) !=CAM_REQ_CMP){ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL void xpt_polled_action(union ccb *ccb); -union ccb *xpt_alloc_ccb(void); +union ccb *xpt_alloc_ccb(int wait); void xpt_free_ccb(union ccb *free_ccb); void xpt_release_ccb(union ccb *released_ccb); void xpt_schedule(struct cam_periph *perph, u_int32_t new_priority); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#2 (text+ko) ==== @@ -955,7 +955,7 @@ { xpt_free_path(ccb->ccb_h.path); - free(ccb, M_DEVBUF); + xpt_free_ccb(ccb); } static void @@ -963,7 +963,7 @@ struct scsi_low_softc *slp; { struct cam_path *path; - union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, M_WAITOK); + union ccb *ccb = xpt_alloc_ccb(M_WAITOK); cam_status status; bzero(ccb, sizeof(union ccb)); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#3 (text+ko) ==== @@ -494,7 +494,7 @@ inccb->ccb_h.pinfo.priority); ccb_malloced = 0; } else { - ccb = xpt_alloc_ccb(); + ccb = xpt_alloc_ccb(M_WAITOK); if (ccb != NULL) xpt_setup_ccb(&ccb->ccb_h, periph->path, ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#3 (text+ko) ==== @@ -820,7 +820,7 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = xpt_alloc_ccb(M_NOWAIT); if (request_ccb == NULL) { xpt_print_path(path); printf("xpt_scan_lun: can't allocate CCB, can't " @@ -832,7 +832,7 @@ xpt_print_path(path); printf("xpt_scan_lun: can't allocate path, can't " "continue\n"); - free(request_ccb, M_TEMP); + xpt_free_ccb(request_ccb); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -844,7 +844,7 @@ xpt_print_path(path); printf("xpt_scan_lun: can't compile path, can't " "continue\n"); - free(request_ccb, M_TEMP); + xpt_free_ccb(request_ccb); free(new_path, M_TEMP); return; } @@ -886,6 +886,6 @@ { xpt_release_path(done_ccb->ccb_h.path); free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + xpt_free_ccb(done_ccb); } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#2 (text+ko) ==== @@ -576,7 +576,7 @@ if (softc->state == TARGBH_STATE_TEARDOWN || atio->ccb_h.status == CAM_REQ_ABORTED) { targbhfreedescr(descr); - free(done_ccb, M_DEVBUF); + xpt_free_ccb(done_ccb); return; } @@ -737,7 +737,7 @@ if (softc->state == TARGBH_STATE_TEARDOWN || done_ccb->ccb_h.status == CAM_REQ_ABORTED) { printf("Freed an immediate notify\n"); - free(done_ccb, M_DEVBUF); + xpt_free_ccb(done_ccb); } else { /* Requeue for another immediate event */ xpt_action(done_ccb); From owner-p4-projects@FreeBSD.ORG Sun Jul 18 06:38:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F40216A4D0; Sun, 18 Jul 2004 06:38:57 +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 1E78D16A4CE for ; Sun, 18 Jul 2004 06:38:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13ECB43D49 for ; Sun, 18 Jul 2004 06:38:57 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I6cvIs077780 for ; Sun, 18 Jul 2004 06:38:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I6cuYc077777 for perforce@freebsd.org; Sun, 18 Jul 2004 06:38:56 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 06:38:56 GMT Message-Id: <200407180638.i6I6cuYc077777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57605 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, 18 Jul 2004 06:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=57605 Change 57605 by scottl@scottl-junior on 2004/07/18 06:38:06 Follow in the footsteps on Project Evil. A SCSI miniport is coming to a repository near you! Affected files ... .. //depot/projects/sonofevil/src/sys/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/alpha/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/support.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/sonofevil/src/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/sonofevil/src/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/sonofevil/src/sys/alpha/conf/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/alpha/conf/NOTES#1 branch .. //depot/projects/sonofevil/src/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/_limits.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/_types.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/asm.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/atomic.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/bus.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/bwx.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/chipset.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/clock.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/cpu.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/critical.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/elf.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/endian.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/exec.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/float.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/fpu.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/frame.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ieee.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/inst.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/intr.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/limits.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/md_var.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/mutex.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pal.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/param.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pcb.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pmap.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/proc.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/profile.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/prom.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/pte.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/reg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/reloc.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/resource.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/rpb.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/runq.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/signal.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/smp.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/swiz.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/varargs.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/isa/isa.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/sonofevil/src/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/sonofevil/src/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/cia.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/lca.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/t2.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/sonofevil/src/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/sonofevil/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/sonofevil/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/sonofevil/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/sonofevil/src/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/sonofevil/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/critical.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/float.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/param.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/sonofevil/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/sonofevil/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/critical.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/support.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/sonofevil/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/_types.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/asm.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/bus.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/clock.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/critical.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/elf.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/endian.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/exec.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/float.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/fp.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/frame.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/intr.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/limits.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/param.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/proc.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/profile.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/psl.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/pte.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/reg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/resource.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/runq.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/signal.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/smp.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/swi.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/trap.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/sonofevil/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/README#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/arc/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/boot.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/commands.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/console.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/help.common#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/interp.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/load.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/loader.8#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/ls.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/misc.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/panic.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/sonofevil/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/README#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/loader/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/loader/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/efi/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/sonofevil/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/delay.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/exit.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/libski.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/libski/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/ia64/skiload/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/sonofevil/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/sonofevil/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/sonofevil/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/00READ#1 branch .. //depot/projects/sonofevil/src/sys/coda/README#1 branch .. //depot/projects/sonofevil/src/sys/coda/TODO#1 branch .. //depot/projects/sonofevil/src/sys/coda/cnode.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_io.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_psdev.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_psdev.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_subr.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_subr.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_venus.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_venus.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_vnops.c#1 branch .. //depot/projects/sonofevil/src/sys/coda/coda_vnops.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/sonofevil/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/sonofevil/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/svr4/Makefile#1 branch .. //depot/projects/sonofevil/src/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/svr4/svr4_acl.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 18 06:59:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B7ED16A4D0; Sun, 18 Jul 2004 06:59:23 +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 6652B16A4CE for ; Sun, 18 Jul 2004 06:59:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FE0D43D31 for ; Sun, 18 Jul 2004 06:59:23 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I6xNrp078675 for ; Sun, 18 Jul 2004 06:59:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I6xMN5078672 for perforce@freebsd.org; Sun, 18 Jul 2004 06:59:22 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 06:59:22 GMT Message-Id: <200407180659.i6I6xMN5078672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57608 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, 18 Jul 2004 06:59:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=57608 Change 57608 by scottl@scottl-junior on 2004/07/18 06:58:39 Move compat/ndis to compat/ntoskern to reflect that it will do more than just ndis. This doesn't compile yet. Affected files ... .. //depot/projects/sonofevil/src/sys/compat/ndis/cfg_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/hal_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/kern_ndis.c#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/ndis_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/ntoskrnl_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/pe_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/resource_var.h#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_hal.c#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_ndis.c#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_ntoskrnl.c#2 delete .. //depot/projects/sonofevil/src/sys/compat/ndis/subr_pe.c#2 delete .. //depot/projects/sonofevil/src/sys/compat/ntoskern/cfg_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/hal_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/kern_ndis.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/ndis_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/ntoskrnl_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/pe_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/resource_var.h#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_hal.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ndis.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ntoskrnl.c#1 branch .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_pe.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 18 07:19:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B280316A4D0; Sun, 18 Jul 2004 07:19:49 +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 70CBC16A4CE for ; Sun, 18 Jul 2004 07:19:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 539BC43D31 for ; Sun, 18 Jul 2004 07:19:49 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I7Jnqi079339 for ; Sun, 18 Jul 2004 07:19:49 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I7JnCf079336 for perforce@freebsd.org; Sun, 18 Jul 2004 07:19:49 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 07:19:49 GMT Message-Id: <200407180719.i6I7JnCf079336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57610 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, 18 Jul 2004 07:19:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=57610 Change 57610 by scottl@scottl-junior on 2004/07/18 07:19:07 Move the ndis module to ntoskern. Affected files ... .. //depot/projects/sonofevil/src/sys/modules/ndis/Makefile#2 delete .. //depot/projects/sonofevil/src/sys/modules/ntoskern/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 18 07:25:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8537C16A4D0; Sun, 18 Jul 2004 07:25:58 +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 4450516A4CE for ; Sun, 18 Jul 2004 07:25:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F56843D55 for ; Sun, 18 Jul 2004 07:25:58 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I7PvHZ079567 for ; Sun, 18 Jul 2004 07:25:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I7PvwS079564 for perforce@freebsd.org; Sun, 18 Jul 2004 07:25:57 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 07:25:57 GMT Message-Id: <200407180725.i6I7PvwS079564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57612 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, 18 Jul 2004 07:25:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=57612 Change 57612 by scottl@scottl-junior on 2004/07/18 07:25:14 Make ntoskern.ko compile in its new location. Affected files ... .. //depot/projects/sonofevil/src/sys/compat/ntoskern/kern_ndis.c#2 edit .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_hal.c#2 edit .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ndis.c#2 edit .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ntoskrnl.c#2 edit .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_pe.c#2 edit .. //depot/projects/sonofevil/src/sys/modules/ntoskern/Makefile#2 edit Differences ... ==== //depot/projects/sonofevil/src/sys/compat/ntoskern/kern_ndis.c#2 (text+ko) ==== @@ -67,12 +67,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define NDIS_DUMMY_PATH "\\\\some\\bogus\\path" ==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_hal.c#2 (text+ko) ==== @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define FUNC void(*)(void) ==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ndis.c#2 (text+ko) ==== @@ -95,12 +95,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define FUNC void(*)(void) @@ -297,7 +297,7 @@ int ndis_libinit() { - strcpy(ndis_filepath, "/compat/ndis"); + strcpy(ndis_filepath, "/compat/ntoskern"); return(0); } ==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ntoskrnl.c#2 (text+ko) ==== @@ -59,11 +59,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define __regparm __attribute__((regparm(3))) ==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_pe.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ #include #endif -#include +#include static vm_offset_t pe_functbl_match(image_patch_table *, char *); ==== //depot/projects/sonofevil/src/sys/modules/ntoskern/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/sys/modules/ndis/Makefile,v 1.6 2004/03/07 02:49:06 wpaul Exp $ -.PATH: ${.CURDIR}/../../compat/ndis +.PATH: ${.CURDIR}/../../compat/ntoskern -KMOD= ndis +KMOD= ntoskern SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h vnode_if.h From owner-p4-projects@FreeBSD.ORG Sun Jul 18 07:31:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 570B716A4D0; Sun, 18 Jul 2004 07:31:05 +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 2BA9D16A4CE for ; Sun, 18 Jul 2004 07:31:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C8E743D1D for ; Sun, 18 Jul 2004 07:31:05 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6I7V4N0079695 for ; Sun, 18 Jul 2004 07:31:04 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6I7V42e079692 for perforce@freebsd.org; Sun, 18 Jul 2004 07:31:04 GMT (envelope-from scottl@freebsd.org) Date: Sun, 18 Jul 2004 07:31:04 GMT Message-Id: <200407180731.i6I7V42e079692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57613 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, 18 Jul 2004 07:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=57613 Change 57613 by scottl@scottl-junior on 2004/07/18 07:31:03 Teach if_ndis about the ndisapi->ntoskern rename. Affected files ... .. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis.c#2 edit .. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pccard.c#2 edit .. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pci.c#2 edit Differences ... ==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis.c#2 (text+ko) ==== @@ -71,12 +71,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define NDIS_IMAGE ==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pccard.c#2 (text+ko) ==== @@ -53,11 +53,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -70,7 +70,7 @@ MODULE_DEPEND(ndis, pccard, 1, 1, 1); MODULE_DEPEND(ndis, ether, 1, 1, 1); MODULE_DEPEND(ndis, wlan, 1, 1, 1); -MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); +MODULE_DEPEND(ndis, ntoskern, 1, 1, 1); /* * Various supported device vendors/types and their names. ==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pci.c#2 (text+ko) ==== @@ -55,11 +55,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "ndis_driver_data.h" @@ -69,7 +69,7 @@ MODULE_DEPEND(ndis, pci, 1, 1, 1); MODULE_DEPEND(ndis, ether, 1, 1, 1); MODULE_DEPEND(ndis, wlan, 1, 1, 1); -MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); +MODULE_DEPEND(ndis, ntoskern, 1, 1, 1); /* * Various supported device vendors/types and their names. From owner-p4-projects@FreeBSD.ORG Sun Jul 18 11:49:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAFA716A4D0; Sun, 18 Jul 2004 11:49:19 +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 B4DCA16A4CE for ; Sun, 18 Jul 2004 11:49:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98C8843D49 for ; Sun, 18 Jul 2004 11:49:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6IBnJa4087159 for ; Sun, 18 Jul 2004 11:49:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6IBnJ1R087156 for perforce@freebsd.org; Sun, 18 Jul 2004 11:49:19 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 11:49:19 GMT Message-Id: <200407181149.i6IBnJ1R087156@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 57622 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, 18 Jul 2004 11:49:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=57622 Change 57622 by davidxu@davidxu_alona on 2004/07/18 11:49:00 Mark end of frames. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/vm_machdep.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/i386/i386/vm_machdep.c#2 (text+ko) ==== @@ -441,6 +441,7 @@ * Set the trap frame to point at the beginning of the uts * function. */ + td->td_frame->tf_ebp = 0; td->td_frame->tf_esp = (int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size - 16; td->td_frame->tf_eip = (int)ku->ku_func; From owner-p4-projects@FreeBSD.ORG Sun Jul 18 13:23:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EC1816A4D0; Sun, 18 Jul 2004 13:23:15 +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 325A616A4CE for ; Sun, 18 Jul 2004 13:23:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A15D43D55 for ; Sun, 18 Jul 2004 13:23:15 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6IDNE9v089972 for ; Sun, 18 Jul 2004 13:23:15 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6IDNEea089969 for perforce@freebsd.org; Sun, 18 Jul 2004 13:23:14 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 13:23:14 GMT Message-Id: <200407181323.i6IDNEea089969@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 57626 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, 18 Jul 2004 13:23:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=57626 Change 57626 by davidxu@davidxu_alona on 2004/07/18 13:22:44 Refine code ptracestop. Don't schdule upcall in trapsignal if the signal is a debug signal and we are being debugged, this allows debugger to resume and single step the thread without going into UTS which maybe be blocked by schedule lock or other blockable objects. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#12 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#12 (text+ko) ==== @@ -1484,24 +1484,13 @@ p = td->td_proc; if (td->td_pflags & TDP_SA) { - if (td->td_mailbox == NULL) - thread_user_enter(p, td); - if ((p->p_flag & P_TRACED) && (sig == SIGTRAP)) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_CAN_UNBIND; - mtx_unlock_spin(&sched_lock); + /* Don't upcall if it is debug signal */ + if (!((p->p_flag & P_TRACED) && (sig == SIGTRAP))) { + if (td->td_mailbox == NULL) + thread_user_enter(p, td); } PROC_LOCK(p); SIGDELSET(td->td_sigmask, sig); - mtx_lock_spin(&sched_lock); - /* - * Force scheduling an upcall, so UTS has chance to - * process the signal before thread runs again in - * userland. - */ - if (td->td_upcall) - td->td_upcall->ku_flags |= KUF_DOUPCALL; - mtx_unlock_spin(&sched_lock); } else { PROC_LOCK(p); } @@ -2016,13 +2005,8 @@ td->td_flags |= TDF_XSIG; mtx_unlock_spin(&sched_lock); td->td_xsig = sig; - while ((p->p_flag & P_TRACED) && (td->td_flags & TDF_XSIG)) { - if (p->p_flag & P_SINGLE_EXIT) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_XSIG; - mtx_unlock_spin(&sched_lock); - return (sig); - } + while (!(p->p_flag & P_SINGLE_EXIT) && (p->p_flag & P_TRACED) + && (td->td_flags & TDF_XSIG)) { /* * Just make wait() to work, the last stopped thread * will win. @@ -2049,15 +2033,18 @@ mtx_unlock_spin(&sched_lock); PICKUP_GIANT(); PROC_LOCK(p); - if (!(p->p_flag & P_TRACED)) + if ((p->p_flag & P_SINGLE_EXIT) || !(p->p_flag & P_TRACED)) break; if (td->td_flags & TDF_DBSUSPEND) { - if (p->p_flag & P_SINGLE_EXIT) - break; mtx_lock_spin(&sched_lock); goto stopme; } } + if (td->td_flags & TDF_XSIG) { + mtx_lock_spin(&sched_lock); + td->td_flags &= ~TDF_XSIG; + mtx_unlock_spin(&sched_lock); + } return (td->td_xsig); } @@ -2111,8 +2098,10 @@ */ if (SIGISMEMBER(ps->ps_sigignore, sig) && (traced == 0)) { SIGDELSET(td->td_siglist, sig); - if (td->td_pflags & TDP_SA) + if (td->td_pflags & TDP_SA) { SIGADDSET(td->td_sigmask, sig); + SIG_CANTMASK(td->td_sigmask); + } continue; } if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) { @@ -2129,8 +2118,10 @@ * otherwise we just look for signals again. */ SIGDELSET(td->td_siglist, sig); /* clear old signal */ - if (td->td_pflags & TDP_SA) + if (td->td_pflags & TDP_SA) { SIGADDSET(td->td_sigmask, sig); + SIG_CANTMASK(td->td_sigmask); + } if (newsig == 0) continue; sig = newsig; @@ -2281,8 +2272,8 @@ n++; if ((p->p_flag & P_STOPPED_SIG) && (n == p->p_numthreads)) { mtx_unlock_spin(&sched_lock); + PROC_LOCK(p->p_pptr); stop(p); - PROC_LOCK(p->p_pptr); ps = p->p_pptr->p_sigacts; mtx_lock(&ps->ps_mtx); if ((ps->ps_flag & PS_NOCLDSTOP) == 0) { From owner-p4-projects@FreeBSD.ORG Sun Jul 18 13:24:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00D6616A4D0; Sun, 18 Jul 2004 13:24:16 +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 CFCD916A4CE for ; Sun, 18 Jul 2004 13:24:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC56043D49 for ; Sun, 18 Jul 2004 13:24:16 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6IDOGJF089993 for ; Sun, 18 Jul 2004 13:24:16 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6IDOGq5089990 for perforce@freebsd.org; Sun, 18 Jul 2004 13:24:16 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 13:24:16 GMT Message-Id: <200407181324.i6IDOGq5089990@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 57627 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, 18 Jul 2004 13:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=57627 Change 57627 by davidxu@davidxu_alona on 2004/07/18 13:23:56 Kill a XXKSE which is no longer true. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#9 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#9 (text+ko) ==== @@ -1173,11 +1173,6 @@ } else if (td->td_mailbox && (ku == NULL)) { thread_export_context(td, 1); PROC_LOCK(p); - /* - * There are upcall threads waiting for - * work to do, wake one of them up. - * XXXKSE Maybe wake all of them up. - */ if (kg->kg_upsleeps) wakeup(&kg->kg_completed); mtx_lock_spin(&sched_lock); From owner-p4-projects@FreeBSD.ORG Sun Jul 18 13:34:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E474C16A4D0; Sun, 18 Jul 2004 13:34:29 +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 A3F3616A4CE for ; Sun, 18 Jul 2004 13:34:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EB5043D1F for ; Sun, 18 Jul 2004 13:34:29 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6IDYToa090217 for ; Sun, 18 Jul 2004 13:34:29 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6IDYTWl090214 for perforce@freebsd.org; Sun, 18 Jul 2004 13:34:29 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 18 Jul 2004 13:34:29 GMT Message-Id: <200407181334.i6IDYTWl090214@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 57628 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, 18 Jul 2004 13:34:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=57628 Change 57628 by davidxu@davidxu_alona on 2004/07/18 13:34:11 Rewrite fbsd_thread_resume. Use ptrace to control LWP, when single stepping a thread, we don't use td_thr_dbsuspend or td_thr_dbresume, I think those two functions are used by user on command line to suspend/resume thread, do not try to use them internally, it may involve too much thing not related to single stepping. because we now bind thread in kernel if the thread generates a SIGTRAP, we are safe to single step it without bothering UTS which may can not run when process stops. Current, I still use PT_SUSPEND PT_RESUME, I think we may need change ptrace code to let PT_CONTINUE/PT_STEP resume only one LWP, TBD... Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#14 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#14 (text+ko) ==== @@ -70,7 +70,7 @@ static td_thragent_t *thread_agent; /* The last thread we are single stepping */ -static ptid_t last_single_step_thread; +static lwpid_t last_single_step_lwp; /* Pointers to the libthread_db functions. */ @@ -316,7 +316,6 @@ gdb_assert (proc_handle.pid == 0); keep_thread_db = 1; } - /* We can only poke around if there actually is a child process. If there is no child process alive, postpone the steps below until one has been created. */ @@ -383,7 +382,7 @@ td_thrinfo_t ti; ptid_t work_ptid; int resume_all, ret; - long lwp, thvalid = 0; + long lwp; #if 0 printf_filtered("%s ptid=%ld.%ld.%ld step=%d\n", __func__, @@ -399,7 +398,7 @@ return; } - if (GET_PID(ptid) != -1 && step != 0) + if (GET_PID (ptid) != -1 && step != 0) { resume_all = 0; work_ptid = ptid; @@ -432,49 +431,59 @@ ret = td_thr_get_info_p (&th, &ti); if (ret) error (thread_db_err_str (ret)); - thvalid = 1; lwp = ti.ti_lid; } + if (!resume_all && lwp == 0) + { + error ("sorry this version of FreeBSD can not resume inactivated thread"); + } + if (lwp) { int req = step ? PT_SETSTEP : PT_CLEARSTEP; - if (ptrace (req, (pid_t) lwp, (caddr_t) 1, target_signal_to_host(signo))) + if (ptrace (req, (pid_t) lwp, 0, 0)) perror_with_name ("PT_SETSTEP/PT_CLEARSTEP"); } - if (!ptid_equal (last_single_step_thread, null_ptid)) + int nlwps = ptrace (PT_GETNUMLWPS, proc_handle.pid, 0, 0); + if (nlwps == -1) + perror_with_name ("PT_GETNUMLWPS"); + lwpid_t *lwps = malloc (nlwps * sizeof(lwpid_t)); + nlwps = ptrace (PT_GETLWPLIST, proc_handle.pid, (caddr_t)lwps, nlwps); + if (nlwps == -1) { - ret = td_ta_thr_iter_p (thread_agent, resume_thread_callback, NULL, - TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, - TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); - if (ret != TD_OK) - error ("resume error: %s", thread_db_err_str (ret)); + perror_with_name ("PT_GETLWPLIST"); + free (lwps); } - if (!resume_all) + int i; + if (last_single_step_lwp != 0) { - ret = td_ta_thr_iter_p (thread_agent, suspend_thread_callback, NULL, - TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, - TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); - if (ret != TD_OK) - error ("suspend error: %s", thread_db_err_str (ret)); - last_single_step_thread = work_ptid; + /* resume all threads if ever suspend them */ + for (i = 0; i < nlwps; ++i) + { + if (ptrace (PT_RESUME, lwps[i], 0, 0)) + perror_with_name ("PT_SUSPEND"); + } } - else - last_single_step_thread = null_ptid; - if (thvalid) + if (!resume_all) { - ret = td_thr_dbresume_p (&th); - if (ret != TD_OK) - error ("resume error: %s", thread_db_err_str (ret)); + for (i = 0; i < nlwps; ++i) + { + if (lwps[i] == lwp) + continue; + if (ptrace (PT_SUSPEND, lwps[i], 0, 0)) + perror_with_name ("PT_SUSPEND"); + } + last_single_step_lwp = lwp; } else - { - /* it is not necessary, put it here for completness */ - ret = ptrace(PT_RESUME, lwp, 0, 0); - } + last_single_step_lwp = 0; + + free (lwps); +/* ret = ptrace(PT_RESUME, lwp, 0, 0); */ /* now continue the process, suspended thread wont run */ if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1, @@ -496,6 +505,17 @@ ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); if (!in_thread_list (ret)) add_thread (ret); + /* this is a hack, if an event won't cause gdb to stop, for example, + SIGARLM, gdb resumes the process immediatly without setting + inferior_ptid to the new thread returned here, this is a bug + because inferior_ptid may already not exist there, and passing + a none existing thread to fbsd_thread_resume causes error, this + should be treated as a bug of gdb. */ + if (!fbsd_thread_alive (inferior_ptid)) + { + delete_thread (inferior_ptid); + inferior_ptid = ret; + } } return (ret); From owner-p4-projects@FreeBSD.ORG Sun Jul 18 21:36:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F40616A4D0; Sun, 18 Jul 2004 21:36:21 +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 C66BF16A4CE for ; Sun, 18 Jul 2004 21:36:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC51743D54 for ; Sun, 18 Jul 2004 21:36:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6ILaKhn004438 for ; Sun, 18 Jul 2004 21:36:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6ILaJeH004435 for perforce@freebsd.org; Sun, 18 Jul 2004 21:36:19 GMT (envelope-from marcel@freebsd.org) Date: Sun, 18 Jul 2004 21:36:19 GMT Message-Id: <200407182136.i6ILaJeH004435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57651 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, 18 Jul 2004 21:36:21 -0000 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 * 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 #include +#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 ==== //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 * 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 -__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 #include @@ -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] [dev3 [...]]\n", name); fprintf(stderr, " %s stop [-fv] [name2 [...]]\n", name); fprintf(stderr, " %s clear [-v] [dev2 [...]]\n", name); + fprintf(stderr, " %s dump [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 -__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) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 00:11:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6347416A4D0; Mon, 19 Jul 2004 00:11:32 +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 1FB6B16A4CE for ; Mon, 19 Jul 2004 00:11:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1811943D39 for ; Mon, 19 Jul 2004 00:11:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J0BVLU008736 for ; Mon, 19 Jul 2004 00:11:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J0BVpE008733 for perforce@freebsd.org; Mon, 19 Jul 2004 00:11:31 GMT (envelope-from marcel@freebsd.org) Date: Mon, 19 Jul 2004 00:11:31 GMT Message-Id: <200407190011.i6J0BVpE008733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57662 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: Mon, 19 Jul 2004 00:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=57662 Change 57662 by marcel@marcel_nfs on 2004/07/19 00:10:58 Revert changes to libc_r. It's actually better to not touch libc_r, because that guarantees that we can use a 5.x gdb(1) on a 4.x threaded program. Affected files ... .. //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#5 edit .. //depot/projects/gdb/lib/libc_r/uthread/uthread_create.c#3 edit .. //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#4 edit Differences ... ==== //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#5 (text+ko) ==== @@ -1180,21 +1180,6 @@ #endif ; -/* - * libthread_db.so support. - */ -SCLASS int _libc_r_debug -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0 -#endif -; - -SCLASS int _libc_r_lwpid -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0 -#endif -; - /* Undefine the storage class specifier: */ #undef SCLASS ==== //depot/projects/gdb/lib/libc_r/uthread/uthread_create.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "pthread_private.h" #include "libc_private.h" -static u_int64_t last_uniqueid = 1; +static u_int64_t next_uniqueid = 1; #define OFF(f) offsetof(struct pthread, f) int _thread_next_offset = OFF(tle.tqe_next); @@ -212,7 +212,7 @@ * Initialise the unique id which GDB uses to * track threads. */ - new_thread->uniqueid = ++last_uniqueid; + new_thread->uniqueid = next_uniqueid++; /* * Check if the garbage collector thread ==== //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#4 (text+ko) ==== @@ -337,7 +337,6 @@ memset(&_thread_kern_thread, 0, sizeof(struct pthread)); _thread_kern_thread.flags = PTHREAD_FLAGS_PRIVATE; memset(_thread_initial, 0, sizeof(struct pthread)); - _thread_initial->uniqueid = 1; /* Initialize the waiting and work queues: */ TAILQ_INIT(&_waitingq); From owner-p4-projects@FreeBSD.ORG Mon Jul 19 00:17:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 354CC16A4D0; Mon, 19 Jul 2004 00:17:40 +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 EDF5C16A4CE for ; Mon, 19 Jul 2004 00:17:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E32B143D3F for ; Mon, 19 Jul 2004 00:17:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J0Hd9M008904 for ; Mon, 19 Jul 2004 00:17:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J0Hdhg008901 for perforce@freebsd.org; Mon, 19 Jul 2004 00:17:39 GMT (envelope-from marcel@freebsd.org) Date: Mon, 19 Jul 2004 00:17:39 GMT Message-Id: <200407190017.i6J0Hdhg008901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57663 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: Mon, 19 Jul 2004 00:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=57663 Change 57663 by marcel@marcel_nfs on 2004/07/19 00:17:28 Resolve merge conflicts by making these files identical to CVS. Affected files ... .. //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#3 edit .. //depot/projects/gdb/lib/libthread_db/libc_r_db.c#5 edit .. //depot/projects/gdb/lib/libthread_db/libpthread_db.c#3 edit .. //depot/projects/gdb/lib/libthread_db/libthr_db.c#4 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.c#3 edit .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#5 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#3 (text+ko) ==== @@ -25,13 +25,13 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/arch/i386/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $"); #include #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t *r) +libc_r_md_getgregs(jmp_buf jb, prgregset_t r) { r->r_eip = jb->_jb[0]; r->r_ebx = jb->_jb[1]; ==== //depot/projects/gdb/lib/libthread_db/libc_r_db.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.1 2004/07/18 04:17:13 marcel Exp $"); #include #include @@ -36,7 +36,7 @@ #include "thread_db_int.h" void libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *); -void libc_r_md_getgregs(jmp_buf jb, prgregset_t *); +void libc_r_md_getgregs(jmp_buf jb, prgregset_t); struct td_thragent { TD_THRAGENT_FIELDS; @@ -215,7 +215,7 @@ ps_err_e err; ta = th->th_ta; - ti->ti_ta = ta; + ti->ti_ta_p = ta; err = ps_pread(ta->ta_ph, ta->ta_thread_run, ¤t, sizeof(psaddr_t)); if (err != PS_OK) @@ -254,7 +254,7 @@ } static td_err_e -libc_r_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t *r) +libc_r_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t r) { jmp_buf jb; const td_thragent_t *ta; @@ -291,7 +291,7 @@ } static td_err_e -libc_r_db_thr_setgregs(const td_thrhandle_t *th, const prgregset_t *r) +libc_r_db_thr_setgregs(const td_thrhandle_t *th, const prgregset_t r) { return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/libpthread_db.c#3 (text+ko) ==== @@ -25,41 +25,25 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.1 2004/07/18 04:17:13 marcel Exp $"); #include #include #include #include #include -#include #include #include #include #include #include -#include "pthread_db.h" +#include "libpthread.h" +#include "libpthread_db.h" -struct pt_map { - enum { - PT_NONE, - PT_USER, - PT_LWP - } type; - - union { - lwpid_t lwp; - psaddr_t thr; - }; -}; - #define P2T(c) ps2td(c) -static td_err_e pt_ta_activated(pt_thragent_t *ta, int *a); -static long pt_map_thread(const pt_thragent_t *ta, psaddr_t pt); -static long pt_map_lwp(const pt_thragent_t *ta, lwpid_t lwp); -static void pt_unmap_lwp(const pt_thragent_t *ta, lwpid_t lwp); +static void pt_unmap_lwp(const td_thragent_t *ta, lwpid_t lwp); static int pt_validate(const td_thrhandle_t *th); static int @@ -85,6 +69,48 @@ } } +static long +pt_map_thread(const td_thragent_t *const_ta, psaddr_t pt, int type) +{ + td_thragent_t *ta = __DECONST(td_thragent_t *, const_ta); + struct pt_map *new; + int i, first = -1; + + /* leave zero out */ + for (i = 1; i < ta->map_len; ++i) { + if (ta->map[i].type == PT_NONE) { + if (first == -1) + first = i; + } else if (ta->map[i].type == type && ta->map[i].thr == pt) { + return (i); + } + } + + if (first == -1) { + if (ta->map_len == 0) { + ta->map = calloc(20, sizeof(struct pt_map)); + if (ta->map == NULL) + return (-1); + ta->map_len = 20; + first = 1; + } else { + new = realloc(ta->map, + sizeof(struct pt_map) * ta->map_len * 2); + if (new == NULL) + return (-1); + memset(new + ta->map_len, '\0', sizeof(struct pt_map) * + ta->map_len); + first = ta->map_len; + ta->map = new; + ta->map_len *= 2; + } + } + + ta->map[first].type = type; + ta->map[first].thr = pt; + return (first); +} + static td_err_e pt_init(void) { @@ -93,7 +119,7 @@ } static td_err_e -pt_ta_new(struct ps_prochandle *ph, pt_thragent_t **pta) +pt_ta_new(struct ps_prochandle *ph, td_thragent_t **pta) { #define LOOKUP_SYM(proc, sym, addr) \ ret = ps_pglobal_lookup(proc, NULL, sym, addr); \ @@ -103,13 +129,13 @@ goto error; \ } - pt_thragent_t *ta; + td_thragent_t *ta; int dbg; int ret; TDBG_FUNC(); - ta = malloc(sizeof(pt_thragent_t)); + ta = malloc(sizeof(td_thragent_t)); if (ta == NULL) return (TD_MALLOC); @@ -139,7 +165,7 @@ } static td_err_e -pt_ta_delete(pt_thragent_t *ta) +pt_ta_delete(td_thragent_t *ta) { int dbg; @@ -158,28 +184,7 @@ } static td_err_e -pt_ta_get_nthreads (const pt_thragent_t *ta, int *np) -{ - int ret; - - TDBG_FUNC(); - - ret = ps_pread(ta->ph, ta->thread_active_threads_addr, np, - sizeof(int)); - return (P2T(ret)); -} - -static td_err_e -pt_ta_get_ph(const pt_thragent_t *ta, struct ps_prochandle **ph) -{ - TDBG_FUNC(); - - *ph = ta->ph; - return (TD_OK); -} - -static td_err_e -pt_ta_map_id2thr(const pt_thragent_t *ta, thread_t id, td_thrhandle_t *th) +pt_ta_map_id2thr(const td_thragent_t *ta, thread_t id, td_thrhandle_t *th) { prgregset_t gregs; TAILQ_HEAD(, pthread) thread_list; @@ -256,13 +261,13 @@ return (TD_NOTHR); } } - th->th_ta_p = (td_thragent_t *)ta; - th->th_unique = id; + th->th_ta = ta; + th->th_tid = id; return (TD_OK); } static td_err_e -pt_ta_map_lwp2thr(const pt_thragent_t *ta, lwpid_t lwp, td_thrhandle_t *th) +pt_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwp, td_thrhandle_t *th) { TAILQ_HEAD(, pthread) thread_list; psaddr_t pt, ptr; @@ -286,9 +291,9 @@ if (ret != 0) return (P2T(ret)); if (tmp_lwp == lwp) { - th->th_ta_p = (td_thragent_t *)ta; - th->th_unique = pt_map_thread(ta, pt); - if (th->th_unique == -1) + th->th_ta = ta; + th->th_tid = pt_map_thread(ta, pt, PT_USER); + if (th->th_tid == -1) return (TD_MALLOC); pt_unmap_lwp(ta, lwp); return (TD_OK); @@ -306,7 +311,7 @@ } static td_err_e -pt_ta_thr_iter(const pt_thragent_t *ta, +pt_ta_thr_iter(const td_thragent_t *ta, td_thr_iter_f *callback, void *cbdata_p, td_thr_state_e state, int ti_pri, sigset_t *ti_sigmask_p, @@ -315,40 +320,43 @@ TAILQ_HEAD(, pthread) thread_list; td_thrhandle_t th; psaddr_t pt; - int ret, activated; - + ps_err_e pserr; + int activated; + TDBG_FUNC(); - ret = pt_ta_activated((pt_thragent_t *)ta, &activated); - if (ret != 0) - return (P2T(ret)); + pserr = ps_pread(ta->ph, ta->thread_activated_addr, &activated, + sizeof(int)); + if (pserr != PS_OK) + return (P2T(pserr)); if (!activated) - return (0); - ret = ps_pread(ta->ph, ta->thread_list_addr, &thread_list, - sizeof(thread_list)); - if (ret != 0) - return (P2T(ret)); + return (TD_OK); + + pserr = ps_pread(ta->ph, ta->thread_list_addr, &thread_list, + sizeof(thread_list)); + if (pserr != 0) + return (P2T(pserr)); pt = (psaddr_t)thread_list.tqh_first; while (pt != 0) { - th.th_ta_p = (td_thragent_t *)ta; - th.th_unique = pt_map_thread(ta, pt); + th.th_ta = ta; + th.th_tid = pt_map_thread(ta, pt, PT_USER); /* should we unmap lwp here ? */ - if (th.th_unique == -1) + if (th.th_tid == -1) return (TD_MALLOC); if ((*callback)(&th, cbdata_p)) return (TD_DBERR); /* get next thread */ - ret = ps_pread(ta->ph, - pt + offsetof(struct pthread, tle.tqe_next), - &pt, sizeof(pt)); - if (ret != 0) - return (P2T(ret)); + pserr = ps_pread(ta->ph, + pt + offsetof(struct pthread, tle.tqe_next), &pt, + sizeof(pt)); + if (pserr != PS_OK) + return (P2T(pserr)); } return (TD_OK); } static td_err_e -pt_ta_tsd_iter(const pt_thragent_t *ta, td_key_iter_f *ki, void *arg) +pt_ta_tsd_iter(const td_thragent_t *ta, td_key_iter_f *ki, void *arg) { struct pthread_key keytable[PTHREAD_KEYS_MAX]; int i, ret; @@ -371,59 +379,45 @@ } static td_err_e -pt_ta_event_addr(const pt_thragent_t *ta, td_event_e event, td_notify_t *ptr) +pt_ta_event_addr(const td_thragent_t *ta, td_event_e event, td_notify_t *ptr) { TDBG_FUNC(); return (TD_NOEVENT); } static td_err_e -pt_ta_set_event(const pt_thragent_t *ta, td_thr_events_t *events) +pt_ta_set_event(const td_thragent_t *ta, td_thr_events_t *events) { TDBG_FUNC(); return (TD_ERR); } static td_err_e -pt_ta_clear_event(const pt_thragent_t *ta, td_thr_events_t *events) +pt_ta_clear_event(const td_thragent_t *ta, td_thr_events_t *events) { TDBG_FUNC(); return (TD_ERR); } static td_err_e -pt_ta_event_getmsg(const pt_thragent_t *ta, td_event_msg_t *msg) +pt_ta_event_getmsg(const td_thragent_t *ta, td_event_msg_t *msg) { TDBG_FUNC(); return (TD_NOMSG); } static td_err_e -pt_ta_setconcurrency(const pt_thragent_t *ta, int level) +pt_thr_dbresume(const td_thrhandle_t *th) { TDBG_FUNC(); - return (TD_OK); + return (TD_ERR); } static td_err_e -pt_ta_enable_stats(const pt_thragent_t *ta, int enable) +pt_thr_dbsuspend(const td_thrhandle_t *th) { TDBG_FUNC(); - return (TD_OK); -} - -static td_err_e -pt_ta_reset_stats(const pt_thragent_t *ta) -{ - TDBG_FUNC(); - return (TD_OK); -} - -static td_err_e -pt_ta_get_stats(const pt_thragent_t *ta, td_ta_stats_t *statsp) -{ - TDBG_FUNC(); - return (TD_OK); + return (TD_ERR); } static td_err_e @@ -434,7 +428,7 @@ TDBG_FUNC(); - ret = pt_ta_map_id2thr((pt_thragent_t *)th->th_ta_p, th->th_unique, + ret = pt_ta_map_id2thr(th->th_ta, th->th_tid, &temp); return (P2T(ret)); } @@ -442,8 +436,8 @@ static td_err_e pt_thr_get_info(const td_thrhandle_t *th, td_thrinfo_t *info) { + const td_thragent_t *ta = th->th_ta; struct pthread pt; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; int ret; TDBG_FUNC(); @@ -453,16 +447,16 @@ return (ret); memset(info, 0, sizeof(*info)); - if (ta->map[th->th_unique].type == PT_LWP) { + if (ta->map[th->th_tid].type == PT_LWP) { info->ti_type = TD_THR_SYSTEM; - info->ti_lid = ta->map[th->th_unique].lwp; - info->ti_tid = th->th_unique; + info->ti_lid = ta->map[th->th_tid].lwp; + info->ti_tid = th->th_tid; info->ti_state = TD_THR_RUN; info->ti_type = TD_THR_SYSTEM; return (TD_OK); } - ret = ps_pread(ta->ph, (psaddr_t)(ta->map[th->th_unique].thr), + ret = ps_pread(ta->ph, (psaddr_t)(ta->map[th->th_tid].thr), &pt, sizeof(pt)); if (ret != 0) return (P2T(ret)); @@ -474,8 +468,8 @@ if (ret != 0) return (P2T(ret)); - info->ti_ta_p = th->th_ta_p; - info->ti_tid = th->th_unique; + info->ti_ta_p = th->th_ta; + info->ti_tid = th->th_tid; info->ti_tls = (char *)pt.specific; info->ti_startfunc = (psaddr_t)pt.start_routine; info->ti_stkbase = (psaddr_t) pt.attr.stackaddr_attr; @@ -516,8 +510,8 @@ static td_err_e pt_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *fpregs) { + const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; psaddr_t tcb_addr, tmbx_addr, ptr; lwpid_t lwp; int ret; @@ -528,12 +522,12 @@ if (ret) return (ret); - if (ta->map[th->th_unique].type == PT_LWP) { - ret = ps_lgetfpregs(ta->ph, ta->map[th->th_unique].lwp, fpregs); + if (ta->map[th->th_tid].type == PT_LWP) { + ret = ps_lgetfpregs(ta->ph, ta->map[th->th_tid].lwp, fpregs); return (P2T(ret)); } - ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -558,8 +552,8 @@ static td_err_e pt_thr_getgregs(const td_thrhandle_t *th, prgregset_t gregs) { + const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; psaddr_t tcb_addr, tmbx_addr, ptr; lwpid_t lwp; int ret; @@ -570,13 +564,13 @@ if (ret) return (ret); - if (ta->map[th->th_unique].type == PT_LWP) { + if (ta->map[th->th_tid].type == PT_LWP) { ret = ps_lgetregs(ta->ph, - ta->map[th->th_unique].lwp, gregs); + ta->map[th->th_tid].lwp, gregs); return (P2T(ret)); } - ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -598,22 +592,10 @@ } static td_err_e -pt_thr_getxregs (const td_thrhandle_t *th, void *xregs) -{ - return (TD_NOXREGS); -} - -static td_err_e -pt_thr_getxregsize (const td_thrhandle_t *th, int *sizep) -{ - return (TD_NOXREGS); -} - -static td_err_e pt_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *fpregs) { + const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; psaddr_t tcb_addr, tmbx_addr, ptr; lwpid_t lwp; int ret; @@ -624,12 +606,12 @@ if (ret) return (ret); - if (ta->map[th->th_unique].type == PT_LWP) { - ret = ps_lsetfpregs(ta->ph, ta->map[th->th_unique].lwp, fpregs); + if (ta->map[th->th_tid].type == PT_LWP) { + ret = ps_lsetfpregs(ta->ph, ta->map[th->th_tid].lwp, fpregs); return (P2T(ret)); } - ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -657,10 +639,10 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, prgregset_t gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) { + const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; psaddr_t tcb_addr, tmbx_addr, ptr; lwpid_t lwp; int ret; @@ -671,12 +653,12 @@ if (ret) return (ret); - if (ta->map[th->th_unique].type == PT_LWP) { - ret = ps_lsetregs(ta->ph, ta->map[th->th_unique].lwp, gregs); + if (ta->map[th->th_tid].type == PT_LWP) { + ret = ps_lsetregs(ta->ph, ta->map[th->th_tid].lwp, gregs); return (P2T(ret)); } - ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -704,13 +686,6 @@ } static td_err_e -pt_thr_setxregs(const td_thrhandle_t *th, const void *addr) -{ - TDBG_FUNC(); - return (TD_NOXREGS); -} - -static td_err_e pt_thr_event_enable(const td_thrhandle_t *th, int en) { TDBG_FUNC(); @@ -739,103 +714,11 @@ } static td_err_e -pt_thr_setprio(const td_thrhandle_t *th, int pri) +pt_thr_sstep(const td_thrhandle_t *th, int step) { - TDBG_FUNC(); - return (TD_OK); -} - -static td_err_e -pt_thr_setsigpending(const td_thrhandle_t *th, unsigned char n, - const sigset_t *set) -{ - TDBG_FUNC(); - return (TD_OK); -} - -static td_err_e -pt_thr_sigsetmask(const td_thrhandle_t *th, const sigset_t *set) -{ - TDBG_FUNC(); - return (TD_OK); -} - -static td_err_e -pt_thr_tsd(const td_thrhandle_t *th, const thread_key_t key, void **data) -{ - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; - struct pthread_specific_elem *spec, elem; - int ret; - - TDBG_FUNC(); - - ret = pt_validate(th); - if (ret) - return (ret); - - if (key < 0 || key >= PTHREAD_KEYS_MAX) - return (TD_BADKEY); - - if (ta->map[th->th_unique].type == PT_LWP) { - *data = NULL; - return (TD_OK); - } - - ret = ps_pread(ta->ph, - ta->map[th->th_unique].thr + - offsetof(struct pthread, specific), - &spec, sizeof(spec)); - if (ret == 0) { - if (spec == NULL) { - *data = NULL; - return (0); - } - ret = ps_pread(ta->ph, (psaddr_t)&spec[key], - &elem, sizeof(elem)); - if (ret == 0) - *data = (void *)elem.data; - } - return (P2T(ret)); -} - -static td_err_e -pt_thr_dbsuspend(const td_thrhandle_t *th) -{ - TDBG_FUNC(); - return (TD_ERR); -} - -static td_err_e -pt_thr_dbresume(const td_thrhandle_t *th) -{ - TDBG_FUNC(); - return (TD_ERR); -} - -static td_err_e -pt_ta_activated(pt_thragent_t *ta, int *a) -{ - int ret; - - TDBG_FUNC(); - - if (ta->thread_activated) { - *a = ta->thread_activated; - return (TD_OK); - } - ret = ps_pread(ta->ph, ta->thread_activated_addr, - &ta->thread_activated, sizeof(int)); - if (ret == 0) - *a = ta->thread_activated; - return (P2T(ret)); -} - -static td_err_e -pt_thr_sstep(td_thrhandle_t *th, int step) -{ + const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; struct reg regs; - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; psaddr_t tcb_addr, tmbx_addr; uint32_t tmp; lwpid_t lwp; @@ -847,12 +730,10 @@ if (ret) return (ret); - if (ta->map[th->th_unique].type == PT_LWP) { - ret = ps_lsetstep(ta->ph, ta->map[th->th_unique].lwp, step); - return (P2T(ret)); - } + if (ta->map[th->th_tid].type == PT_LWP) + return (TD_BADTH); - ret = ps_pread(ta->ph, ta->map[th->th_unique].thr + + ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + offsetof(struct pthread, tcb), &tcb_addr, sizeof(tcb_addr)); if (ret != 0) @@ -869,10 +750,8 @@ tcb_tmbx.tm_lwp), &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); - if (lwp != 0) { - ret = ps_lsetstep(ta->ph, lwp, step); - return (P2T(ret)); - } + if (lwp != 0) + return (TD_BADTH); tmbx_addr = tcb_addr + offsetof(struct tcb, tcb_tmbx); /* @@ -893,61 +772,8 @@ return (P2T(ret)); } -static long -_map_thread(pt_thragent_t *ta, psaddr_t pt, int type) -{ - struct pt_map *new; - int i, first = -1; - - /* leave zero out */ - for (i = 1; i < ta->map_len; ++i) { - if (ta->map[i].type == PT_NONE) { - if (first == -1) - first = i; - } else if (ta->map[i].type == type && ta->map[i].thr == pt) { - return (i); - } - } - - if (first == -1) { - if (ta->map_len == 0) { - ta->map = calloc(20, sizeof(struct pt_map)); - if (ta->map == NULL) - return (-1); - ta->map_len = 20; - first = 1; - } else { - new = realloc(ta->map, - sizeof(struct pt_map) * ta->map_len * 2); - if (new == NULL) - return (-1); - memset(new + ta->map_len, '\0', sizeof(struct pt_map) * - ta->map_len); - first = ta->map_len; - ta->map = new; - ta->map_len *= 2; - } - } - - ta->map[first].type = type; - ta->map[first].thr = pt; - return (first); -} - -static long -pt_map_thread(const pt_thragent_t *ta, psaddr_t pt) -{ - return _map_thread((pt_thragent_t *)ta, pt, PT_USER); -} - -static long -pt_map_lwp(const pt_thragent_t *ta, lwpid_t lwp) -{ - return _map_thread((pt_thragent_t *)ta, (psaddr_t)lwp, PT_LWP); -} - static void -pt_unmap_lwp(const pt_thragent_t *ta, lwpid_t lwp) +pt_unmap_lwp(const td_thragent_t *ta, lwpid_t lwp) { int i; @@ -962,33 +788,38 @@ static int pt_validate(const td_thrhandle_t *th) { - pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; - if (th->th_unique < 0 || th->th_unique >= ta->map_len || - ta->map[th->th_unique].type == PT_NONE) + if (th->th_tid < 0 || th->th_tid >= th->th_ta->map_len || + th->th_ta->map[th->th_tid].type == PT_NONE) return (TD_NOTHR); return (TD_OK); } -struct ta_ops pthread_ops = { +struct ta_ops libpthread_db_ops = { .to_init = pt_init, - .to_ta_new = pt_ta_new, + .to_ta_clear_event = pt_ta_clear_event, .to_ta_delete = pt_ta_delete, + .to_ta_event_addr = pt_ta_event_addr, + .to_ta_event_getmsg = pt_ta_event_getmsg, .to_ta_map_id2thr = pt_ta_map_id2thr, .to_ta_map_lwp2thr = pt_ta_map_lwp2thr, + .to_ta_new = pt_ta_new, + .to_ta_set_event = pt_ta_set_event, .to_ta_thr_iter = pt_ta_thr_iter, - .to_ta_event_addr = pt_ta_event_addr, - .to_ta_set_event = pt_ta_set_event, - .to_ta_clear_event = pt_ta_clear_event, - .to_ta_event_getmsg = pt_ta_event_getmsg, - .to_thr_validate = pt_thr_validate, + .to_ta_tsd_iter = pt_ta_tsd_iter, + .to_thr_clear_event = pt_thr_clear_event, + .to_thr_dbresume = pt_thr_dbresume, + .to_thr_dbsuspend = pt_thr_dbsuspend, + .to_thr_event_enable = pt_thr_event_enable, + .to_thr_event_getmsg = pt_thr_event_getmsg, .to_thr_get_info = pt_thr_get_info, .to_thr_getfpregs = pt_thr_getfpregs, .to_thr_getgregs = pt_thr_getgregs, + .to_thr_set_event = pt_thr_set_event, .to_thr_setfpregs = pt_thr_setfpregs, .to_thr_setgregs = pt_thr_setgregs, - .to_thr_event_enable = pt_thr_event_enable, - .to_thr_set_event = pt_thr_set_event, - .to_thr_clear_event = pt_thr_clear_event, - .to_thr_event_getmsg = pt_thr_event_getmsg, + .to_thr_validate = pt_thr_validate, + + /* FreeBSD specific extensions. */ + .to_thr_sstep = pt_thr_sstep, }; ==== //depot/projects/gdb/lib/libthread_db/libthr_db.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.1 2004/07/18 04:17:13 marcel Exp $"); #include #include @@ -85,7 +85,31 @@ libthr_db_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th) { - return (TD_ERR); + psaddr_t addr; + thread_t tid; + ps_err_e err; + + th->th_ta = ta; + + err = ps_pread(ta->ta_ph, ta->ta_thread_list, &th->th_thread, + sizeof(th->th_thread)); + if (err != PS_OK) + return (TD_ERR); + while (th->th_thread != NULL) { + addr = (psaddr_t)((uintptr_t)th->th_thread + + ta->ta_ofs_thr_id); + err = ps_pread(ta->ta_ph, addr, &tid, sizeof(thread_t)); + if (err != PS_OK) + return (TD_ERR); + if (tid == lwpid) + return (TD_OK); + addr = (psaddr_t)((uintptr_t)th->th_thread + ta->ta_ofs_next); + err = ps_pread(ta->ta_ph, addr, &th->th_thread, + sizeof(th->th_thread)); + if (err != PS_OK) + return (TD_ERR); + } + return (TD_NOLWP); } static td_err_e @@ -195,7 +219,7 @@ ps_err_e err; ta = th->th_ta; - ti->ti_ta = ta; + ti->ti_ta_p = ta; addr = (psaddr_t)((uintptr_t)th->th_thread + ta->ta_ofs_thr_id); err = ps_pread(ta->ta_ph, addr, &tid, sizeof(thread_t)); ti->ti_lid = tid; @@ -221,7 +245,7 @@ } static td_err_e -libthr_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t *r) +libthr_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t r) { const td_thragent_t *ta; psaddr_t addr; @@ -250,7 +274,7 @@ } static td_err_e -libthr_db_thr_setgregs(const td_thrhandle_t *th, const prgregset_t *r) +libthr_db_thr_setgregs(const td_thrhandle_t *th, const prgregset_t r) { return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/thread_db.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.1 2004/07/18 04:17:13 marcel Exp $"); #include #include @@ -34,20 +34,23 @@ #include "thread_db_int.h" +struct td_thragent +{ + TD_THRAGENT_FIELDS; +}; + static TAILQ_HEAD(, td_thragent) proclist = TAILQ_HEAD_INITIALIZER(proclist); extern struct ta_ops libc_r_db_ops; +extern struct ta_ops libpthread_db_ops; extern struct ta_ops libthr_db_ops; static struct ta_ops *ops[] = { + &libpthread_db_ops, &libthr_db_ops, &libc_r_db_ops }; -struct td_thragent { - TD_THRAGENT_FIELDS; -}; - td_err_e td_init(void) { @@ -133,6 +136,13 @@ } td_err_e +td_ta_tsd_iter(const td_thragent_t *ta, td_key_iter_f *callback, + void *cbdata_p) +{ + return (ta->ta_ops->to_ta_tsd_iter(ta, callback, cbdata_p)); +} + +td_err_e td_thr_clear_event(const td_thrhandle_t *th, td_thr_events_t *events) { const td_thragent_t *ta = th->th_ta; @@ -140,6 +150,20 @@ } td_err_e +td_thr_dbresume(const td_thrhandle_t *th) +{ + const td_thragent_t *ta = th->th_ta; + return (ta->ta_ops->to_thr_dbresume(th)); +} + +td_err_e +td_thr_dbsuspend(const td_thrhandle_t *th) +{ + const td_thragent_t *ta = th->th_ta; + return (ta->ta_ops->to_thr_dbsuspend(th)); +} + +td_err_e td_thr_event_enable(const td_thrhandle_t *th, int en) { const td_thragent_t *ta = th->th_ta; @@ -168,7 +192,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 00:28:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 762F316A4D0; Mon, 19 Jul 2004 00:28:57 +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 37F6D16A4CE for ; Mon, 19 Jul 2004 00:28:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CA7743D1D for ; Mon, 19 Jul 2004 00:28:57 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J0SvD1009257 for ; Mon, 19 Jul 2004 00:28:57 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J0Srml009253 for perforce@freebsd.org; Mon, 19 Jul 2004 00:28:53 GMT (envelope-from julian@freebsd.org) Date: Mon, 19 Jul 2004 00:28:53 GMT Message-Id: <200407190028.i6J0Srml009253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 57664 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: Mon, 19 Jul 2004 00:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=57664 Change 57664 by julian@julian_ref on 2004/07/19 00:27:55 IFC Affected files ... .. //depot/projects/kse/bin/ps/extern.h#10 integrate .. //depot/projects/kse/bin/ps/fmt.c#10 integrate .. //depot/projects/kse/bin/ps/keyword.c#12 integrate .. //depot/projects/kse/bin/ps/print.c#18 integrate .. //depot/projects/kse/bin/ps/ps.1#16 integrate .. //depot/projects/kse/bin/ps/ps.c#16 integrate .. //depot/projects/kse/bin/ps/ps.h#6 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#10 integrate .. //depot/projects/kse/include/Makefile#7 integrate .. //depot/projects/kse/include/a.out.h#2 integrate .. //depot/projects/kse/include/ctype.h#7 integrate .. //depot/projects/kse/include/ftw.h#1 branch .. //depot/projects/kse/include/proc_service.h#1 branch .. //depot/projects/kse/include/regex.h#3 integrate .. //depot/projects/kse/include/rune.h#4 integrate .. //depot/projects/kse/include/runetype.h#4 integrate .. //depot/projects/kse/include/stdio.h#7 integrate .. //depot/projects/kse/include/strings.h#4 integrate .. //depot/projects/kse/include/wchar.h#12 integrate .. //depot/projects/kse/include/wctype.h#5 integrate .. //depot/projects/kse/include/wordexp.h#2 integrate .. //depot/projects/kse/lib/libc/alpha/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/alpha/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/alpha/gen/isinf.c#3 delete .. //depot/projects/kse/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/amd64/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/amd64/gen/isinf.c#2 delete .. //depot/projects/kse/lib/libc/amd64/gen/signalcontext.c#2 integrate .. //depot/projects/kse/lib/libc/arm/gen/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/arm/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/arm/gen/isinf.c#2 delete .. //depot/projects/kse/lib/libc/compat-43/gethostid.3#3 integrate .. //depot/projects/kse/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/kse/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/kse/lib/libc/db/man/dbopen.3#3 integrate .. //depot/projects/kse/lib/libc/db/man/recno.3#3 integrate .. //depot/projects/kse/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/kse/lib/libc/gen/basename.3#3 integrate .. //depot/projects/kse/lib/libc/gen/directory.3#3 integrate .. //depot/projects/kse/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/kse/lib/libc/gen/dladdr.3#3 integrate .. //depot/projects/kse/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/kse/lib/libc/gen/dllockinit.3#3 integrate .. //depot/projects/kse/lib/libc/gen/fmtcheck.3#4 integrate .. //depot/projects/kse/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/kse/lib/libc/gen/fpclassify.3#3 integrate .. //depot/projects/kse/lib/libc/gen/frexp.c#1 branch .. //depot/projects/kse/lib/libc/gen/ftok.3#3 integrate .. //depot/projects/kse/lib/libc/gen/fts.3#4 integrate .. //depot/projects/kse/lib/libc/gen/ftw.3#1 branch .. //depot/projects/kse/lib/libc/gen/ftw.c#1 branch .. //depot/projects/kse/lib/libc/gen/getbootfile.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/kse/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/kse/lib/libc/gen/gethostname.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getobjformat.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getpwent.3#4 integrate .. //depot/projects/kse/lib/libc/gen/getttyent.3#3 integrate .. //depot/projects/kse/lib/libc/gen/glob.3#3 integrate .. //depot/projects/kse/lib/libc/gen/isinf.c#1 branch .. //depot/projects/kse/lib/libc/gen/isnan.c#1 branch .. //depot/projects/kse/lib/libc/gen/lockf.3#4 integrate .. //depot/projects/kse/lib/libc/gen/msgrcv.3#3 integrate .. //depot/projects/kse/lib/libc/gen/rand48.3#3 integrate .. //depot/projects/kse/lib/libc/gen/sem_destroy.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sem_getvalue.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sem_post.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/kse/lib/libc/gen/setjmp.3#3 integrate .. //depot/projects/kse/lib/libc/gen/setproctitle.3#3 integrate .. //depot/projects/kse/lib/libc/gen/shm_open.3#2 integrate .. //depot/projects/kse/lib/libc/gen/signal.3#5 integrate .. //depot/projects/kse/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/kse/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/kse/lib/libc/gen/time.3#3 integrate .. //depot/projects/kse/lib/libc/gen/tzset.3#3 integrate .. //depot/projects/kse/lib/libc/gen/ualarm.3#4 integrate .. //depot/projects/kse/lib/libc/gen/ucontext.3#3 integrate .. //depot/projects/kse/lib/libc/gen/unvis.3#3 integrate .. //depot/projects/kse/lib/libc/gen/vis.3#3 integrate .. //depot/projects/kse/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/kse/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#5 integrate .. //depot/projects/kse/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/kse/lib/libc/i386/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/i386/gen/isinf.c#3 delete .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#7 integrate .. //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#5 integrate .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ioperm.2#3 integrate .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/kse/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/kse/lib/libc/ia64/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/ia64/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/ia64/gen/isinf.c#3 delete .. //depot/projects/kse/lib/libc/locale/Makefile.inc#10 integrate .. //depot/projects/kse/lib/libc/locale/big5.5#2 integrate .. //depot/projects/kse/lib/libc/locale/ctype.3#3 integrate .. //depot/projects/kse/lib/libc/locale/euc.5#2 integrate .. //depot/projects/kse/lib/libc/locale/euc.c#6 integrate .. //depot/projects/kse/lib/libc/locale/gb18030.5#2 integrate .. //depot/projects/kse/lib/libc/locale/gb2312.5#2 integrate .. //depot/projects/kse/lib/libc/locale/gbk.5#2 integrate .. //depot/projects/kse/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/kse/lib/libc/locale/isxdigit.3#3 integrate .. //depot/projects/kse/lib/libc/locale/localeconv.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mblen.3#3 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.3#5 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.3#5 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.3#3 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.3#3 integrate .. //depot/projects/kse/lib/libc/locale/mskanji.5#2 integrate .. //depot/projects/kse/lib/libc/locale/multibyte.3#7 integrate .. //depot/projects/kse/lib/libc/locale/nextwctype.3#1 branch .. //depot/projects/kse/lib/libc/locale/nextwctype.c#1 branch .. //depot/projects/kse/lib/libc/locale/rune.3#5 integrate .. //depot/projects/kse/lib/libc/locale/rune.c#3 integrate .. //depot/projects/kse/lib/libc/locale/runetype.c#4 integrate .. //depot/projects/kse/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/kse/lib/libc/locale/setrunelocale.c#6 integrate .. //depot/projects/kse/lib/libc/locale/tolower.c#4 integrate .. //depot/projects/kse/lib/libc/locale/toupper.c#4 integrate .. //depot/projects/kse/lib/libc/locale/utf2.5#2 integrate .. //depot/projects/kse/lib/libc/locale/utf8.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wcstombs.3#3 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.3#3 integrate .. //depot/projects/kse/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/kse/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/kse/lib/libc/net/eui64.3#2 integrate .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/kse/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/kse/lib/libc/net/getifaddrs.3#3 integrate .. //depot/projects/kse/lib/libc/net/getifmaddrs.3#2 integrate .. //depot/projects/kse/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/kse/lib/libc/net/getnetent.3#3 integrate .. //depot/projects/kse/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/kse/lib/libc/net/getservent.3#2 integrate .. //depot/projects/kse/lib/libc/net/inet.3#5 integrate .. //depot/projects/kse/lib/libc/net/inet6_opt_init.3#2 integrate .. //depot/projects/kse/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/kse/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/kse/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/kse/lib/libc/net/resolver.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_delete_entry.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_delete_perm.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_dup.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_free.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_from_text.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_get_entry.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_get_qualifier.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_init.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_set_qualifier.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_set_tag_type.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_to_text.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/acl_valid.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/mac_prepare.3#3 integrate .. //depot/projects/kse/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/kse/lib/libc/powerpc/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/powerpc/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/powerpc/gen/isinf.c#3 delete .. //depot/projects/kse/lib/libc/regex/engine.c#3 integrate .. //depot/projects/kse/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/kse/lib/libc/regex/regcomp.c#4 integrate .. //depot/projects/kse/lib/libc/regex/regerror.c#3 integrate .. //depot/projects/kse/lib/libc/regex/regex.3#3 integrate .. //depot/projects/kse/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/kse/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/kse/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/kse/lib/libc/rpc/getrpcent.3#3 integrate .. //depot/projects/kse/lib/libc/rpc/getrpcport.3#3 integrate .. //depot/projects/kse/lib/libc/rpc/rpc.3#3 integrate .. //depot/projects/kse/lib/libc/rpc/rpc_secure.3#3 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#5 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/frexp.c#2 delete .. //depot/projects/kse/lib/libc/sparc64/gen/isinf.c#3 delete .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#6 integrate .. //depot/projects/kse/lib/libc/stdio/fflush.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetln.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#6 integrate .. //depot/projects/kse/lib/libc/stdio/fgetwln.3#1 branch .. //depot/projects/kse/lib/libc/stdio/fgetwln.c#1 branch .. //depot/projects/kse/lib/libc/stdio/funopen.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/local.h#9 integrate .. //depot/projects/kse/lib/libc/stdio/printf.3#6 integrate .. //depot/projects/kse/lib/libc/stdio/stdio.3#5 integrate .. //depot/projects/kse/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/exit.3#5 integrate .. //depot/projects/kse/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/getopt_long.c#4 integrate .. //depot/projects/kse/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort.3#4 integrate .. //depot/projects/kse/lib/libc/stdlib/radixsort.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/random.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/tsearch.3#5 integrate .. //depot/projects/kse/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.3#5 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.3#5 integrate .. //depot/projects/kse/lib/libc/string/ffs.3#4 integrate .. //depot/projects/kse/lib/libc/string/strlcpy.3#3 integrate .. //depot/projects/kse/lib/libc/string/strsep.3#4 integrate .. //depot/projects/kse/lib/libc/sys/accept.2#3 integrate .. //depot/projects/kse/lib/libc/sys/aio_error.2#3 integrate .. //depot/projects/kse/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/kse/lib/libc/sys/aio_suspend.2#3 integrate .. //depot/projects/kse/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/kse/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/kse/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/kse/lib/libc/sys/chroot.2#3 integrate .. //depot/projects/kse/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/kse/lib/libc/sys/close.2#3 integrate .. //depot/projects/kse/lib/libc/sys/connect.2#3 integrate .. //depot/projects/kse/lib/libc/sys/dup.2#3 integrate .. //depot/projects/kse/lib/libc/sys/execve.2#4 integrate .. //depot/projects/kse/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/kse/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/kse/lib/libc/sys/flock.2#4 integrate .. //depot/projects/kse/lib/libc/sys/fork.2#4 integrate .. //depot/projects/kse/lib/libc/sys/getdtablesize.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getlogin.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getpriority.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getrlimit.2#5 integrate .. //depot/projects/kse/lib/libc/sys/getrusage.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getsockname.2#3 integrate .. //depot/projects/kse/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/kse/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/kse/lib/libc/sys/intro.2#5 integrate .. //depot/projects/kse/lib/libc/sys/ioctl.2#3 integrate .. //depot/projects/kse/lib/libc/sys/issetugid.2#3 integrate .. //depot/projects/kse/lib/libc/sys/jail.2#3 integrate .. //depot/projects/kse/lib/libc/sys/kldnext.2#3 integrate .. //depot/projects/kse/lib/libc/sys/kldstat.2#3 integrate .. //depot/projects/kse/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/kse/lib/libc/sys/link.2#3 integrate .. //depot/projects/kse/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/kse/lib/libc/sys/madvise.2#4 integrate .. //depot/projects/kse/lib/libc/sys/mlockall.2#2 integrate .. //depot/projects/kse/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/kse/lib/libc/sys/modnext.2#3 integrate .. //depot/projects/kse/lib/libc/sys/modstat.2#3 integrate .. //depot/projects/kse/lib/libc/sys/mount.2#3 integrate .. //depot/projects/kse/lib/libc/sys/msync.2#4 integrate .. //depot/projects/kse/lib/libc/sys/nanosleep.2#3 integrate .. //depot/projects/kse/lib/libc/sys/ntp_gettime.2#3 integrate .. //depot/projects/kse/lib/libc/sys/open.2#3 integrate .. //depot/projects/kse/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/kse/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/kse/lib/libc/sys/poll.2#3 integrate .. //depot/projects/kse/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/kse/lib/libc/sys/read.2#4 integrate .. //depot/projects/kse/lib/libc/sys/recv.2#3 integrate .. //depot/projects/kse/lib/libc/sys/rename.2#3 integrate .. //depot/projects/kse/lib/libc/sys/rfork.2#4 integrate .. //depot/projects/kse/lib/libc/sys/sched_get_priority_max.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sched_setscheduler.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sched_yield.2#3 integrate .. //depot/projects/kse/lib/libc/sys/select.2#3 integrate .. //depot/projects/kse/lib/libc/sys/semctl.2#3 integrate .. //depot/projects/kse/lib/libc/sys/semget.2#3 integrate .. //depot/projects/kse/lib/libc/sys/send.2#4 integrate .. //depot/projects/kse/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/kse/lib/libc/sys/setuid.2#3 integrate .. //depot/projects/kse/lib/libc/sys/shmat.2#3 integrate .. //depot/projects/kse/lib/libc/sys/shmctl.2#3 integrate .. //depot/projects/kse/lib/libc/sys/shmget.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sigaction.2#6 integrate .. //depot/projects/kse/lib/libc/sys/sigwait.2#2 integrate .. //depot/projects/kse/lib/libc/sys/socket.2#3 integrate .. //depot/projects/kse/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/kse/lib/libc/sys/swapon.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sysarch.2#3 integrate .. //depot/projects/kse/lib/libc/sys/truncate.2#3 integrate .. //depot/projects/kse/lib/libc/sys/umask.2#3 integrate .. //depot/projects/kse/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/kse/lib/libc/sys/utrace.2#2 integrate .. //depot/projects/kse/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/kse/lib/libc/sys/wait.2#4 integrate .. //depot/projects/kse/lib/libc/sys/write.2#3 integrate .. //depot/projects/kse/lib/libkvm/kvm.3#3 integrate .. //depot/projects/kse/lib/libkvm/kvm_getfiles.3#5 integrate .. //depot/projects/kse/lib/libkvm/kvm_getprocs.3#4 integrate .. //depot/projects/kse/lib/libkvm/kvm_getswapinfo.3#3 integrate .. //depot/projects/kse/lib/libkvm/kvm_nlist.3#4 integrate .. //depot/projects/kse/lib/libkvm/kvm_open.3#5 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#26 integrate .. //depot/projects/kse/lib/libkvm/kvm_read.3#3 integrate .. //depot/projects/kse/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate .. //depot/projects/kse/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/kse/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/kse/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/kse/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/kse/lib/libpthread/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/kse/lib/libpthread/pthread.map#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_exit.c#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_priority_queue.c#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_spec.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_atfork.c#1 branch .. //depot/projects/kse/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/kse/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/kse/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/kse/libexec/rtld-elf/arm/Makefile.inc#2 integrate .. //depot/projects/kse/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/kse/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/kse/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate .. //depot/projects/kse/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/kse/sys/alpha/alpha/alpha-gdbstub.c#3 delete .. //depot/projects/kse/sys/alpha/alpha/api_up1000.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#10 integrate .. //depot/projects/kse/sys/alpha/alpha/busdma_machdep.c#8 integrate .. //depot/projects/kse/sys/alpha/alpha/db_disasm.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/db_interface.c#8 integrate .. //depot/projects/kse/sys/alpha/alpha/db_trace.c#8 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_1000a.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_2100_a50.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_2100_a500.c#6 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_axppci_33.c#6 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_eb164.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_eb64plus.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_kn20aa.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_kn300.c#6 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_st550.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_st6600.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/kse/sys/alpha/alpha/interrupt.c#18 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#48 integrate .. //depot/projects/kse/sys/alpha/alpha/mem.c#10 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/kse/sys/alpha/alpha/promcons.c#9 integrate .. //depot/projects/kse/sys/alpha/alpha/sgmap.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#37 integrate .. //depot/projects/kse/sys/alpha/conf/GENERIC#19 integrate .. //depot/projects/kse/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/kse/sys/alpha/conf/NOTES#3 integrate .. //depot/projects/kse/sys/alpha/include/cpu.h#9 integrate .. //depot/projects/kse/sys/alpha/include/db_machdep.h#5 integrate .. //depot/projects/kse/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/kse/sys/alpha/include/kdb.h#1 branch .. //depot/projects/kse/sys/alpha/include/param.h#10 integrate .. //depot/projects/kse/sys/alpha/include/pcb.h#4 integrate .. //depot/projects/kse/sys/alpha/include/pmap.h#16 integrate .. //depot/projects/kse/sys/alpha/include/ptrace.h#10 integrate .. //depot/projects/kse/sys/alpha/isa/isa.c#6 integrate .. //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/kse/sys/alpha/mcbus/mcpcia.c#8 integrate .. //depot/projects/kse/sys/alpha/pci/apecs.c#5 integrate .. //depot/projects/kse/sys/alpha/pci/cia.c#7 integrate .. //depot/projects/kse/sys/alpha/pci/pcibus.c#4 integrate .. //depot/projects/kse/sys/alpha/pci/t2.c#7 integrate .. //depot/projects/kse/sys/alpha/pci/tsunami.c#6 integrate .. //depot/projects/kse/sys/alpha/pci/tsunami_pci.c#5 integrate .. //depot/projects/kse/sys/alpha/tlsb/dwlpx.c#6 integrate .. //depot/projects/kse/sys/alpha/tlsb/zs_tlsb.c#9 integrate .. //depot/projects/kse/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/kse/sys/amd64/amd64/autoconf.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/kse/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/kse/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/kse/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/kse/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/kse/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/kse/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/kse/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/kse/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/kse/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/kse/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/kse/sys/amd64/include/float.h#4 integrate .. //depot/projects/kse/sys/amd64/include/frame.h#3 integrate .. //depot/projects/kse/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/kse/sys/amd64/include/kdb.h#1 branch .. //depot/projects/kse/sys/amd64/include/param.h#3 integrate .. //depot/projects/kse/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/kse/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/kse/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/kse/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/kse/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/kse/sys/arm/arm/intr.c#2 integrate .. //depot/projects/kse/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/kse/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/kse/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/kse/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/kse/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/kse/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/kse/sys/arm/include/bus.h#2 integrate .. //depot/projects/kse/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/kse/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/kse/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/kse/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/kse/sys/arm/include/frame.h#2 integrate .. //depot/projects/kse/sys/arm/include/kdb.h#1 branch .. //depot/projects/kse/sys/arm/include/pcb.h#2 integrate .. //depot/projects/kse/sys/arm/include/pmap.h#2 integrate .. //depot/projects/kse/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/kse/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/kse/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/kse/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/kse/sys/boot/common/loader.8#18 integrate .. //depot/projects/kse/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/kse/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/kse/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/kse/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/kse/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/kse/sys/boot/i386/libi386/bioscd.c#5 integrate .. //depot/projects/kse/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/kse/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/kse/sys/boot/ofw/libofw/elf_freebsd.c#5 integrate .. //depot/projects/kse/sys/boot/ofw/libofw/ofw_copy.c#5 integrate .. //depot/projects/kse/sys/boot/ofw/libofw/openfirm.c#7 integrate .. //depot/projects/kse/sys/boot/pc98/boot2/dinode.h#3 integrate .. //depot/projects/kse/sys/boot/pc98/boot2/inode.h#3 integrate .. //depot/projects/kse/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/kse/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/kse/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/kse/sys/boot/powerpc/loader/start.c#4 integrate .. //depot/projects/kse/sys/cam/cam_periph.h#3 integrate .. //depot/projects/kse/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#26 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_low.h#4 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_sa.c#9 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/kse/sys/coda/cnode.h#4 integrate .. //depot/projects/kse/sys/coda/coda.h#3 integrate .. //depot/projects/kse/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/kse/sys/coda/coda_psdev.c#11 integrate .. //depot/projects/kse/sys/coda/coda_psdev.h#4 integrate .. //depot/projects/kse/sys/coda/coda_subr.c#8 integrate .. //depot/projects/kse/sys/coda/coda_venus.c#5 integrate .. //depot/projects/kse/sys/coda/coda_venus.h#4 integrate .. //depot/projects/kse/sys/coda/coda_vfsops.c#12 integrate .. //depot/projects/kse/sys/coda/coda_vnops.c#12 integrate .. //depot/projects/kse/sys/coda/coda_vnops.h#8 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/kse/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/kse/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/kse/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/kse/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/kse/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/kse/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/kse/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/kse/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/kse/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#10 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_ioctl.c#9 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_socket.c#5 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_socket.h#6 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#15 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_sysvec.c#9 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_ttold.c#7 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/kse/sys/conf/NOTES#23 integrate .. //depot/projects/kse/sys/conf/files#57 integrate .. //depot/projects/kse/sys/conf/files.alpha#21 integrate .. //depot/projects/kse/sys/conf/files.amd64#3 integrate .. //depot/projects/kse/sys/conf/files.i386#34 integrate .. //depot/projects/kse/sys/conf/files.ia64#18 integrate .. //depot/projects/kse/sys/conf/files.pc98#34 integrate .. //depot/projects/kse/sys/conf/files.powerpc#11 integrate .. //depot/projects/kse/sys/conf/files.sparc64#24 integrate .. //depot/projects/kse/sys/conf/kern.post.mk#17 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#19 integrate .. //depot/projects/kse/sys/conf/kmod.mk#17 integrate .. //depot/projects/kse/sys/conf/ldscript.ia64#4 integrate .. //depot/projects/kse/sys/conf/newvers.sh#4 integrate .. //depot/projects/kse/sys/conf/options#32 integrate .. //depot/projects/kse/sys/conf/options.alpha#11 integrate .. //depot/projects/kse/sys/conf/options.powerpc#6 integrate .. //depot/projects/kse/sys/conf/options.sparc64#7 integrate .. //depot/projects/kse/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acconfig.h#14 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acfreebsd.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acinterp.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acmacros.h#13 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbcmds.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbdisply.c#13 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsopcode.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exconfig.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbxfroot.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/kse/sys/contrib/dev/fla/README#2 delete .. //depot/projects/kse/sys/contrib/dev/fla/fla.c#7 delete .. //depot/projects/kse/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/kse/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/kse/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/kse/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#11 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.c#8 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.c#11 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.c#7 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#7 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.c#10 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.h#6 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.c#8 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ipl.h#7 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/kse/sys/contrib/ngatm/netnatm/genfiles#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/kse/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/kse/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/kse/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/kse/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/kse/sys/ddb/db_access.c#3 integrate .. //depot/projects/kse/sys/ddb/db_break.c#5 integrate .. //depot/projects/kse/sys/ddb/db_command.c#8 integrate .. //depot/projects/kse/sys/ddb/db_elf.c#6 delete .. //depot/projects/kse/sys/ddb/db_kld.c#4 delete .. //depot/projects/kse/sys/ddb/db_main.c#1 branch .. //depot/projects/kse/sys/ddb/db_output.c#4 integrate .. //depot/projects/kse/sys/ddb/db_print.c#3 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#27 integrate .. //depot/projects/kse/sys/ddb/db_run.c#7 integrate .. //depot/projects/kse/sys/ddb/db_sysctl.c#3 delete .. //depot/projects/kse/sys/ddb/db_thread.c#1 branch .. //depot/projects/kse/sys/ddb/db_trap.c#3 delete .. //depot/projects/kse/sys/ddb/db_variables.c#4 integrate .. //depot/projects/kse/sys/ddb/db_variables.h#3 integrate .. //depot/projects/kse/sys/ddb/ddb.h#6 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#26 integrate .. //depot/projects/kse/sys/dev/aac/aacvar.h#15 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdDebug.c#6 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdSynch.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#33 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_battery.c#6 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_button.c#10 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cmbat.c#13 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_ec.c#16 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_isab.c#4 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_lid.c#10 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#14 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_powerres.c#13 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_resource.c#14 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#20 integrate .. //depot/projects/kse/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/kse/sys/dev/amr/amr.c#8 integrate .. //depot/projects/kse/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/kse/sys/dev/an/if_an.c#17 integrate .. //depot/projects/kse/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/kse/sys/dev/asr/asr.c#13 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#26 integrate .. //depot/projects/kse/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/kse/sys/dev/ata/ata-disk.c#25 integrate .. //depot/projects/kse/sys/dev/ata/ata-raid.c#16 integrate .. //depot/projects/kse/sys/dev/ata/ata-raid.h#10 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.c#22 integrate .. //depot/projects/kse/sys/dev/ata/atapi-fd.c#14 integrate .. //depot/projects/kse/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/kse/sys/dev/ata/atapi-tape.h#6 integrate .. //depot/projects/kse/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_core.h#4 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_mem.c#7 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_os.c#10 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_reg.h#4 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/kse/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/kse/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/kse/sys/dev/ciss/cissvar.h#5 integrate .. //depot/projects/kse/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/kse/sys/dev/ct/ct.c#4 integrate .. //depot/projects/kse/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/kse/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/kse/sys/dev/cy/cy.c#3 integrate .. //depot/projects/kse/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/kse/sys/dev/digi/digi.c#15 integrate .. //depot/projects/kse/sys/dev/digi/digi.h#7 integrate .. //depot/projects/kse/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/kse/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/kse/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#8 integrate .. //depot/projects/kse/sys/dev/drm/drm_vm.h#3 integrate .. //depot/projects/kse/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/kse/sys/dev/em/if_em.c#13 integrate .. //depot/projects/kse/sys/dev/en/midway.c#5 integrate .. //depot/projects/kse/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/kse/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/kse/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/kse/sys/dev/ex/if_ex_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/kse/sys/dev/fb/creator.c#3 integrate .. //depot/projects/kse/sys/dev/fb/fb.c#7 integrate .. //depot/projects/kse/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/kse/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/kse/sys/dev/fb/vga.c#11 integrate .. //depot/projects/kse/sys/dev/fb/vgareg.h#5 integrate .. //depot/projects/kse/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/kse/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/kse/sys/dev/fdc/fdc_isa.c#1 branch .. //depot/projects/kse/sys/dev/fdc/fdc_pccard.c#1 branch .. //depot/projects/kse/sys/dev/fdc/fdcvar.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/kse/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#5 integrate .. //depot/projects/kse/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/kse/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/kse/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#6 integrate .. //depot/projects/kse/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/kse/sys/dev/ichsmb/ichsmb_pci.c#6 integrate .. //depot/projects/kse/sys/dev/ida/ida.c#4 integrate .. //depot/projects/kse/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/kse/sys/dev/iicbus/iic.c#9 integrate .. //depot/projects/kse/sys/dev/iir/iir.h#6 integrate .. //depot/projects/kse/sys/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/kse/sys/dev/ips/ips.c#3 integrate .. //depot/projects/kse/sys/dev/ips/ips.h#3 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#20 integrate .. //depot/projects/kse/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/kse/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/kse/sys/dev/joy/joy.c#5 integrate .. //depot/projects/kse/sys/dev/joy/joyvar.h#3 integrate .. //depot/projects/kse/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/kse/sys/dev/kbd/kbdreg.h#3 integrate .. //depot/projects/kse/sys/dev/led/led.c#3 integrate .. //depot/projects/kse/sys/dev/led/led.h#3 integrate .. //depot/projects/kse/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/kse/sys/dev/matcd/matcd.c#2 integrate .. //depot/projects/kse/sys/dev/matcd/matcd_data.h#2 integrate .. //depot/projects/kse/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/kse/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/kse/sys/dev/md/md.c#28 integrate .. //depot/projects/kse/sys/dev/mlx/mlx.c#8 integrate .. //depot/projects/kse/sys/dev/mlx/mlxvar.h#7 integrate .. //depot/projects/kse/sys/dev/mly/mly.c#9 integrate .. //depot/projects/kse/sys/dev/mly/mlyvar.h#4 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/kse/sys/dev/ncv/ncr53c500.c#6 integrate .. //depot/projects/kse/sys/dev/nge/if_nge.c#16 integrate .. //depot/projects/kse/sys/dev/nmdm/nmdm.c#12 integrate .. //depot/projects/kse/sys/dev/nsp/nsp.c#7 integrate .. //depot/projects/kse/sys/dev/null/null.c#7 integrate .. //depot/projects/kse/sys/dev/ofw/ofw_console.c#11 integrate .. //depot/projects/kse/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/kse/sys/dev/ofw/openfirmio.c#5 integrate .. //depot/projects/kse/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#25 integrate .. //depot/projects/kse/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#19 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#16 integrate .. //depot/projects/kse/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/kse/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/kse/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/kse/sys/dev/ppbus/pcfclock.c#7 integrate .. //depot/projects/kse/sys/dev/ppbus/ppi.c#8 integrate .. //depot/projects/kse/sys/dev/ppbus/pps.c#10 integrate .. //depot/projects/kse/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/kse/sys/dev/puc/puc.c#10 integrate .. //depot/projects/kse/sys/dev/random/randomdev.c#11 integrate .. //depot/projects/kse/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/kse/sys/dev/rc/rc.c#4 integrate .. //depot/projects/kse/sys/dev/re/if_re.c#4 integrate .. //depot/projects/kse/sys/dev/rp/rp.c#10 integrate .. //depot/projects/kse/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/kse/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/kse/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/kse/sys/dev/sab/sab.c#6 integrate .. //depot/projects/kse/sys/dev/scd/scd.c#3 integrate .. //depot/projects/kse/sys/dev/scd/scdvar.h#2 integrate .. //depot/projects/kse/sys/dev/si/si.c#9 integrate .. //depot/projects/kse/sys/dev/si/si.h#2 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#23 integrate .. //depot/projects/kse/sys/dev/smbus/smb.c#8 integrate .. //depot/projects/kse/sys/dev/snp/snp.c#11 integrate .. //depot/projects/kse/sys/dev/sound/driver.c#3 integrate .. //depot/projects/kse/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/kse/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/kse/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/kse/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/kse/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb16.c#11 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/kse/sys/dev/sound/isa/sbc.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/als4000.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/kse/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/cmi.c#12 integrate .. //depot/projects/kse/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/csa.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/kse/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.c#20 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro3.c#12 integrate .. //depot/projects/kse/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/kse/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/kse/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/kse/sys/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/kse/sys/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sndstat.c#9 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.c#16 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/kse/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/kse/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/kse/sys/dev/stg/tmc18c30.c#6 integrate .. //depot/projects/kse/sys/dev/streams/streams.c#13 integrate .. //depot/projects/kse/sys/dev/sx/sx.c#3 integrate .. //depot/projects/kse/sys/dev/sx/sx.h#2 integrate .. //depot/projects/kse/sys/dev/syscons/scvesactl.c#5 integrate .. //depot/projects/kse/sys/dev/syscons/scvidctl.c#8 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/kse/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/kse/sys/dev/tdfx/tdfx_pci.c#10 integrate .. //depot/projects/kse/sys/dev/tdfx/tdfx_vars.h#3 integrate .. //depot/projects/kse/sys/dev/twa/twa.h#3 integrate .. //depot/projects/kse/sys/dev/twa/twa_freebsd.c#4 integrate .. //depot/projects/kse/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/kse/sys/dev/twe/twe_freebsd.c#11 integrate .. //depot/projects/kse/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/kse/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/kse/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/kse/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/kse/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/kse/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/kse/sys/dev/usb/devlist2h.awk#4 delete .. //depot/projects/kse/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/kse/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/kse/sys/dev/usb/if_aue.c#17 integrate .. //depot/projects/kse/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/kse/sys/dev/usb/if_cue.c#8 integrate .. //depot/projects/kse/sys/dev/usb/if_kue.c#8 integrate .. //depot/projects/kse/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/kse/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/kse/sys/dev/usb/ohci.c#19 integrate .. //depot/projects/kse/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/kse/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/kse/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/kse/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/kse/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/kse/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/kse/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/kse/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/kse/sys/dev/usb/ugen.c#16 integrate .. //depot/projects/kse/sys/dev/usb/uhid.c#15 integrate .. //depot/projects/kse/sys/dev/usb/uhub.c#14 integrate .. //depot/projects/kse/sys/dev/usb/ukbd.c#10 integrate .. //depot/projects/kse/sys/dev/usb/ulpt.c#13 integrate .. //depot/projects/kse/sys/dev/usb/umass.c#16 integrate .. //depot/projects/kse/sys/dev/usb/umct.c#3 integrate .. //depot/projects/kse/sys/dev/usb/umodem.c#12 integrate .. //depot/projects/kse/sys/dev/usb/ums.c#13 integrate .. //depot/projects/kse/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/kse/sys/dev/usb/urio.c#14 integrate .. //depot/projects/kse/sys/dev/usb/usb.c#20 integrate .. //depot/projects/kse/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/kse/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/kse/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/kse/sys/dev/usb/usbdevs.h#23 delete .. //depot/projects/kse/sys/dev/usb/usbdevs_data.h#23 delete .. //depot/projects/kse/sys/dev/usb/usbdi_util.h#5 integrate .. //depot/projects/kse/sys/dev/usb/usbdivar.h#7 integrate .. //depot/projects/kse/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/kse/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/kse/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/kse/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/kse/sys/dev/vinum/vinum.c#7 integrate .. //depot/projects/kse/sys/dev/vinum/vinumconfig.c#8 integrate .. //depot/projects/kse/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/kse/sys/dev/vinum/vinumhdr.h#5 integrate .. //depot/projects/kse/sys/dev/vinum/vinuminterrupt.c#4 integrate .. //depot/projects/kse/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/kse/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/kse/sys/dev/vinum/vinummemory.c#5 integrate .. //depot/projects/kse/sys/dev/vinum/vinumobj.h#5 integrate .. //depot/projects/kse/sys/dev/vinum/vinumutil.c#3 integrate .. //depot/projects/kse/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/kse/sys/dev/xe/if_xe_pccard.c#6 integrate .. //depot/projects/kse/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/kse/sys/dev/zs/zs.c#5 integrate .. //depot/projects/kse/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/kse/sys/doc/Doxyfile#1 branch .. //depot/projects/kse/sys/doc/Makefile#1 branch .. //depot/projects/kse/sys/fs/devfs/devfs.h#8 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc.h#6 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vfsops.c#11 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#22 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs.h#8 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_hash.c#9 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#14 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_denode.c#11 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_fileno.c#1 branch .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfsmount.h#6 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs.h#6 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_ihash.c#5 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_ihash.h#3 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_inode.h#4 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#15 integrate .. //depot/projects/kse/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_vfsops.c#9 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vfsops.c#11 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#16 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#14 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#15 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#19 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#12 integrate .. //depot/projects/kse/sys/fs/specfs/spec_vnops.c#20 integrate .. //depot/projects/kse/sys/fs/udf/udf.h#4 integrate .. //depot/projects/kse/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/kse/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/kse/sys/fs/umapfs/umap_vfsops.c#9 integrate .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#14 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/kse/sys/gdb/gdb.h#1 branch .. //depot/projects/kse/sys/gdb/gdb_int.h#1 branch .. //depot/projects/kse/sys/gdb/gdb_main.c#1 branch .. //depot/projects/kse/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/kse/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/kse/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/kse/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/kse/sys/geom/geom.h#11 integrate .. //depot/projects/kse/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/kse/sys/geom/geom_dev.c#10 integrate .. //depot/projects/kse/sys/geom/geom_disk.c#11 integrate .. //depot/projects/kse/sys/geom/geom_event.c#7 integrate .. //depot/projects/kse/sys/geom/geom_int.h#4 integrate .. //depot/projects/kse/sys/geom/geom_io.c#9 integrate .. //depot/projects/kse/sys/geom/geom_slice.c#8 integrate .. //depot/projects/kse/sys/geom/geom_subr.c#10 integrate .. //depot/projects/kse/sys/geom/label/g_label.c#1 branch .. //depot/projects/kse/sys/geom/label/g_label.h#1 branch .. //depot/projects/kse/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/kse/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/kse/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/kse/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/kse/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_extern.h#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 00:59:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D7A16A4D0; Mon, 19 Jul 2004 00:59:36 +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 D001B16A4CE for ; Mon, 19 Jul 2004 00:59:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A107D43D5C for ; Mon, 19 Jul 2004 00:59:36 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J0xacr010179 for ; Mon, 19 Jul 2004 00:59:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J0xZO4010176 for perforce@freebsd.org; Mon, 19 Jul 2004 00:59:35 GMT (envelope-from julian@freebsd.org) Date: Mon, 19 Jul 2004 00:59:35 GMT Message-Id: <200407190059.i6J0xZO4010176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 57667 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: Mon, 19 Jul 2004 00:59:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=57667 Change 57667 by julian@julian_desk on 2004/07/19 00:58:39 IFC (and recycle) changes in current.. still some to do in kern_switch.c Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/nsched/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/nsched/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/nsched/sys/alpha/alpha/promcons.c#4 integrate .. //depot/projects/nsched/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/nsched/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/nsched/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/nsched/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/nsched/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/nsched/sys/alpha/include/kdb.h#1 branch .. //depot/projects/nsched/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/nsched/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/nsched/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/autoconf.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/nsched/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/nsched/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/nsched/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/nsched/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/nsched/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/amd64/include/float.h#4 integrate .. //depot/projects/nsched/sys/amd64/include/frame.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/nsched/sys/amd64/include/kdb.h#1 branch .. //depot/projects/nsched/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/nsched/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/nsched/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/nsched/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/nsched/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/nsched/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/nsched/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/nsched/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/arm/include/frame.h#2 integrate .. //depot/projects/nsched/sys/arm/include/kdb.h#1 branch .. //depot/projects/nsched/sys/arm/include/pcb.h#2 integrate .. //depot/projects/nsched/sys/arm/include/pmap.h#2 integrate .. //depot/projects/nsched/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/nsched/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/nsched/sys/boot/common/loader.8#5 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/nsched/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/nsched/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/nsched/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/nsched/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/nsched/sys/cam/cam_periph.h#2 integrate .. //depot/projects/nsched/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/nsched/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/nsched/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/nsched/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/nsched/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/nsched/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/nsched/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/nsched/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/nsched/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/nsched/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/nsched/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/nsched/sys/conf/NOTES#10 integrate .. //depot/projects/nsched/sys/conf/files#16 integrate .. //depot/projects/nsched/sys/conf/files.alpha#4 integrate .. //depot/projects/nsched/sys/conf/files.amd64#6 integrate .. //depot/projects/nsched/sys/conf/files.i386#8 integrate .. //depot/projects/nsched/sys/conf/files.ia64#5 integrate .. //depot/projects/nsched/sys/conf/files.pc98#6 integrate .. //depot/projects/nsched/sys/conf/files.powerpc#2 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#4 integrate .. //depot/projects/nsched/sys/conf/options#11 integrate .. //depot/projects/nsched/sys/conf/options.alpha#2 integrate .. //depot/projects/nsched/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/nsched/sys/contrib/dev/fla/README#2 delete .. //depot/projects/nsched/sys/contrib/dev/fla/fla.c#3 delete .. //depot/projects/nsched/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/nsched/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/nsched/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/nsched/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/genfiles#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/nsched/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/nsched/sys/ddb/db_access.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_break.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_command.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_elf.c#3 delete .. //depot/projects/nsched/sys/ddb/db_kld.c#2 delete .. //depot/projects/nsched/sys/ddb/db_main.c#1 branch .. //depot/projects/nsched/sys/ddb/db_output.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_print.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_ps.c#4 integrate .. //depot/projects/nsched/sys/ddb/db_run.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_sysctl.c#2 delete .. //depot/projects/nsched/sys/ddb/db_thread.c#1 branch .. //depot/projects/nsched/sys/ddb/db_trap.c#2 delete .. //depot/projects/nsched/sys/ddb/db_variables.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_variables.h#2 integrate .. //depot/projects/nsched/sys/ddb/ddb.h#2 integrate .. //depot/projects/nsched/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#8 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/nsched/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_mem.c#4 integrate .. //depot/projects/nsched/sys/dev/ct/ct.c#2 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#9 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#6 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#9 integrate .. //depot/projects/nsched/sys/dev/digi/digi.h#4 integrate .. //depot/projects/nsched/sys/dev/en/midway.c#2 integrate .. //depot/projects/nsched/sys/dev/fb/creator.c#3 integrate .. //depot/projects/nsched/sys/dev/fb/fb.c#2 integrate .. //depot/projects/nsched/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/nsched/sys/dev/fdc/fdc_isa.c#1 branch .. //depot/projects/nsched/sys/dev/fdc/fdc_pccard.c#1 branch .. //depot/projects/nsched/sys/dev/fdc/fdcvar.h#1 branch .. //depot/projects/nsched/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/nsched/sys/dev/gfb/gfb_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/nsched/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/nsched/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/nsched/sys/dev/led/led.c#5 integrate .. //depot/projects/nsched/sys/dev/md/md.c#6 integrate .. //depot/projects/nsched/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/nsched/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#8 integrate .. //depot/projects/nsched/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/nsched/sys/dev/null/null.c#4 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/nsched/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/nsched/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/nsched/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/nsched/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/nsched/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/nsched/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/nsched/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/nsched/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/nsched/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#7 integrate .. //depot/projects/nsched/sys/dev/rp/rp.c#7 integrate .. //depot/projects/nsched/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#6 integrate .. //depot/projects/nsched/sys/dev/si/si.c#6 integrate .. //depot/projects/nsched/sys/dev/si/si.h#3 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#9 integrate .. //depot/projects/nsched/sys/dev/snp/snp.c#5 integrate .. //depot/projects/nsched/sys/dev/sound/driver.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sbc.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/nsched/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/nsched/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/nsched/sys/dev/streams/streams.c#3 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#6 integrate .. //depot/projects/nsched/sys/dev/sx/sx.h#3 integrate .. //depot/projects/nsched/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/nsched/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/nsched/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/nsched/sys/dev/vinum/vinumhdr.h#2 integrate .. //depot/projects/nsched/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/nsched/sys/dev/vinum/vinumioctl.c#3 integrate .. //depot/projects/nsched/sys/dev/vinum/vinummemory.c#2 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#7 integrate .. //depot/projects/nsched/sys/doc/Doxyfile#1 branch .. //depot/projects/nsched/sys/doc/Makefile#1 branch .. //depot/projects/nsched/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/nsched/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/nsched/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/nsched/sys/gdb/gdb.h#1 branch .. //depot/projects/nsched/sys/gdb/gdb_int.h#1 branch .. //depot/projects/nsched/sys/gdb/gdb_main.c#1 branch .. //depot/projects/nsched/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/nsched/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/nsched/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/nsched/sys/geom/geom_event.c#2 integrate .. //depot/projects/nsched/sys/geom/geom_int.h#2 integrate .. //depot/projects/nsched/sys/geom/geom_subr.c#2 integrate .. //depot/projects/nsched/sys/geom/label/g_label.c#3 integrate .. //depot/projects/nsched/sys/geom/label/g_label.h#3 integrate .. //depot/projects/nsched/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/nsched/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_subr.c#3 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/nsched/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#8 integrate .. //depot/projects/nsched/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/nsched/sys/i386/i386/autoconf.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/nsched/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/nsched/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/locore.s#3 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/nsched/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/nsched/sys/i386/i386/trap.c#3 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/nsched/sys/i386/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/i386/include/frame.h#3 integrate .. //depot/projects/nsched/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/nsched/sys/i386/include/kdb.h#1 branch .. //depot/projects/nsched/sys/i386/include/pcb.h#3 integrate .. //depot/projects/nsched/sys/i386/isa/clock.c#6 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/nsched/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/nsched/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/nsched/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/nsched/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/nsched/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/nsched/sys/ia64/conf/SKI#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/autoconf.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/gdb_machdep.c#1 branch .. //depot/projects/nsched/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/nsched/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/nsched/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/nsched/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/ia64/include/gdb_machdep.h#1 branch .. //depot/projects/nsched/sys/ia64/include/kdb.h#1 branch .. //depot/projects/nsched/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/nsched/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/nsched/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/nsched/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/nsched/sys/isa/psm.c#5 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/nsched/sys/kern/bus_if.m#2 integrate .. //depot/projects/nsched/sys/kern/device_if.m#2 integrate .. //depot/projects/nsched/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/nsched/sys/kern/init_main.c#9 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_clock.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#14 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#18 integrate .. //depot/projects/nsched/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_linker.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_mac.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_module.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_prot.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#28 integrate .. //depot/projects/nsched/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/nsched/sys/kern/link_elf.c#4 integrate .. //depot/projects/nsched/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#14 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#6 integrate .. //depot/projects/nsched/sys/kern/subr_kdb.c#1 branch .. //depot/projects/nsched/sys/kern/subr_prf.c#4 integrate .. //depot/projects/nsched/sys/kern/subr_prof.c#5 integrate .. //depot/projects/nsched/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_trap.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_witness.c#4 integrate .. //depot/projects/nsched/sys/kern/sys_generic.c#3 integrate .. //depot/projects/nsched/sys/kern/sys_process.c#3 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#5 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#5 integrate .. //depot/projects/nsched/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/nsched/sys/kern/tty.c#7 integrate .. //depot/projects/nsched/sys/kern/tty_conf.c#5 integrate .. //depot/projects/nsched/sys/kern/tty_cons.c#5 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#8 integrate .. //depot/projects/nsched/sys/kern/tty_subr.c#2 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_default.c#4 integrate .. //depot/projects/nsched/sys/kern/vfs_export.c#4 integrate .. //depot/projects/nsched/sys/kern/vfs_init.c#3 integrate .. //depot/projects/nsched/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/nsched/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/nsched/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/nsched/sys/libkern/qsort.c#3 integrate .. //depot/projects/nsched/sys/libkern/qsort_r.c#1 branch .. //depot/projects/nsched/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/de/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/fdc/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/nsched/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/sound/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/sound/pcm/Makefile#2 delete .. //depot/projects/nsched/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/nsched/sys/modules/uart/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/usb/Makefile#3 integrate .. //depot/projects/nsched/sys/net/if.c#6 integrate .. //depot/projects/nsched/sys/net/if_disc.c#5 integrate .. //depot/projects/nsched/sys/net/if_ef.c#4 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/nsched/sys/net/if_faith.c#7 integrate .. //depot/projects/nsched/sys/net/if_gif.c#7 integrate .. //depot/projects/nsched/sys/net/if_gre.c#6 integrate .. //depot/projects/nsched/sys/net/if_loop.c#6 integrate .. //depot/projects/nsched/sys/net/if_ppp.c#5 integrate .. //depot/projects/nsched/sys/net/if_sl.c#6 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/nsched/sys/net/if_stf.c#5 integrate .. //depot/projects/nsched/sys/net/if_tun.c#5 integrate .. //depot/projects/nsched/sys/net/if_var.h#6 integrate .. //depot/projects/nsched/sys/net/if_vlan.c#7 integrate .. //depot/projects/nsched/sys/net/netisr.c#2 integrate .. //depot/projects/nsched/sys/net/ppp_tty.c#4 integrate .. //depot/projects/nsched/sys/netatalk/aarp.c#4 integrate .. //depot/projects/nsched/sys/netatalk/at_control.c#2 integrate .. //depot/projects/nsched/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/nsched/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/nsched/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/nsched/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/nsched/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/nsched/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_fec.c#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/nsched/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/nsched/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/nsched/sys/netinet/ip_input.c#6 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/nsched/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/nsched/sys/netinet6/ip6_fw.c#3 integrate .. //depot/projects/nsched/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/nsched/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/nsched/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/nsched/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/nsched/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/nsched/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/nsched/sys/pc98/pc98/clock.c#4 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/nsched/sys/pc98/pc98/fdc_cbus.c#1 branch .. //depot/projects/nsched/sys/pc98/pc98/fdcvar.h#1 branch .. //depot/projects/nsched/sys/pc98/pc98/isa_dma.c#3 integrate .. //depot/projects/nsched/sys/pc98/pc98/pc98.h#3 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#9 integrate .. //depot/projects/nsched/sys/pci/if_devar.h#3 integrate .. //depot/projects/nsched/sys/pci/if_rl.c#8 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#7 integrate .. //depot/projects/nsched/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/nsched/sys/pci/if_xl.c#7 integrate .. //depot/projects/nsched/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/nsched/sys/pci/ncr.c#3 integrate .. //depot/projects/nsched/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/nsched/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/nsched/sys/powerpc/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/nsched/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/nsched/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/nsched/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/nsched/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/nsched/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/nsched/sys/security/mac_biba/mac_biba.h#2 integrate .. //depot/projects/nsched/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/nsched/sys/security/mac_mls/mac_mls.h#2 integrate .. //depot/projects/nsched/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/nsched/sys/sparc64/creator/creator_upa.c#4 integrate .. //depot/projects/nsched/sys/sparc64/include/db_machdep.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/gdb_machdep.h#1 branch .. //depot/projects/nsched/sys/sparc64/include/kdb.h#1 branch .. //depot/projects/nsched/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/nsched/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/gdb_machdep.c#1 branch .. //depot/projects/nsched/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/nsched/sys/sys/bus.h#4 integrate .. //depot/projects/nsched/sys/sys/conf.h#6 integrate .. //depot/projects/nsched/sys/sys/event.h#3 integrate .. //depot/projects/nsched/sys/sys/eventvar.h#2 integrate .. //depot/projects/nsched/sys/sys/exec.h#3 integrate .. //depot/projects/nsched/sys/sys/kdb.h#1 branch .. //depot/projects/nsched/sys/sys/kse.h#2 integrate .. //depot/projects/nsched/sys/sys/libkern.h#3 integrate .. //depot/projects/nsched/sys/sys/linker.h#3 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#7 integrate .. //depot/projects/nsched/sys/sys/module.h#2 integrate .. //depot/projects/nsched/sys/sys/mount.h#6 integrate .. //depot/projects/nsched/sys/sys/param.h#9 integrate .. //depot/projects/nsched/sys/sys/proc.h#20 integrate .. //depot/projects/nsched/sys/sys/procfs.h#3 integrate .. //depot/projects/nsched/sys/sys/ptrace.h#3 integrate .. //depot/projects/nsched/sys/sys/resourcevar.h#4 integrate .. //depot/projects/nsched/sys/sys/sbuf.h#2 integrate .. //depot/projects/nsched/sys/sys/sched.h#9 integrate .. //depot/projects/nsched/sys/sys/signalvar.h#3 integrate .. //depot/projects/nsched/sys/sys/socket.h#5 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#8 integrate .. //depot/projects/nsched/sys/sys/sx.h#2 integrate .. //depot/projects/nsched/sys/sys/syscall.h#5 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#5 integrate .. //depot/projects/nsched/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#5 integrate .. //depot/projects/nsched/sys/sys/systm.h#6 integrate .. //depot/projects/nsched/sys/sys/tty.h#8 integrate .. //depot/projects/nsched/sys/sys/uio.h#3 integrate .. //depot/projects/nsched/sys/sys/user.h#7 integrate .. //depot/projects/nsched/sys/sys/vnode.h#7 integrate .. //depot/projects/nsched/sys/tools/makeobjops.awk#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_subr.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/nsched/sys/vm/vm_map.c#7 integrate .. //depot/projects/nsched/sys/vm/vm_map.h#5 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#7 integrate .. //depot/projects/nsched/sys/vm/vm_pageout.c#5 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -25,10 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $"); - -#include "opt_ddb.h" -#include "opt_dev_sc.h" +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $"); #include #include @@ -49,18 +46,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void api_up1000_init(void); static void api_up1000_cons_init(void); @@ -85,40 +70,15 @@ irongate_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/nsched/sys/alpha/alpha/autoconf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.57 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.59 2004/07/08 22:35:33 brian Exp $"); #include "opt_bootp.h" #include "opt_isa.h" ==== //depot/projects/nsched/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.10 2004/07/10 23:47:18 marcel Exp $"); #include #include @@ -813,26 +813,9 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); -db_addr_t -db_disasm(loc, altfmt) - db_addr_t loc; - boolean_t altfmt; -{ - alpha_instruction inst; - - inst.bits = db_get_value(loc, 4, 0); - - loc += alpha_print_instruction(loc, inst, altfmt); - return (loc); -} - -int -alpha_print_instruction(iadr, i, showregs) - db_addr_t iadr; - alpha_instruction i; - boolean_t showregs; +static int +alpha_print_instr(db_addr_t iadr, alpha_instruction i, boolean_t showregs) { const char *opcode; int ireg; @@ -1038,7 +1021,7 @@ if (i.mem_format.opcode == op_ldah) signed_immediate <<= 16; db_printf(" <0x%lx>", signed_immediate + - db_register_value(DDB_REGS, i.mem_format.rs)); + db_register_value(i.mem_format.rs)); } break; case op_br: @@ -1084,10 +1067,23 @@ db_printf(","); db_printf("%s=0x%lx", name_of_register[regnum[ireg]], - db_register_value(DDB_REGS, regnum[ireg])); + db_register_value(regnum[ireg])); } db_printf(">"); } db_printf("\n"); return (sizeof(alpha_instruction)); } + +db_addr_t +db_disasm(loc, altfmt) + db_addr_t loc; + boolean_t altfmt; +{ + alpha_instruction inst; + + inst.bits = db_get_value(loc, 4, 0); + + loc += alpha_print_instr(loc, inst, altfmt); + return (loc); +} ==== //depot/projects/nsched/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -47,17 +47,15 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.29 2004/07/10 23:47:18 marcel Exp $"); #include -#include -#include #include +#include +#include #include -#include -#include -#include #include +#include #include #include @@ -73,209 +71,104 @@ #include #include #include -#include -static jmp_buf *db_nofault = 0; -extern jmp_buf db_jmpbuf; +static db_varfcn_t db_frame; -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -extern char *trap_type[]; -extern int trap_types; -#endif - -int db_active; - -void ddbprinttrap(unsigned long, unsigned long, unsigned long, - unsigned long); - struct db_variable db_regs[] = { - { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, - { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL }, - { "t1", &ddb_regs.tf_regs[FRAME_T1], FCN_NULL }, - { "t2", &ddb_regs.tf_regs[FRAME_T2], FCN_NULL }, - { "t3", &ddb_regs.tf_regs[FRAME_T3], FCN_NULL }, - { "t4", &ddb_regs.tf_regs[FRAME_T4], FCN_NULL }, - { "t5", &ddb_regs.tf_regs[FRAME_T5], FCN_NULL }, - { "t6", &ddb_regs.tf_regs[FRAME_T6], FCN_NULL }, - { "t7", &ddb_regs.tf_regs[FRAME_T7], FCN_NULL }, - { "s0", &ddb_regs.tf_regs[FRAME_S0], FCN_NULL }, - { "s1", &ddb_regs.tf_regs[FRAME_S1], FCN_NULL }, - { "s2", &ddb_regs.tf_regs[FRAME_S2], FCN_NULL }, - { "s3", &ddb_regs.tf_regs[FRAME_S3], FCN_NULL }, - { "s4", &ddb_regs.tf_regs[FRAME_S4], FCN_NULL }, - { "s5", &ddb_regs.tf_regs[FRAME_S5], FCN_NULL }, - { "s6", &ddb_regs.tf_regs[FRAME_S6], FCN_NULL }, - { "a0", &ddb_regs.tf_regs[FRAME_A0], FCN_NULL }, - { "a1", &ddb_regs.tf_regs[FRAME_A1], FCN_NULL }, - { "a2", &ddb_regs.tf_regs[FRAME_A2], FCN_NULL }, - { "a3", &ddb_regs.tf_regs[FRAME_A3], FCN_NULL }, - { "a4", &ddb_regs.tf_regs[FRAME_A4], FCN_NULL }, - { "a5", &ddb_regs.tf_regs[FRAME_A5], FCN_NULL }, - { "t8", &ddb_regs.tf_regs[FRAME_T8], FCN_NULL }, - { "t9", &ddb_regs.tf_regs[FRAME_T9], FCN_NULL }, - { "t10", &ddb_regs.tf_regs[FRAME_T10], FCN_NULL }, - { "t11", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "ra", &ddb_regs.tf_regs[FRAME_RA], FCN_NULL }, - { "t12", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, - { "at", &ddb_regs.tf_regs[FRAME_AT], FCN_NULL }, - { "gp", &ddb_regs.tf_regs[FRAME_GP], FCN_NULL }, - { "sp", &ddb_regs.tf_regs[FRAME_SP], FCN_NULL }, - { "pc", &ddb_regs.tf_regs[FRAME_PC], FCN_NULL }, - { "ps", &ddb_regs.tf_regs[FRAME_PS], FCN_NULL }, - { "ai", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "pv", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, + { "v0", (db_expr_t *)FRAME_V0, db_frame }, + { "t0", (db_expr_t *)FRAME_T0, db_frame }, + { "t1", (db_expr_t *)FRAME_T1, db_frame }, + { "t2", (db_expr_t *)FRAME_T2, db_frame }, + { "t3", (db_expr_t *)FRAME_T3, db_frame }, + { "t4", (db_expr_t *)FRAME_T4, db_frame }, + { "t5", (db_expr_t *)FRAME_T5, db_frame }, + { "t6", (db_expr_t *)FRAME_T6, db_frame }, + { "t7", (db_expr_t *)FRAME_T7, db_frame }, + { "s0", (db_expr_t *)FRAME_S0, db_frame }, + { "s1", (db_expr_t *)FRAME_S1, db_frame }, + { "s2", (db_expr_t *)FRAME_S2, db_frame }, + { "s3", (db_expr_t *)FRAME_S3, db_frame }, + { "s4", (db_expr_t *)FRAME_S4, db_frame }, + { "s5", (db_expr_t *)FRAME_S5, db_frame }, + { "s6", (db_expr_t *)FRAME_S6, db_frame }, + { "a0", (db_expr_t *)FRAME_A0, db_frame }, + { "a1", (db_expr_t *)FRAME_A1, db_frame }, + { "a2", (db_expr_t *)FRAME_A2, db_frame }, + { "a3", (db_expr_t *)FRAME_A3, db_frame }, + { "a4", (db_expr_t *)FRAME_A4, db_frame }, + { "a5", (db_expr_t *)FRAME_A5, db_frame }, + { "t8", (db_expr_t *)FRAME_T8, db_frame }, + { "t9", (db_expr_t *)FRAME_T9, db_frame }, + { "t10", (db_expr_t *)FRAME_T10, db_frame }, + { "t11", (db_expr_t *)FRAME_T11, db_frame }, + { "ra", (db_expr_t *)FRAME_RA, db_frame }, + { "t12", (db_expr_t *)FRAME_T12, db_frame }, + { "at", (db_expr_t *)FRAME_AT, db_frame }, + { "gp", (db_expr_t *)FRAME_GP, db_frame }, + { "sp", (db_expr_t *)FRAME_SP, db_frame }, + { "pc", (db_expr_t *)FRAME_PC, db_frame }, + { "ps", (db_expr_t *)FRAME_PS, db_frame }, + { "ai", (db_expr_t *)FRAME_T11, db_frame }, + { "pv", (db_expr_t *)FRAME_T12, db_frame }, }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -/* - * Print trap reason. - */ -void -ddbprinttrap(a0, a1, a2, entry) - unsigned long a0, a1, a2, entry; +static int +db_frame(struct db_variable *vp, db_expr_t *valuep, int op) { - /* XXX Implement. */ - - printf("ddbprinttrap(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n", a0, a1, a2, - entry); + if (kdb_frame == NULL) + return (0); + if (op == DB_VAR_GET) + *valuep = kdb_frame->tf_regs[(uintptr_t)vp->valuep]; + else + kdb_frame->tf_regs[(uintptr_t)vp->valuep] = *valuep; + return (1); } /* - * ddb_trap - field a kernel trap + * Read bytes from kernel address space for debugger. */ int -kdb_trap(a0, a1, a2, entry, regs) - unsigned long a0, a1, a2, entry; - db_regs_t *regs; +db_read_bytes(vm_offset_t addr, size_t size, char *data) { - int ddb_mode = !(boothowto & RB_GDB); - register_t s; + jmp_buf jb; + void *prev_jb; + char *src; + int ret; - /* - * Don't bother checking for usermode, since a benign entry - * by the kernel (call to Debugger() or a breakpoint) has - * already checked for usermode. If neither of those - * conditions exist, something Bad has happened. - */ - - if (entry != ALPHA_KENTRY_IF || - (a0 != ALPHA_IF_CODE_BUGCHK && a0 != ALPHA_IF_CODE_BPT - && a0 != ALPHA_IF_CODE_GENTRAP)) { -#if 0 - if (ddb_mode) { - db_printf("ddbprinttrap from 0x%lx\n", /* XXX */ - regs->tf_regs[FRAME_PC]); - ddbprinttrap(a0, a1, a2, entry); - /* - * Tell caller "We did NOT handle the trap." - * Caller should panic, or whatever. - */ - return (0); - } -#endif - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + src = (char *)addr; + while (size-- > 0) + *data++ = *src++; } - - /* - * XXX Should switch to DDB's own stack, here. - */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 01:12:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB7A216A4D0; Mon, 19 Jul 2004 01:12:53 +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 A629716A4CE for ; Mon, 19 Jul 2004 01:12:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8637C43D1F for ; Mon, 19 Jul 2004 01:12:53 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J1Crnd010559 for ; Mon, 19 Jul 2004 01:12:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J1Cr1U010556 for perforce@freebsd.org; Mon, 19 Jul 2004 01:12:53 GMT (envelope-from julian@freebsd.org) Date: Mon, 19 Jul 2004 01:12:53 GMT Message-Id: <200407190112.i6J1Cr1U010556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 57669 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: Mon, 19 Jul 2004 01:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=57669 Change 57669 by julian@julian_desk on 2004/07/19 01:11:56 Catch up with the system version of kern_switch.c. Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#27 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#15 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#27 (text+ko) ==== @@ -1838,7 +1838,8 @@ ("critical_exit: td_critnest == 0")); if (td->td_critnest == 1) { #ifdef PREEMPTION - if (td->td_flags & TDF_OWEPREEMPT) { + mtx_assert(&sched_lock, MA_NOTOWNED); + if (td->td_pflags & TDP_OWEPREEMPT) { mtx_lock_spin(&sched_lock); mi_switch(SW_INVOL, NULL); mtx_unlock_spin(&sched_lock); @@ -1872,7 +1873,9 @@ * The new thread should not preempt the current thread if any of the * following conditions are true: * - * - The current thread has a higher (numerically lower) priority. + * - The current thread has a higher (numerically lower) or + * equivalent priority. Note that this prevents curthread from + * trying to preempt to itself. * - It is too early in the boot for context switches (cold is set). * - The current thread has an inhibitor set or is in the process of * exiting. In this case, the current thread is about to switch @@ -1902,7 +1905,7 @@ if (ctd->td_critnest > 1) { CTR1(KTR_PROC, "maybe_preempt: in critical section %d", ctd->td_critnest); - ctd->td_flags |= TDF_OWEPREEMPT; + ctd->td_pflags |= TDP_OWEPREEMPT; return (0); } ==== //depot/projects/nsched/sys/kern/sched_ule.c#15 (text+ko) ==== @@ -2780,7 +2780,8 @@ ("critical_exit: td_critnest == 0")); if (td->td_critnest == 1) { #ifdef PREEMPTION - if (td->td_flags & TDF_OWEPREEMPT) { + mtx_assert(&sched_lock, MA_NOTOWNED); + if (td->td_pflags & TDP_OWEPREEMPT) { mtx_lock_spin(&sched_lock); mi_switch(SW_INVOL, NULL); mtx_unlock_spin(&sched_lock); @@ -2815,7 +2816,9 @@ * The new thread should not preempt the current thread if any of the * following conditions are true: * - * - The current thread has a higher (numerically lower) priority. + * - The current thread has a higher (numerically lower) or + * equivalent priority. Note that this prevents curthread from + * trying to preempt to itself. * - It is too early in the boot for context switches (cold is set). * - The current thread has an inhibitor set or is in the process of * exiting. In this case, the current thread is about to switch @@ -2845,7 +2848,7 @@ if (ctd->td_critnest > 1) { CTR1(KTR_PROC, "maybe_preempt: in critical section %d", ctd->td_critnest); - ctd->td_flags |= TDF_OWEPREEMPT; + ctd->td_pflags |= TDP_OWEPREEMPT; return (0); } From owner-p4-projects@FreeBSD.ORG Mon Jul 19 08:43:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6070D16A4CF; Mon, 19 Jul 2004 08:43:01 +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 1BA6916A4CF for ; Mon, 19 Jul 2004 08:43:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12AE643D46 for ; Mon, 19 Jul 2004 08:43:01 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6J8h1Rp034406 for ; Mon, 19 Jul 2004 08:43:01 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6J8h0UH034399 for perforce@freebsd.org; Mon, 19 Jul 2004 08:43:00 GMT (envelope-from dfr@freebsd.org) Date: Mon, 19 Jul 2004 08:43:00 GMT Message-Id: <200407190843.i6J8h0UH034399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57686 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: Mon, 19 Jul 2004 08:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=57686 Change 57686 by dfr@dfr_home on 2004/07/19 08:42:50 IFC Affected files ... .. //depot/projects/kse/lib/libc/amd64/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/kse/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/kse/lib/libc/gen/signbit.3#2 delete .. //depot/projects/kse/lib/libc/gen/signbit.c#2 delete .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#6 integrate .. //depot/projects/kse/lib/libc/i386/gen/flt_rounds.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/ia64/gen/flt_rounds.c#1 branch .. //depot/projects/kse/lib/libc/regex/grot/debug.c#2 integrate .. //depot/projects/kse/lib/libc/regex/grot/limits.h#2 delete .. //depot/projects/kse/lib/libc/regex/grot/stdlib.h#2 delete .. //depot/projects/kse/sys/amd64/include/float.h#5 integrate .. //depot/projects/kse/sys/arm/include/float.h#2 integrate .. //depot/projects/kse/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/kse/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#65 integrate .. //depot/projects/kse/sys/i386/include/float.h#6 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#37 integrate .. //depot/projects/kse/sys/ia64/include/float.h#6 integrate .. //depot/projects/kse/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/kse/sys/kern/kern_malloc.c#18 integrate .. //depot/projects/kse/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/kse/sys/powerpc/include/float.h#5 integrate .. //depot/projects/kse/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/kse/sys/sys/malloc.h#12 integrate .. //depot/projects/kse/sys/vm/vm_contig.c#13 integrate .. //depot/projects/kse/sys/vm/vm_page.h#17 integrate .. //depot/projects/kse/tools/regression/lib/msun/test-fenv.c#2 integrate Differences ... ==== //depot/projects/kse/lib/libc/amd64/gen/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.26 2004/07/18 21:23:38 das Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.27 2004/07/19 08:17:24 das Exp $ SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ infinity.c ldexp.c makecontext.c signalcontext.c \ - fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ + flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c ==== //depot/projects/kse/lib/libc/gen/Makefile.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.113 2004/07/18 21:23:39 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.114 2004/07/19 08:16:10 das Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -25,8 +25,7 @@ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ setdomainname.c sethostname.c setjmperr.c setmode.c \ - setproctitle.c setprogname.c \ - siginterrupt.c siglist.c signal.c signbit.c \ + setproctitle.c setprogname.c siginterrupt.c siglist.c signal.c \ sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \ @@ -58,7 +57,7 @@ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_wait.3 \ setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ - siginterrupt.3 signal.3 signbit.3 sigsetops.3 sleep.3 \ + siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ==== //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#6 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.20 2004/07/18 21:23:39 das Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.21 2004/07/19 08:17:24 das Exp $ SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S \ - infinity.c ldexp.c makecontext.c modf.S \ + flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/kse/lib/libc/ia64/gen/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.10 2004/07/18 21:23:39 das Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.11 2004/07/19 08:17:24 das Exp $ SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ - fpgetmask.c fpgetround.c fpsetmask.c fpsetround.c infinity.c \ + flt_rounds.c fpgetmask.c fpgetround.c fpsetmask.c \ + fpsetround.c infinity.c \ ldexp.c makecontext.c modf.c setjmp.S signalcontext.c sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() ==== //depot/projects/kse/lib/libc/regex/grot/debug.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.3 2002/03/22 21:52:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.4 2004/07/19 08:28:53 tjr Exp $"); #include #include @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "utils.h" #include "regex2.h" @@ -26,10 +28,8 @@ int i; int c; int last; - int nincat[NC]; - fprintf(d, "%ld states, %d categories", (long)g->nstates, - g->ncategories); + fprintf(d, "%ld states", (long)g->nstates); fprintf(d, ", first %ld last %ld", (long)g->firststate, (long)g->laststate); if (g->iflags&USEBOL) @@ -49,41 +49,6 @@ fprintf(d, ", nplus %ld", (long)g->nplus); fprintf(d, "\n"); s_print(g, d); - for (i = 0; i < g->ncategories; i++) { - nincat[i] = 0; - for (c = CHAR_MIN; c <= CHAR_MAX; c++) - if (g->categories[c] == i) - nincat[i]++; - } - fprintf(d, "cc0#%d", nincat[0]); - for (i = 1; i < g->ncategories; i++) - if (nincat[i] == 1) { - for (c = CHAR_MIN; c <= CHAR_MAX; c++) - if (g->categories[c] == i) - break; - fprintf(d, ", %d=%s", i, regchar(c)); - } - fprintf(d, "\n"); - for (i = 1; i < g->ncategories; i++) - if (nincat[i] != 1) { - fprintf(d, "cc%d\t", i); - last = -1; - for (c = CHAR_MIN; c <= CHAR_MAX+1; c++) /* +1 does flush */ - if (c <= CHAR_MAX && g->categories[c] == i) { - if (last < 0) { - fprintf(d, "%s", regchar(c)); - last = c; - } - } else { - if (last >= 0) { - if (last != c-1) - fprintf(d, "-%s", - regchar(c-1)); - last = -1; - } - } - fprintf(d, "\n"); - } } /* @@ -148,6 +113,7 @@ break; case OANYOF: fprintf(d, "[(%ld)", (long)opnd); +#if 0 cs = &g->sets[opnd]; last = -1; for (i = 0; i < g->csetsize+1; i++) /* +1 flushes */ @@ -164,6 +130,7 @@ last = -1; } } +#endif fprintf(d, "]"); break; case OBACK_: ==== //depot/projects/kse/sys/amd64/include/float.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.13 2004/07/08 01:32:25 peter Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.14 2004/07/19 08:17:24 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -35,8 +35,12 @@ #include +__BEGIN_DECLS +extern int __flt_rounds(void); +__END_DECLS + #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ ==== //depot/projects/kse/sys/arm/include/float.h#2 (text+ko) ==== @@ -31,15 +31,15 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/arm/include/float.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/float.h,v 1.3 2004/07/19 08:24:04 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ -#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ +#define FLT_ROUNDS (-1) /* indeterminate */ +#define FLT_EVAL_METHOD (-1) /* XXX */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ #define FLT_MANT_DIG 24 /* p */ ==== //depot/projects/kse/sys/geom/nop/g_nop.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.4 2004/06/07 13:40:40 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.5 2004/07/19 07:52:56 pjd Exp $"); #include #include @@ -72,11 +72,13 @@ static void g_nop_start(struct bio *bp) { + struct g_nop_softc *sc; struct g_geom *gp; struct g_provider *pp; struct bio *cbp; gp = bp->bio_to->geom; + sc = gp->softc; G_NOP_LOGREQ(bp, "Request received."); cbp = g_clone_bio(bp); if (cbp == NULL) { @@ -85,17 +87,17 @@ } pp = LIST_FIRST(&gp->provider); KASSERT(pp != NULL, ("NULL pp")); - if (pp->index > 0) { + if (sc->sc_failprob > 0) { u_int rval; rval = arc4random() % 100; - if (rval < pp->index) { + if (rval < sc->sc_failprob) { g_io_deliver(bp, EIO); return; } } cbp->bio_done = g_std_done; - cbp->bio_offset = bp->bio_offset; + cbp->bio_offset = bp->bio_offset + sc->sc_offset; cbp->bio_data = bp->bio_data; cbp->bio_length = bp->bio_length; cbp->bio_to = LIST_FIRST(&gp->provider); @@ -119,8 +121,9 @@ static int g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp, - u_int failprob) + u_int failprob, off_t offset, off_t size) { + struct g_nop_softc *sc; struct g_geom *gp; struct g_provider *newpp; struct g_consumer *cp; @@ -133,6 +136,24 @@ newpp = NULL; cp = NULL; + if ((offset % pp->sectorsize) != 0) { + gctl_error(req, "Invalid offset for provider %s.", pp->name); + return (EINVAL); + } + if ((size % pp->sectorsize) != 0) { + gctl_error(req, "Invalid size for provider %s.", pp->name); + return (EINVAL); + } + if (offset >= pp->mediasize) { + gctl_error(req, "Invalid offset for provider %s.", pp->name); + return (EINVAL); + } + if (size == 0) + size = pp->mediasize - offset; + if (offset + size > pp->mediasize) { + gctl_error(req, "Invalid size for provider %s.", pp->name); + return (EINVAL); + } snprintf(name, sizeof(name), "%s%s", pp->name, G_NOP_SUFFIX); LIST_FOREACH(gp, &mp->geom, geom) { if (strcmp(gp->name, name) == 0) { @@ -145,7 +166,10 @@ gctl_error(req, "Cannot create geom %s.", name); return (ENOMEM); } - gp->softc = NULL; + sc = g_malloc(sizeof(*sc), M_WAITOK); + sc->sc_offset = offset; + sc->sc_failprob = failprob; + gp->softc = sc; gp->start = g_nop_start; gp->spoiled = g_nop_orphan; gp->orphan = g_nop_orphan; @@ -158,9 +182,8 @@ error = ENOMEM; goto fail; } - newpp->mediasize = pp->mediasize; + newpp->mediasize = size; newpp->sectorsize = pp->sectorsize; - newpp->index = failprob; cp = g_new_consumer(gp); if (cp == NULL) { @@ -185,8 +208,11 @@ } if (newpp != NULL) g_destroy_provider(pp); - if (gp != NULL) + if (gp != NULL) { + if (gp->softc != NULL) + g_free(gp->softc); g_destroy_geom(gp); + } return (error); } @@ -209,6 +235,8 @@ } else { G_NOP_DEBUG(0, "Device %s removed.", gp->name); } + g_free(gp->softc); + gp->softc = NULL; g_wither_geom(gp, ENXIO); return (0); @@ -225,7 +253,7 @@ g_nop_ctl_create(struct gctl_req *req, struct g_class *mp) { struct g_provider *pp; - intmax_t *failprob; + intmax_t *failprob, *offset, *size; const char *name; char param[16]; int i, *nargs; @@ -250,6 +278,24 @@ gctl_error(req, "Invalid '%s' argument", "failprob"); return; } + offset = gctl_get_paraml(req, "offset", sizeof(*offset)); + if (offset == NULL) { + gctl_error(req, "No '%s' argument", "offset"); + return; + } + if (*offset < 0) { + gctl_error(req, "Invalid '%s' argument", "offset"); + return; + } + size = gctl_get_paraml(req, "size", sizeof(*size)); + if (size == NULL) { + gctl_error(req, "No '%s' argument", "size"); + return; + } + if (*size < 0) { + gctl_error(req, "Invalid '%s' argument", "size"); + return; + } for (i = 0; i < *nargs; i++) { snprintf(param, sizeof(param), "arg%d", i); @@ -266,14 +312,17 @@ gctl_error(req, "Provider %s is invalid.", name); return; } - if (g_nop_create(req, mp, pp, (u_int)*failprob) != 0) + if (g_nop_create(req, mp, pp, (u_int)*failprob, (off_t)*offset, + (off_t)*size) != 0) { return; + } } } static void g_nop_ctl_configure(struct gctl_req *req, struct g_class *mp) { + struct g_nop_softc *sc; struct g_provider *pp; intmax_t *failprob; const char *name; @@ -316,7 +365,8 @@ gctl_error(req, "Provider %s is invalid.", name); return; } - pp->index = (u_int)*failprob; + sc = pp->geom->softc; + sc->sc_failprob = (u_int)*failprob; } } @@ -416,11 +466,14 @@ g_nop_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) { + struct g_nop_softc *sc; - if (pp != NULL) { - sbuf_printf(sb, "%s%u\n", indent, - pp->index); - } + if (pp == NULL) + return; + sc = gp->softc; + sbuf_printf(sb, "%s%jd\n", indent, + (intmax_t)sc->sc_offset); + sbuf_printf(sb, "%s%u\n", indent, sc->sc_failprob); } DECLARE_GEOM_CLASS(g_nop_class, g_nop); ==== //depot/projects/kse/sys/geom/nop/g_nop.h#2 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/nop/g_nop.h,v 1.2 2004/05/21 15:23:48 pjd Exp $ + * $FreeBSD: src/sys/geom/nop/g_nop.h,v 1.3 2004/07/19 07:52:56 pjd Exp $ */ #ifndef _G_NOP_H_ #define _G_NOP_H_ #define G_NOP_CLASS_NAME "NOP" -#define G_NOP_VERSION 1 +#define G_NOP_VERSION 2 #define G_NOP_SUFFIX ".nop" #ifdef _KERNEL @@ -53,6 +53,11 @@ printf("\n"); \ } \ } while (0) + +struct g_nop_softc { + off_t sc_offset; + u_int sc_failprob; +}; #endif /* _KERNEL */ #endif /* _G_NOP_H_ */ ==== //depot/projects/kse/sys/i386/i386/machdep.c#65 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.595 2004/07/13 07:22:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.596 2004/07/19 02:46:34 silby Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -95,6 +95,9 @@ #include #ifdef DDB +#ifndef KDB +#error KDB must be enabled in order for DDB to work! +#endif #include #include #endif ==== //depot/projects/kse/sys/i386/include/float.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.13 2004/06/28 03:08:17 imp Exp $ + * $FreeBSD: src/sys/i386/include/float.h,v 1.14 2004/07/19 08:17:25 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -35,8 +35,12 @@ #include +__BEGIN_DECLS +extern int __flt_rounds(void); +__END_DECLS + #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ ==== //depot/projects/kse/sys/ia64/ia64/pmap.c#37 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.141 2004/07/16 03:42:45 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.142 2004/07/19 05:39:49 alc Exp $"); #include #include @@ -445,6 +445,7 @@ /* * Initialize the kernel pmap (which is statically allocated). */ + PMAP_LOCK_INIT(kernel_pmap); for (i = 0; i < 5; i++) kernel_pmap->pm_rid[i] = 0; kernel_pmap->pm_active = 1; @@ -698,6 +699,7 @@ { int i; + PMAP_LOCK_INIT(pmap); for (i = 0; i < 5; i++) pmap->pm_rid[i] = pmap_allocate_rid(); pmap->pm_active = 0; @@ -722,6 +724,7 @@ for (i = 0; i < 5; i++) if (pmap->pm_rid[i]) pmap_free_rid(pmap->pm_rid[i]); + PMAP_LOCK_DESTROY(pmap); } /* @@ -1339,6 +1342,7 @@ return; vm_page_lock_queues(); + PMAP_LOCK(pmap); oldpmap = pmap_install(pmap); /* @@ -1374,6 +1378,7 @@ out: pmap_install(oldpmap); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); } @@ -1414,6 +1419,7 @@ pmap_t pmap = pv->pv_pmap; vm_offset_t va = pv->pv_va; + PMAP_LOCK(pmap); oldpmap = pmap_install(pmap); pte = pmap_find_vhpt(va); KASSERT(pte != NULL, ("pte")); @@ -1422,6 +1428,7 @@ pmap_remove_pte(pmap, pte, va, pv, 1); pmap_invalidate_page(pmap, va); pmap_install(oldpmap); + PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); @@ -1458,6 +1465,7 @@ panic("pmap_protect: unaligned addresses"); vm_page_lock_queues(); + PMAP_LOCK(pmap); oldpmap = pmap_install(pmap); while (sva < eva) { /* @@ -1491,6 +1499,7 @@ sva += PAGE_SIZE; } pmap_install(oldpmap); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); } @@ -1704,6 +1713,7 @@ if (pmap == NULL) return; + PMAP_LOCK(pmap); oldpmap = pmap_install(pmap); pte = pmap_find_vhpt(va); @@ -1720,6 +1730,7 @@ pmap_pte_set_w(pte, wired); pmap_install(oldpmap); + PMAP_UNLOCK(pmap); } @@ -1854,6 +1865,7 @@ #endif vm_page_lock_queues(); + PMAP_LOCK(pmap); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { @@ -1874,6 +1886,7 @@ } pmap_invalidate_all(pmap); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); } ==== //depot/projects/kse/sys/ia64/include/float.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/float.h,v 1.6 2004/04/25 02:36:29 das Exp $ */ +/* $FreeBSD: src/sys/ia64/include/float.h,v 1.7 2004/07/19 08:17:25 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -35,8 +35,12 @@ #include +__BEGIN_DECLS +extern int __flt_rounds(void); +__END_DECLS + #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ ==== //depot/projects/kse/sys/ia64/include/pmap.h#11 (text+ko) ==== @@ -39,13 +39,15 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.21 2004/07/16 03:42:45 alc Exp $ + * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.22 2004/07/19 05:39:49 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ #include +#include +#include #include #ifdef _KERNEL @@ -70,6 +72,7 @@ }; struct pmap { + struct mtx pm_mtx; TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ u_int32_t pm_rid[5]; /* base RID for pmap */ int pm_active; /* active flag */ @@ -81,6 +84,17 @@ #ifdef _KERNEL extern struct pmap kernel_pmap_store; #define kernel_pmap (&kernel_pmap_store) + +#define PMAP_LOCK(pmap) mtx_lock(&(pmap)->pm_mtx) +#define PMAP_LOCK_ASSERT(pmap, type) \ + mtx_assert(&(pmap)->pm_mtx, (type)) +#define PMAP_LOCK_DESTROY(pmap) mtx_destroy(&(pmap)->pm_mtx) +#define PMAP_LOCK_INIT(pmap) mtx_init(&(pmap)->pm_mtx, "pmap", \ + NULL, MTX_DEF) +#define PMAP_LOCKED(pmap) mtx_owned(&(pmap)->pm_mtx) +#define PMAP_MTX(pmap) (&(pmap)->pm_mtx) +#define PMAP_TRYLOCK(pmap) mtx_trylock(&(pmap)->pm_mtx) +#define PMAP_UNLOCK(pmap) mtx_unlock(&(pmap)->pm_mtx) #endif /* ==== //depot/projects/kse/sys/kern/kern_malloc.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.134 2004/07/10 21:36:01 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.135 2004/07/19 06:21:26 green Exp $"); #include "opt_vm.h" @@ -176,6 +176,47 @@ } /* + * Add this to the informational malloc_type bucket. + */ +static void +malloc_type_zone_allocated(struct malloc_type *ksp, unsigned long size, + int zindx) +{ + mtx_lock(&ksp->ks_mtx); + ksp->ks_calls++; + if (zindx != -1) + ksp->ks_size |= 1 << zindx; + if (size != 0) { + ksp->ks_memuse += size; + ksp->ks_inuse++; + if (ksp->ks_memuse > ksp->ks_maxused) + ksp->ks_maxused = ksp->ks_memuse; + } + mtx_unlock(&ksp->ks_mtx); +} + +void +malloc_type_allocated(struct malloc_type *ksp, unsigned long size) +{ + malloc_type_zone_allocated(ksp, size, -1); +} + +/* + * Remove this allocation from the informational malloc_type bucket. + */ +void +malloc_type_freed(struct malloc_type *ksp, unsigned long size) +{ + mtx_lock(&ksp->ks_mtx); + KASSERT(size <= ksp->ks_memuse, + ("malloc(9)/free(9) confusion.\n%s", + "Probably freeing with wrong type, but maybe not here.")); + ksp->ks_memuse -= size; + ksp->ks_inuse--; + mtx_unlock(&ksp->ks_mtx); +} + +/* * malloc: * * Allocate a block of memory. @@ -196,7 +237,6 @@ #ifdef DIAGNOSTIC unsigned long osize = size; #endif - register struct malloc_type *ksp = type; #ifdef INVARIANTS /* @@ -242,29 +282,16 @@ krequests[size >> KMEM_ZSHIFT]++; #endif va = uma_zalloc(zone, flags); - mtx_lock(&ksp->ks_mtx); - if (va == NULL) - goto out; - - ksp->ks_size |= 1 << indx; - size = keg->uk_size; + if (va != NULL) + size = keg->uk_size; + malloc_type_zone_allocated(type, va == NULL ? 0 : size, indx); } else { size = roundup(size, PAGE_SIZE); zone = NULL; keg = NULL; va = uma_large_malloc(size, flags); - mtx_lock(&ksp->ks_mtx); - if (va == NULL) - goto out; + malloc_type_allocated(type, va == NULL ? 0 : size); } - ksp->ks_memuse += size; - ksp->ks_inuse++; -out: - ksp->ks_calls++; - if (ksp->ks_memuse > ksp->ks_maxused) - ksp->ks_maxused = ksp->ks_memuse; - - mtx_unlock(&ksp->ks_mtx); if (flags & M_WAITOK) KASSERT(va != NULL, ("malloc(M_WAITOK) returned NULL")); else if (va == NULL) @@ -289,7 +316,6 @@ void *addr; struct malloc_type *type; { - register struct malloc_type *ksp = type; uma_slab_t slab; u_long size; @@ -297,7 +323,7 @@ if (addr == NULL) return; - KASSERT(ksp->ks_memuse > 0, + KASSERT(type->ks_memuse > 0, ("malloc(9)/free(9) confusion.\n%s", "Probably freeing with wrong type, but maybe not here.")); size = 0; @@ -334,13 +360,7 @@ size = slab->us_size; uma_large_free(slab); } - mtx_lock(&ksp->ks_mtx); - KASSERT(size <= ksp->ks_memuse, - ("malloc(9)/free(9) confusion.\n%s", - "Probably freeing with wrong type, but maybe not here.")); - ksp->ks_memuse -= size; - ksp->ks_inuse--; - mtx_unlock(&ksp->ks_mtx); + malloc_type_freed(type, size); } /* ==== //depot/projects/kse/sys/powerpc/include/float.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 - * $FreeBSD: src/sys/powerpc/include/float.h,v 1.5 2004/04/25 02:36:29 das Exp $ + * $FreeBSD: src/sys/powerpc/include/float.h,v 1.6 2004/07/19 08:17:25 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -36,8 +36,12 @@ #include +__BEGIN_DECLS +extern int __flt_rounds(void); +__END_DECLS + #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 1 /* operands promoted to double */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ ==== //depot/projects/kse/sys/powerpc/include/ucontext.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $ - * $FreeBSD: src/sys/powerpc/include/ucontext.h,v 1.3 2004/03/02 06:13:08 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/ucontext.h,v 1.4 2004/07/19 07:21:46 grehan Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -68,5 +68,6 @@ #define mc_vrsave mc_av[1] #define _MC_VERSION 0x1 +#define _MC_VERSION_KSE 0xee /* partial ucontext for libpthread */ #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/kse/sys/sys/malloc.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $FreeBSD: src/sys/sys/malloc.h,v 1.76 2004/04/07 04:19:49 imp Exp $ + * $FreeBSD: src/sys/sys/malloc.h,v 1.77 2004/07/19 06:21:26 green Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -105,6 +105,8 @@ void *malloc(unsigned long size, struct malloc_type *type, int flags); void malloc_init(void *); int malloc_last_fail(void); +void malloc_type_allocated(struct malloc_type *type, unsigned long size); +void malloc_type_freed(struct malloc_type *type, unsigned long size); void malloc_uninit(void *); void *realloc(void *addr, unsigned long size, struct malloc_type *type, int flags); ==== //depot/projects/kse/sys/vm/vm_contig.c#13 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.35 2004/06/15 01:02:00 green Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.36 2004/07/19 06:21:27 green Exp $"); #include #include @@ -68,6 +68,9 @@ #include #include #include +#include +#include +#include #include #include @@ -83,49 +86,62 @@ #include static int -vm_contig_launder(int queue) +vm_contig_launder_page(vm_page_t m) { vm_object_t object; - vm_page_t m, m_tmp, next; + vm_page_t m_tmp; struct vnode *vp; + if (vm_page_sleep_if_busy(m, TRUE, "vpctw0")) { + vm_page_lock_queues(); + return (EBUSY); + } + if (!VM_OBJECT_TRYLOCK(m->object)) + return (EAGAIN); + vm_page_test_dirty(m); + if (m->dirty == 0 && m->hold_count == 0) + pmap_remove_all(m); + if (m->dirty) { + object = m->object; + if (object->type == OBJT_VNODE) { + vm_page_unlock_queues(); + vp = object->handle; + VM_OBJECT_UNLOCK(object); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + VM_OBJECT_LOCK(object); + vm_object_page_clean(object, 0, 0, OBJPC_SYNC); + VM_OBJECT_UNLOCK(object); + VOP_UNLOCK(vp, 0, curthread); + vm_page_lock_queues(); + return (0); + } else if (object->type == OBJT_SWAP || + object->type == OBJT_DEFAULT) { + m_tmp = m; + vm_pageout_flush(&m_tmp, 1, VM_PAGER_PUT_SYNC); + VM_OBJECT_UNLOCK(object); + return (0); + } + } else if (m->hold_count == 0) + vm_page_cache(m); + VM_OBJECT_UNLOCK(m->object); + return (0); +} + +static int +vm_contig_launder(int queue) +{ + vm_page_t m, next; + int error; + for (m = TAILQ_FIRST(&vm_page_queues[queue].pl); m != NULL; m = next) { next = TAILQ_NEXT(m, pageq); KASSERT(m->queue == queue, ("vm_contig_launder: page %p's queue is not %d", m, queue)); - if (!VM_OBJECT_TRYLOCK(m->object)) - continue; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 13:12:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 585CA16A4D0; Mon, 19 Jul 2004 13:12:33 +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 30A5516A4CE for ; Mon, 19 Jul 2004 13:12:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AA0643D3F for ; Mon, 19 Jul 2004 13:12:33 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6JDCWdo050931 for ; Mon, 19 Jul 2004 13:12:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6JDCWHl050928 for perforce@freebsd.org; Mon, 19 Jul 2004 13:12:32 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 19 Jul 2004 13:12:32 GMT Message-Id: <200407191312.i6JDCWHl050928@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 57699 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: Mon, 19 Jul 2004 13:12:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=57699 Change 57699 by davidxu@davidxu_alona on 2004/07/19 13:11:31 -O2 cleanup. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#4 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#4 (text+ko) ==== @@ -88,7 +88,7 @@ __asm __volatile("movq %%fs:%1, %0" \ : "=r" (__i) \ : "m" (*(u_long *)(__kcb_offset(name)))); \ - __result = *(__kcb_type(name) *)&__i; \ + __result = (__kcb_type(name))__i; \ \ __result; \ }) @@ -100,7 +100,7 @@ __kcb_type(name) __val = (val); \ \ u_long __i; \ - __i = *(u_long *)&__val; \ + __i = (u_long)(__val); \ __asm __volatile("movq %1,%%fs:%0" \ : "=m" (*(u_long *)(__kcb_offset(name))) \ : "r" (__i)); \ ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#4 (text+ko) ==== @@ -88,7 +88,7 @@ __asm __volatile("movl %%gs:%1, %0" \ : "=r" (__i) \ : "m" (*(u_int *)(__kcb_offset(name)))); \ - __result = *(__kcb_type(name) *)&__i; \ + __result = (__kcb_type(name))__i; \ \ __result; \ }) @@ -100,7 +100,7 @@ __kcb_type(name) __val = (val); \ \ u_int __i; \ - __i = *(u_int *)&__val; \ + __i = (u_int)(__val); \ __asm __volatile("movl %1,%%gs:%0" \ : "=m" (*(u_int *)(__kcb_offset(name))) \ : "r" (__i)); \ From owner-p4-projects@FreeBSD.ORG Mon Jul 19 21:26:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52A6916A4D0; Mon, 19 Jul 2004 21:26:58 +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 CA60616A4CE for ; Mon, 19 Jul 2004 21:26:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF18D43D3F for ; Mon, 19 Jul 2004 21:26:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6JLQvLI066274 for ; Mon, 19 Jul 2004 21:26:57 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6JLQnIm066271 for perforce@freebsd.org; Mon, 19 Jul 2004 21:26:49 GMT (envelope-from peter@freebsd.org) Date: Mon, 19 Jul 2004 21:26:49 GMT Message-Id: <200407192126.i6JLQnIm066271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57723 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: Mon, 19 Jul 2004 21:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=57723 Change 57723 by peter@peter_melody on 2004/07/19 21:26:40 IFC @57721 Affected files ... .. //depot/projects/hammer/MAINTAINERS#25 integrate .. //depot/projects/hammer/Makefile#21 integrate .. //depot/projects/hammer/bin/date/date.1#8 integrate .. //depot/projects/hammer/contrib/gdb/FREEBSD-deletelist#2 delete .. //depot/projects/hammer/contrib/smbfs/examples/dot.nsmbrc#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#31 integrate .. //depot/projects/hammer/etc/rc.d/gbde#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#6 integrate .. //depot/projects/hammer/include/proc_service.h#2 integrate .. //depot/projects/hammer/lib/Makefile#37 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#5 delete .. //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/arm/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/gen/fnmatch.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/frexp.c#1 branch .. //depot/projects/hammer/lib/libc/gen/glob.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/signbit.3#2 delete .. //depot/projects/hammer/lib/libc/gen/signbit.c#2 delete .. //depot/projects/hammer/lib/libc/gen/vis.3#6 integrate .. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/flt_rounds.c#1 branch .. //depot/projects/hammer/lib/libc/i386/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/flt_rounds.c#1 branch .. //depot/projects/hammer/lib/libc/ia64/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/powerpc/gen/makecontext.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/signalcontext.c#1 branch .. //depot/projects/hammer/lib/libc/regex/grot/Makefile#4 integrate .. //depot/projects/hammer/lib/libc/regex/grot/debug.c#2 integrate .. //depot/projects/hammer/lib/libc/regex/grot/limits.h#2 delete .. //depot/projects/hammer/lib/libc/regex/grot/stdlib.h#2 delete .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#27 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#18 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#2 integrate .. //depot/projects/hammer/lib/libthread_db/arch/alpha/libc_r_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/alpha/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/amd64/libc_r_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/amd64/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/i386/libc_r_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/i386/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/ia64/libc_r_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/ia64/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/sparc64/libc_r_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/arch/sparc64/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/include/thread_db.h#2 delete .. //depot/projects/hammer/lib/libthread_db/include/thread_db_int.h#2 delete .. //depot/projects/hammer/lib/libthread_db/libc_r_db.c#1 branch .. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#1 branch .. //depot/projects/hammer/lib/libthread_db/libpthread_db.h#1 branch .. //depot/projects/hammer/lib/libthread_db/libthr_db.c#1 branch .. //depot/projects/hammer/lib/libthread_db/pthread/Makefile#2 delete .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.c#2 delete .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.h#2 delete .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db_i386.c#2 delete .. //depot/projects/hammer/lib/libthread_db/src/Makefile#2 delete .. //depot/projects/hammer/lib/libthread_db/src/thread_db.c#2 delete .. //depot/projects/hammer/lib/libthread_db/thread_db.c#1 branch .. //depot/projects/hammer/lib/libthread_db/thread_db.h#1 branch .. //depot/projects/hammer/lib/libthread_db/thread_db_int.h#1 branch .. //depot/projects/hammer/lib/msun/Makefile#15 integrate .. //depot/projects/hammer/lib/msun/man/signbit.3#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#21 integrate .. //depot/projects/hammer/lib/msun/src/s_signbit.c#1 branch .. //depot/projects/hammer/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#2 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.8#6 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#6 integrate .. //depot/projects/hammer/share/man/man4/axe.4#5 integrate .. //depot/projects/hammer/share/man/man4/netgraph.4#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#31 integrate .. //depot/projects/hammer/share/man/man9/suser.9#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#32 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#18 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#24 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#46 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#11 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/hammer/sys/arm/include/float.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#55 integrate .. //depot/projects/hammer/sys/conf/options#47 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#38 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#10 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#26 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#11 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#18 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#8 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#38 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#46 integrate .. //depot/projects/hammer/sys/i386/include/float.h#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#31 integrate .. //depot/projects/hammer/sys/ia64/include/float.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/isa/psm.c#18 integrate .. //depot/projects/hammer/sys/kern/bus_if.m#6 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#59 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#23 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#40 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#24 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#17 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#34 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#35 integrate .. //depot/projects/hammer/sys/net/if.c#23 integrate .. //depot/projects/hammer/sys/net/netisr.c#6 integrate .. //depot/projects/hammer/sys/netatalk/at_control.c#6 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_subr.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#8 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#32 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#21 integrate .. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/fdcvar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/hammer/sys/powerpc/include/float.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#12 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#24 integrate .. //depot/projects/hammer/sys/sys/bus.h#12 integrate .. //depot/projects/hammer/sys/sys/malloc.h#8 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#26 integrate .. //depot/projects/hammer/sys/sys/mount.h#22 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#11 integrate .. //depot/projects/hammer/sys/sys/sched.h#11 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#28 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#18 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#31 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#17 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#30 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/regex/Makefile#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.c#2 integrate .. //depot/projects/hammer/tools/regression/netatalk/simple_send/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netatalk/simple_send/simple_send.c#1 branch .. //depot/projects/hammer/tools/regression/security/proc_to_proc/scenario.c#2 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#1 branch .. //depot/projects/hammer/usr.bin/apply/apply.1#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#20 integrate .. //depot/projects/hammer/usr.bin/finger/finger.1#5 integrate .. //depot/projects/hammer/usr.bin/fmt/fmt.1#2 integrate .. //depot/projects/hammer/usr.bin/hexdump/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/lam/lam.c#2 integrate .. //depot/projects/hammer/usr.bin/look/look.1#4 integrate .. //depot/projects/hammer/usr.bin/look/look.c#3 integrate .. //depot/projects/hammer/usr.bin/make/make.1#12 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#7 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#10 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#17 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#10 integrate .. //depot/projects/hammer/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/hammer/usr.bin/truss/extern.h#6 integrate .. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#7 integrate .. //depot/projects/hammer/usr.bin/truss/main.c#8 integrate .. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#5 integrate .. //depot/projects/hammer/usr.bin/truss/syscall.h#5 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#13 integrate .. //depot/projects/hammer/usr.bin/wall/wall.1#3 integrate .. //depot/projects/hammer/usr.bin/write/write.1#3 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.8#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/command.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/ipcp.c#6 integrate .. //depot/projects/hammer/usr.sbin/ppp/log.c#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/log.h#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#10 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#8 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.h#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#25 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.92 2004/07/02 19:40:36 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.95 2004/07/17 20:22:24 alfred Exp $ subsystem login notes ----------------------------- @@ -97,7 +97,10 @@ geom_nop pjd Pre-commit review requested. geom_stripe pjd Pre-commit review requested. sbin/geom pjd 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. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/Makefile#21 (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/hammer/bin/date/date.1#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.66 2004/07/03 00:03:25 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.67 2004/07/17 00:26:31 alfred Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -328,6 +328,14 @@ sets the time to .Li "2:32 PM" , without modifying the date. +.Pp +Finally the command: +.Pp +.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s""" +.Pp +can be used to parse the ouput from +.Nm +and express it in epoch time. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : ==== //depot/projects/hammer/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/hammer/etc/defaults/rc.conf#31 (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/hammer/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/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (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/hammer/gnu/usr.bin/tar/Makefile#6 (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/hammer/include/proc_service.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 David Xu + * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,18 +11,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * 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 REGENTS OR CONTRIBUTORS BE LIABLE + * 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) @@ -30,74 +24,42 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/proc_service.h,v 1.1 2004/07/15 03:43:18 davidxu Exp $ + * $FreeBSD: src/include/proc_service.h,v 1.2 2004/07/17 17:05:12 marcel Exp $ */ #ifndef _PROC_SERVICE_H_ -#define _PROC_SERVICE_H_ +#define _PROC_SERVICE_H_ #include #include -struct ps_prochandle; +typedef enum { + PS_OK = 0, /* No errors. */ + PS_ERR, /* Generic error. */ + PS_BADADDR, /* Bad address. */ + PS_BADLID, /* Bad LWP Id. */ + PS_BADPID, /* Bad process Id. */ + PS_NOFREGS, /* FPU register set not available. */ + PS_NOSYM /* Symbol not found. */ +} ps_err_e; -typedef enum -{ - PS_OK, - PS_ERR, - PS_BADPID, - PS_BADLID, - PS_BADADDR, - PS_NOSYM, - PS_NOFREGS -} ps_err_e; +struct ps_prochandle; /* Opaque type. Defined by the implementor. */ -/* - * Every program that links libthread_db must provide a set of process control - * primitives to access memory and registers in the target process, to start - * and to stop the target process, and to look up symbols in the target process. - */ +__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_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_lstop(struct ps_prochandle *, lwpid_t); +ps_err_e ps_pcontinue(struct ps_prochandle *); +ps_err_e ps_pdmodel(struct ps_prochandle *, int *); +ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, + psaddr_t *); +void ps_plog(const char *, ...); +ps_err_e ps_pread(struct ps_prochandle *, psaddr_t, void *, size_t); +ps_err_e ps_pstop(struct ps_prochandle *); +ps_err_e ps_pwrite(struct ps_prochandle *, psaddr_t, const void *, size_t); +__END_DECLS -#if 0 -ps_err_e ps_pdmodel(struct ps_prochandle *ph, int *data_model); -#endif -ps_err_e ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name, - const char *sym_name , psaddr_t *sym_addr); -#if 0 -ps_err_e ps_pglobal_sym(struct ps_prochandle *ph, const char *object_name, - const char *sym_name , ps_sym_t *sym); -ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -#endif -ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -ps_err_e ps_ptread(struct ps_prochandle *ph, psaddr_t addr, void *buf, - size_t size); -ps_err_e ps_ptwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf, - size_t size); -ps_err_e ps_pstop(struct ps_prochandle *ph); -ps_err_e ps_pcontinue(struct ps_prochandle *ph); -ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid); -ps_err_e ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid); -ps_err_e ps_lgetregs(struct ps_prochandle *ph, lwpid_t lwpid, - prgregset_t gregset); -ps_err_e ps_lsetregs(struct ps_prochandle *ph, lwpid_t lwpid, - const prgregset_t gregset); -ps_err_e ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lwpid, - prfpregset_t *fpregset); -ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lwpid, - const prfpregset_t *fpregset); -#if 0 -ps_err_e ps_pauxv(struct ps_prochandle *ph, const auxv_t **auxp); -ps_err_e ps_kill(struct ps_prochandle *ph, int sig); -ps_err_e ps_lrolltoaddr(struct ps_prochandle *ph, lwpid_t lwpid, - psaddr_t go_addr, psaddr_t stop_addr); -#endif -void ps_plog(const char *fmt, ...); -pid_t ps_getpid (struct ps_prochandle *ph); - -#endif +#endif /* _PROC_SERVICE_H_ */ ==== //depot/projects/hammer/lib/Makefile#37 (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.188 2004/07/19 12:20:10 grehan 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 @@ -93,7 +93,7 @@ _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBPTHREAD) +.if !defined(NOLIBPTHREAD) _libpthread= libpthread .endif @@ -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/hammer/lib/libc/alpha/gen/Makefile.inc#7 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.13 2004/07/09 03:32:39 das Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.14 2004/07/18 21:23:38 das Exp $ -SRCS+= _setjmp.S fabs.S frexp.c infinity.c ldexp.c modf.c setjmp.S +SRCS+= _setjmp.S fabs.S infinity.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ fpsetround.c fpsetsticky.c ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#15 (text+ko) ==== @@ -1,9 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.25 2004/07/09 03:32:39 das Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.27 2004/07/19 08:17:24 das Exp $ SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ - frexp.c infinity.c ldexp.c \ - makecontext.c signalcontext.c \ - fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ + infinity.c ldexp.c makecontext.c signalcontext.c \ + flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c ==== //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.2 2004/07/09 03:32:40 das Exp $ +# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.3 2004/07/18 21:23:38 das Exp $ -SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c frexp.c \ +SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c \ infinity.c ldexp.c makecontext.c modf.c \ setjmp.S signalcontext.c sigsetjmp.S divsi3.S ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.112 2004/07/09 03:32:40 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.114 2004/07/19 08:16:10 das Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -10,7 +10,7 @@ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \ exec.c fmtcheck.c fmtmsg.c fnmatch.c \ - fpclassify.c fstab.c ftok.c fts.c ftw.c \ + fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ @@ -25,8 +25,7 @@ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ setdomainname.c sethostname.c setjmperr.c setmode.c \ - setproctitle.c setprogname.c \ - siginterrupt.c siglist.c signal.c signbit.c \ + setproctitle.c setprogname.c siginterrupt.c siglist.c signal.c \ sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \ @@ -57,7 +56,7 @@ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_wait.3 \ setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ - siginterrupt.3 signal.3 signbit.3 sigsetops.3 sleep.3 \ + siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ==== //depot/projects/hammer/lib/libc/gen/fnmatch.3#6 (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/hammer/lib/libc/gen/glob.3#4 (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/hammer/lib/libc/gen/vis.3#6 (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/hammer/lib/libc/i386/gen/Makefile.inc#5 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.19 2004/07/09 03:32:40 das Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.21 2004/07/19 08:17:24 das Exp $ -SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \ - infinity.c ldexp.c makecontext.c modf.S \ +SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S \ + flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#7 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.9 2004/07/09 03:32:40 das Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.11 2004/07/19 08:17:24 das Exp $ SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ - fpgetmask.c fpgetround.c fpsetmask.c fpsetround.c frexp.c infinity.c \ + flt_rounds.c fpgetmask.c fpgetround.c fpsetmask.c \ + fpsetround.c infinity.c \ ldexp.c makecontext.c modf.c setjmp.S signalcontext.c sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() ==== //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.4 2004/07/09 03:32:40 das Exp $ +# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.6 2004/07/19 12:08:03 grehan Exp $ SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c frexp.c \ + fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \ infinity.c ldexp.c makecontext.c modf.c _setjmp.S \ - setjmp.S sigsetjmp.S syncicache.c + setjmp.S sigsetjmp.S signalcontext.c syncicache.c ==== //depot/projects/hammer/lib/libc/powerpc/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.1 2004/03/02 06:22:24 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.2 2004/07/19 12:05:07 grehan Exp $"); #include @@ -113,7 +113,7 @@ * Use caller-saved regs 14/15 to hold params that _ctx_start * will use to invoke the user-supplied func */ - mc->mc_lr = (uint32_t) _ctx_start; + mc->mc_srr0 = (uint32_t) _ctx_start; mc->mc_gpr[1] = (uint32_t) sp; /* new stack pointer */ mc->mc_gpr[14] = (uint32_t) start; /* r14 <- start */ mc->mc_gpr[15] = (uint32_t) ucp; /* r15 <- ucp */ ==== //depot/projects/hammer/lib/libc/regex/grot/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.2 2000/07/10 06:10:47 green Exp $ +# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.4 2004/07/19 08:48:17 tjr Exp $ # You probably want to take -DREDEBUG out of CFLAGS, and put something like # -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of # internal assertion checking). Take -Dconst= out for an ANSI compiler. @@ -24,7 +24,7 @@ HMISSING = SRCMISSING = split.c OBJMISSING = split.o -H = cclass.h cname.h regex2.h utils.h $(HMISSING) +H = cname.h regex2.h utils.h $(HMISSING) REGSRC = regcomp.c regerror.c regexec.c regfree.c engine.c SRC = $(REGSRC) debug.c main.c $(SRCMISSING) @@ -39,7 +39,7 @@ .SUFFIXES: .ih .h .c.ih: - ./mkh $(MKHFLAGS) -p $< >$@ + sh mkh $(MKHFLAGS) -p $< >$@ default: r @@ -48,14 +48,16 @@ o: $(OBJPRODN) -REGEXHSRC = regex2.h reg*.c +REGEXHSRC = ../regex2.h ../reg*.c h: $(REGEXHSRC) - ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp + sh mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h rm -f regex.tmp +regex.h: h + regcomp.o regexec.o regfree.o debug.o: utils.h regex.h regex2.h -regcomp.o: cclass.h cname.h regcomp.ih +regcomp.o: cname.h regcomp.ih regexec.o: engine.c engine.ih regerror.o: regerror.ih regerror.o: utils.h @@ -83,42 +85,14 @@ -time ./re -el &1 | egrep -v '$(JUNKLINT)' | tee lint -fullprint: - ti README WHATSNEW notes todo | hplist - ti *.h | hplist - hplist *.c - hplist regex.3 regex.7 - -print: - ti README WHATSNEW notes todo | hplist - ti *.h | hplist - hplist reg*.c engine.c - clean: tidy rm -f *.o *.s *.ih re tidy: - rm -f junk* core dtr regex.tmp lint + rm -f junk* core regex.tmp lint spotless: clean - rm -f mkh regex.h - -mkh: /usr/henry/bin/mkh - cp $? $@ - -DTRH = cclass.h cname.h regex2.h utils.h limits.h stdlib.h -DTR = README WHATSNEW Makefile Makefile.44bsd mkh regex.3 regex.7 tests $(DTRH) $(SRC) -dtr: $(DTR) - makedtr $(DTR) >$@ - -cio: $(DTR) - cio $(DTR) - -rdf: $(DTR) - rcsdiff -c $(DTR) 2>&1 | p + rm -f regex.h ==== //depot/projects/hammer/lib/libc/regex/grot/debug.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.3 2002/03/22 21:52:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.4 2004/07/19 08:28:53 tjr Exp $"); #include #include @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "utils.h" #include "regex2.h" @@ -26,10 +28,8 @@ int i; int c; int last; - int nincat[NC]; - fprintf(d, "%ld states, %d categories", (long)g->nstates, - g->ncategories); + fprintf(d, "%ld states", (long)g->nstates); fprintf(d, ", first %ld last %ld", (long)g->firststate, (long)g->laststate); if (g->iflags&USEBOL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 19 22:18:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B29C816A4D2; Mon, 19 Jul 2004 22:18:03 +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 5C57D16A4CE for ; Mon, 19 Jul 2004 22:18:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 513CC43D49 for ; Mon, 19 Jul 2004 22:18:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6JMI3oF067845 for ; Mon, 19 Jul 2004 22:18:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6JMI28R067842 for perforce@freebsd.org; Mon, 19 Jul 2004 22:18:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jul 2004 22:18:02 GMT Message-Id: <200407192218.i6JMI28R067842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57726 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: Mon, 19 Jul 2004 22:18:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=57726 Change 57726 by rwatson@rwatson_paprika on 2004/07/19 22:17:54 Integrate netperf_socket from FreeBSD CVS: Lots of VM locking. Adaptive mutexes now default. More kernel debugger cleanup. Preemption stability work around, as well as preemption cleanup. The usual array of quicks, device IDs, etc. Linux emulation raw socket cleanups. Quicksort in libkern. pf update and cleanup. More ACPI. Less /dev/random fandango. Sounds driver renaming. USB bug fixes. Cleanups of sched API to take threads not processes, etc. Cleanup of soreceive() control mbufs. Race fixup in unp_connect(). Start of netatalk style cleanup. ng_ppp locking hack removed due to ng_ppp qsort hack being removed. Mac_biba, mac_mls single/effective rename. M_SKIP_FIREWALL. SUSER_RUID. vm_contigmalloc() cleanup/replacement. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/netperf_socket/sys/amd64/include/float.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#29 integrate .. //depot/projects/netperf_socket/sys/conf/files#41 integrate .. //depot/projects/netperf_socket/sys/conf/options#21 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/netperf_socket/sys/i386/include/float.h#5 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/netperf_socket/sys/ia64/include/float.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/bus_if.m#2 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#34 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/netperf_socket/sys/libkern/qsort.c#3 integrate .. //depot/projects/netperf_socket/sys/libkern/qsort_r.c#1 branch .. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/modules/sound/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/sound/pcm/Makefile#2 delete .. //depot/projects/netperf_socket/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if.c#13 integrate .. //depot/projects/netperf_socket/sys/net/netisr.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#7 integrate .. //depot/projects/netperf_socket/sys/netatm/uni/unisig_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#5 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdc_cbus.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdcvar.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/netperf_socket/sys/powerpc/include/float.h#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/netperf_socket/sys/sys/bus.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/libkern.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/malloc.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#18 integrate .. //depot/projects/netperf_socket/sys/sys/resourcevar.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sched.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#7 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#9 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#10 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.80 2004/07/10 22:35:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.81 2004/07/19 16:37:47 jhb Exp $"); #include #include @@ -435,6 +435,8 @@ if ((ih->ih_flags & IH_FAST) != 0) { critical_enter(); ih->ih_handler(ih->ih_argument); + /* XXX */ + td->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); return; } ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#13 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.158 2004/07/15 18:00:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.162 2004/07/19 18:12:04 alc Exp $"); #include #include @@ -335,7 +335,6 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static int pmap_release_free_page(pmap_t pmap, vm_page_t p); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP @@ -551,8 +550,6 @@ cputype = hwrpb->rpb_type; return (cputype == ST_DEC_21000 || ST_DEC_4100); - - return 0; } /* @@ -753,8 +750,8 @@ return (pa); PMAP_LOCK(pmap); pte = pmap_lev3pte(pmap, va); - if (pte != NULL) - pa = alpha_ptob(ALPHA_PTE_TO_PFN(*pte)); + if (pte != NULL && pmap_pte_v(pte)) + pa = pmap_pte_pa(pte); PMAP_UNLOCK(pmap); return (pa); } @@ -769,18 +766,22 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pt_entry_t *pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pte = pmap_lev3pte(pmap, va); + if (pte != NULL && pmap_pte_v(pte) && + (*pte & pte_prot(pmap, prot)) == pte_prot(pmap, prot)) { + m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); vm_page_hold(m); - vm_page_unlock_queues(); } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } @@ -1022,25 +1023,16 @@ PMAP_LOCK_INIT(pmap); /* - * allocate object for the ptes - */ - if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUSERLEV3MAPS + NUSERLEV2MAPS + 1); - - /* * allocate the page directory page */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + while ((lev1pg = vm_page_alloc(NULL, NUSERLEV3MAPS + NUSERLEV2MAPS, VM_ALLOC_NOOBJ | + VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) + VM_WAIT; - vm_page_lock_queues(); - vm_page_flag_clear(lev1pg, PG_BUSY); - lev1pg->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(pmap->pm_pteobj); + pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); - pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); + if ((lev1pg->flags & PG_ZERO) == 0) + bzero(pmap->pm_lev1, PAGE_SIZE); /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) @@ -1060,74 +1052,6 @@ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } -static int -pmap_release_free_page(pmap_t pmap, vm_page_t p) -{ - pt_entry_t* pte; - pt_entry_t* l2map; - - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) - /* level 1 page table */ - pte = &pmap->pm_lev1[PTLEV1I]; - else if (p->pindex >= NUSERLEV3MAPS) - /* level 2 page table */ - pte = &pmap->pm_lev1[p->pindex - NUSERLEV3MAPS]; - else { - /* level 3 page table */ - pte = &pmap->pm_lev1[p->pindex >> ALPHA_PTSHIFT]; - l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(pte)); - pte = &l2map[p->pindex & ((1 << ALPHA_PTSHIFT) - 1)]; - } - - /* - * This code optimizes the case of freeing non-busy - * page-table pages. Those pages are zero now, and - * might as well be placed directly into the zero queue. - */ - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(p, FALSE, "pmaprl")) - return 0; - - vm_page_busy(p); - - /* - * Remove the page table page from the processes address space. - */ - *pte = 0; - pmap->pm_stats.resident_count--; - -#ifdef PMAP_DEBUG - if (p->hold_count) { - panic("pmap_release: freeing held page table page"); - } -#endif - /* - * Level1 pages need to have the kernel - * stuff cleared, so they can go into the zero queue also. - */ - if (p->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS) - bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); - - if (pmap->pm_ptphint == p) - pmap->pm_ptphint = NULL; - -#ifdef PMAP_DEBUG - { - u_long *lp = (u_long*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(p)); - u_long *ep = (u_long*) ((char*) lp + PAGE_SIZE); - for (; lp < ep; lp++) - if (*lp != 0) - panic("pmap_release_free_page: page not zero"); - } -#endif - - p->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(p); - vm_page_unlock_queues(); - return 1; -} - /* * this routine is called if the page table page is not * mapped correctly. @@ -1140,15 +1064,22 @@ pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; - int is_object_locked; /* * Find or fabricate a new pagetable page */ - if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj))) - VM_OBJECT_LOCK(pmap->pm_pteobj); - m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); + if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_WAIT; + + /* + * Indicate the need to retry. While waiting, the page table + * page may have been allocated. + */ + return (NULL); + } + if ((m->flags & PG_ZERO) == 0) + pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1174,9 +1105,15 @@ int l1index = ptepindex >> ALPHA_PTSHIFT; pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; pt_entry_t* l2map; - if (!pmap_pte_v(l1pte)) - _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); - else { + if (!pmap_pte_v(l1pte)) { + if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } + } else { vm_page_t l2page; l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); @@ -1193,13 +1130,6 @@ */ pmap->pm_ptphint = m; - vm_page_lock_queues(); - m->valid = VM_PAGE_BITS_ALL; - vm_page_wakeup(m); - vm_page_unlock_queues(); - if (!is_object_locked) - VM_OBJECT_UNLOCK(pmap->pm_pteobj); - return m; } @@ -1214,7 +1144,7 @@ * Calculate pagetable page index */ ptepindex = va >> (PAGE_SHIFT + ALPHA_PTSHIFT); - +retry: /* * Get the level2 entry */ @@ -1237,12 +1167,16 @@ pmap->pm_ptphint = m; } m->hold_count++; - return m; + } else { + /* + * Here if the pte page isn't mapped, or if it has been + * deallocated. + */ + m = _pmap_allocpte(pmap, ptepindex); + if (m == NULL) + goto retry; } - /* - * Here if the pte page isn't mapped, or if it has been deallocated. - */ - return _pmap_allocpte(pmap, ptepindex); + return (m); } @@ -1258,52 +1192,35 @@ void pmap_release(pmap_t pmap) { - vm_page_t p,n,lev1pg; - vm_object_t object = pmap->pm_pteobj; - int curgeneration; + vm_page_t lev1pg; + + KASSERT(pmap->pm_stats.resident_count == 0, + ("pmap_release: pmap resident count %ld != 0", + pmap->pm_stats.resident_count)); -#if defined(DIAGNOSTIC) - if (object->ref_count != 1) - panic("pmap_release: pteobj reference count != 1"); -#endif - - lev1pg = NULL; -retry: - curgeneration = object->generation; - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex >= NUSERLEV3MAPS) { - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex < NUSERLEV3MAPS) { - /* can this happen? maybe panic */ - goto retry; - } - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) { - lev1pg = p; - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } + lev1pg = PHYS_TO_VM_PAGE(pmap_pte_pa(&pmap->pm_lev1[PTLEV1I])); + KASSERT(lev1pg->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS, + ("pmap_release: PTLEV1I page has unexpected pindex %ld", + lev1pg->pindex)); - if (lev1pg && !pmap_release_free_page(pmap, lev1pg)) - goto retry; mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + + /* + * Level1 pages need to have the kernel + * stuff cleared, so they can go into the zero queue also. + */ + bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); + pmap->pm_lev1[PTLEV1I] = 0; + PMAP_LOCK_DESTROY(pmap); + + vm_page_lock_queues(); + lev1pg->wire_count--; + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(lev1pg); + vm_page_unlock_queues(); } /* @@ -1441,9 +1358,7 @@ { pv_entry_t pv; int rtval; - int s; - s = splvm(); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pmap == pv->pv_pmap && va == pv->pv_va) @@ -1468,7 +1383,6 @@ free_pv_entry(pv); } - splx(s); return rtval; } @@ -1479,11 +1393,8 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) { - - int s; pv_entry_t pv; - s = splvm(); pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; @@ -1494,7 +1405,6 @@ TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; vm_page_unlock_queues(); - splx(s); } /* @@ -1524,8 +1434,6 @@ } else { return pmap_unuse_pt(pmap, va, NULL); } - - return 0; } /* @@ -1550,8 +1458,6 @@ */ (void) pmap_remove_pte(pmap, ptq, va); pmap_invalidate_page(pmap, va); - - return; } /* @@ -1624,7 +1530,6 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; - int s; #if defined(PMAP_DIAGNOSTIC) /* @@ -1636,7 +1541,6 @@ } #endif - s = splvm(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); @@ -1673,8 +1577,6 @@ } vm_page_flag_clear(m, PG_WRITEABLE); - - splx(s); } /* @@ -1947,6 +1849,7 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { + retry: /* * Get the level 2 entry */ @@ -1967,6 +1870,8 @@ mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); + if (mpte == NULL) + goto retry; } } } else { @@ -2164,26 +2069,21 @@ { pv_entry_t pv; int loops = 0; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) return FALSE; - s = splvm(); - /* * Not found, check current mappings returning immediately if found. */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pv->pv_pmap == pmap) { - splx(s); return TRUE; } loops++; if (loops >= 16) break; } - splx(s); return (FALSE); } @@ -2226,7 +2126,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_quick(pmap, pv->pv_va); #endif if (!pmap_pte_v(pte)) panic("pmap_remove_pages: page on pm_pvlist has no pte\n"); @@ -2244,22 +2144,21 @@ m = PHYS_TO_VM_PAGE(pmap_pte_pa(&tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; if ((tpte & PG_FOW) == 0) if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2276,14 +2175,12 @@ pv_entry_t pv; pt_entry_t *pte; int changed; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || (!setem && bit == (PG_UWE|PG_KWE) && (m->flags & PG_WRITEABLE) == 0)) return; - s = splvm(); changed = 0; /* @@ -2326,7 +2223,6 @@ } if (!setem && bit == (PG_UWE|PG_KWE)) vm_page_flag_clear(m, PG_WRITEABLE); - splx(s); } /* ==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#5 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.171 2004/07/11 03:03:48 marcel Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.172 2004/07/18 09:03:11 maxim Exp $ machine alpha cpu EV4 @@ -170,7 +170,7 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -# Pseudo devices - the number indicates how many units to allocated. +# Pseudo devices. device random # Entropy device device loop # Network loopback device ether # Ethernet support ==== //depot/projects/netperf_socket/sys/alpha/include/pmap.h#8 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.32 2004/07/05 16:59:56 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.33 2004/07/19 18:12:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -169,7 +169,6 @@ struct pmap { struct mtx pm_mtx; pt_entry_t *pm_lev1; /* KVA of lev0map */ - vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ u_int32_t pm_active; /* active cpus */ struct { ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.7 2004/07/02 20:21:41 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $ */ /* @@ -204,6 +204,8 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + /* XXX */ + td->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); } else { /* ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.412 2004/07/11 03:09:53 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.415 2004/07/18 15:59:03 scottl Exp $ machine amd64 cpu HAMMER @@ -28,7 +28,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler -options ADAPTIVE_MUTEXES # mutexes first spin lock, then sleep options INET # InterNETworking options INET6 # IPv6 communications protocols options FFS # Berkeley Fast Filesystem @@ -80,10 +79,6 @@ device isa device pci - -# Sound (no modules) -device pcm - # Floppy drives device fdc @@ -229,7 +224,7 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. -# Pseudo devices - the number indicates how many units to allocate. +# Pseudo devices. device random # Entropy device device loop # Network loopback device ether # Ethernet support ==== //depot/projects/netperf_socket/sys/amd64/include/float.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.13 2004/07/08 01:32:25 peter Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.14 2004/07/19 08:17:24 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -35,8 +35,12 @@ #include +__BEGIN_DECLS +extern int __flt_rounds(void); +__END_DECLS + #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ ==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#3 (text+ko) ==== @@ -30,8 +30,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.2 2004/07/12 21:25:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.3 2004/07/19 12:26:44 cognet Exp $"); #include +#include #include @@ -103,7 +104,7 @@ boolean_t trace_thread = FALSE; int scp_offset; - if (kdb_frame == NULL) + if (kdb_frame == NULL && !have_addr) return; while ((c = *cp++) != 0) { if (c == 'u') @@ -152,11 +153,7 @@ * In theory, the SCP isn't guaranteed to be in the function * that generated the stack frame. We hope for the best. */ -#ifdef __PROG26 - scp = frame[FR_SCP] & R15_PC; -#else scp = frame[FR_SCP]; -#endif db_printsym(scp, DB_STGY_PROC); db_printf("\n\t"); @@ -248,12 +245,18 @@ int db_trace_thread(struct thread *thr, int count) { + uint32_t addr; - db_stack_trace_cmd((db_expr_t)__builtin_frame_address(0), 1, -1, NULL); + if (thr == curthread) + addr = (uint32_t)__builtin_frame_address(0); + else + addr = thr->td_pcb->un_32.pcb32_r11; + db_stack_trace_cmd(addr, 1, -1, NULL); return (0); } void db_trace_self(void) { + db_trace_thread(curthread, -1); } ==== //depot/projects/netperf_socket/sys/arm/include/float.h#2 (text+ko) ==== @@ -31,15 +31,15 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/arm/include/float.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/float.h,v 1.3 2004/07/19 08:24:04 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ -#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ +#define FLT_ROUNDS (-1) /* indeterminate */ +#define FLT_EVAL_METHOD (-1) /* XXX */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ #define FLT_MANT_DIG 24 /* p */ ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#9 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.82 2004/07/08 22:35:34 brian Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.83 2004/07/16 07:24:20 tanimura Exp $ ############################################################## ### Basic configuration options ############################ @@ -255,7 +255,7 @@ ### Sound modules ########################################## ############################################################## -snd_pcm_load="NO" # Digital sound subsystem +sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 snd_cmi_load="NO" # cmi snd_csa_load="NO" # csa ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.168 2004/05/02 19:24:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.169 2004/07/18 05:39:14 sanpei Exp $"); #ifdef _KERNEL #include "opt_hw_wdog.h" @@ -294,6 +294,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "NEUROS", "dig. audio comp.", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * SEAGRAND NP-900 MP3 Player + * PR: kern/64563 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SEAGRAND", "NP-900*", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.17 2004/03/21 01:22:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.18 2004/07/16 20:53:00 obrien Exp $"); #include "opt_compat.h" @@ -150,7 +150,7 @@ NULL, "/usr/libexec/ld-elf.so.1", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 20 01:08:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA2FF16A4D0; Tue, 20 Jul 2004 01:08:33 +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 7A99D16A4CE for ; Tue, 20 Jul 2004 01:08:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 737CA43D39 for ; Tue, 20 Jul 2004 01:08:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K18X90072715 for ; Tue, 20 Jul 2004 01:08:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K18XHK072712 for perforce@freebsd.org; Tue, 20 Jul 2004 01:08:33 GMT (envelope-from wsalamon@computer.org) Date: Tue, 20 Jul 2004 01:08:33 GMT Message-Id: <200407200108.i6K18XHK072712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57736 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: Tue, 20 Jul 2004 01:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=57736 Change 57736 by wsalamon@wsalamon_epi on 2004/07/20 01:07:55 Create a simple Makefile for audit and auditd. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#3 (text+ko) ==== @@ -6,6 +6,8 @@ CFILES = audit.c +all: $(NAME) + install-man-page: install -d $(DSTROOT)/usr/share/man/man1 install -c -m 444 audit.1 $(DSTROOT)/usr/share/man/man1/audit.1 ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#3 (text+ko) ==== @@ -2,10 +2,12 @@ # Makefile for the audit command. # -NAME = audit +NAME = auditd CFILES = auditd.c audit_warn.c auditd.h +all: $(NAME) + install-man-page: install -d $(DSTROOT)/usr/share/man/man1 install -c -m 444 auditd.8 $(DSTROOT)/usr/share/man/man1/auditd.8 From owner-p4-projects@FreeBSD.ORG Tue Jul 20 05:34:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAF5C16A4D0; Tue, 20 Jul 2004 05:34:04 +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 6D43C16A4CE for ; Tue, 20 Jul 2004 05:34:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5066043D5A for ; Tue, 20 Jul 2004 05:34:04 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K5Y4WV080591 for ; Tue, 20 Jul 2004 05:34:04 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K5Y4iw080588 for perforce@freebsd.org; Tue, 20 Jul 2004 05:34:04 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 20 Jul 2004 05:34:04 GMT Message-Id: <200407200534.i6K5Y4iw080588@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 57760 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: Tue, 20 Jul 2004 05:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=57760 Change 57760 by davidxu@davidxu_celeron on 2004/07/20 05:33:14 Introduce a debug flag TDMF_NOUPCALL, this bit is used to inhibit kernel from scheduling upcall. When a thread hits a breakpoint or gets a step trap, we don't unbind the thread, let debug resume only the thread and single step it to pass breakpoint. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#10 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#6 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#10 (text+ko) ==== @@ -150,26 +150,31 @@ error = set_mcontext(td, &tmbx.tm_context.uc_mcontext); if (!error) { suword32(&uap->tmbx->tm_lwp, td->td_tid); - if (uap->flags & KSE_SWITCHIN_SETTMBX) { - td->td_mailbox = uap->tmbx; - mtx_lock_spin(&sched_lock); - td->td_flags |= TDF_CAN_UNBIND; - mtx_unlock_spin(&sched_lock); - } + if (td->td_proc->p_flag & P_TRACED) { if (tmbx.tm_dflags & TMDF_SSTEP) ptrace_single_step(td); else ptrace_clear_single_step(td); - if (tmbx.tm_dflags & TMDF_DONOTRUNUSER) { + + if (tmbx.tm_dflags & TMDF_NOUPCALL) { + td->td_mailbox = NULL; + goto out; + } else if (tmbx.tm_dflags & TMDF_DONOTRUNUSER) { mtx_lock_spin(&sched_lock); - /* fuword can block, check again */ - if (td->td_upcall) - ku->ku_flags |= KUF_DOUPCALL; + ku->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); } } + + if (uap->flags & KSE_SWITCHIN_SETTMBX) { + td->td_mailbox = uap->tmbx; + mtx_lock_spin(&sched_lock); + td->td_flags |= TDF_CAN_UNBIND; + mtx_unlock_spin(&sched_lock); + } } +out: return ((error == 0) ? EJUSTRETURN : error); } @@ -946,6 +951,7 @@ cpu_set_upcall(td2, td); /* Let the new thread become owner of the upcall */ ku->ku_owner = td2; + ku->ku_mflags = 0; td2->td_upcall = ku; td2->td_flags = 0; td2->td_pflags = TDP_SA|TDP_UPCALLING; @@ -1079,20 +1085,21 @@ if (flags & TMF_NOUPCALL) { td->td_mailbox = NULL; } else { - td->td_mailbox = tmbx; - mtx_lock_spin(&sched_lock); - td->td_flags |= TDF_CAN_UNBIND; - mtx_unlock_spin(&sched_lock); if (__predict_false(p->p_flag & P_TRACED)) { flags = fuword32(&tmbx->tm_dflags); - if (flags & TMDF_DONOTRUNUSER) { + if (flags & TMDF_NOUPCALL) { + td->td_mailbox = NULL; + return; + } else if (flags & TMDF_DONOTRUNUSER) { mtx_lock_spin(&sched_lock); - /* fuword can block, check again */ - if (td->td_upcall) - ku->ku_flags |= KUF_DOUPCALL; + ku->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); } } + td->td_mailbox = tmbx; + mtx_lock_spin(&sched_lock); + td->td_flags |= TDF_CAN_UNBIND; + mtx_unlock_spin(&sched_lock); } } } ==== //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#6 (text+ko) ==== @@ -102,6 +102,7 @@ /* These flags are kept in tm_dlfags */ #define TMDF_SSTEP 0x01 #define TMDF_DONOTRUNUSER 0x02 +#define TMDF_NOUPCALL 0x04 /* Flags for kse_switchin */ #define KSE_SWITCHIN_SETTMBX 0x01 From owner-p4-projects@FreeBSD.ORG Tue Jul 20 05:55:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F30FA16A4D0; Tue, 20 Jul 2004 05:55:29 +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 C953016A4CE for ; Tue, 20 Jul 2004 05:55:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C356543D39 for ; Tue, 20 Jul 2004 05:55:29 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K5tTVD081632 for ; Tue, 20 Jul 2004 05:55:29 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K5tT4V081629 for perforce@freebsd.org; Tue, 20 Jul 2004 05:55:29 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 20 Jul 2004 05:55:29 GMT Message-Id: <200407200555.i6K5tT4V081629@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 57761 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: Tue, 20 Jul 2004 05:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=57761 Change 57761 by davidxu@davidxu_celeron on 2004/07/20 05:55:12 If step > 1, turn on TMDF_NOUPCALL to hard bind the thread, debugger should know what it is doing. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#11 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#11 (text+ko) ==== @@ -935,6 +935,12 @@ /* Clear or set single step flag in thread mailbox */ tmp = step ? TMDF_SSTEP : 0; + /* + * Debug not only wants to step the thread, but also wants to + * single step it. + */ + if (step > 1) + tmp |= TMDF_NOUPCALL; ret = ps_pwrite(ta->ph, tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_dflags), &tmp, sizeof(tmp)); if (ret != 0) From owner-p4-projects@FreeBSD.ORG Tue Jul 20 05:59:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7063916A4D0; Tue, 20 Jul 2004 05:59:35 +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 3618616A4CE for ; Tue, 20 Jul 2004 05:59:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3098443D39 for ; Tue, 20 Jul 2004 05:59:35 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K5xZic081705 for ; Tue, 20 Jul 2004 05:59:35 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K5xYLF081702 for perforce@freebsd.org; Tue, 20 Jul 2004 05:59:34 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 20 Jul 2004 05:59:34 GMT Message-Id: <200407200559.i6K5xYLF081702@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 57762 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: Tue, 20 Jul 2004 05:59:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=57762 Change 57762 by davidxu@davidxu_celeron on 2004/07/20 05:59:16 Pass a value greater than 1 to td_thr_sstep if we are single stepping the thread. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#15 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#15 (text+ko) ==== @@ -425,7 +425,7 @@ * when the thread switches back, kse_switchin restores the single step * state. */ - ret = td_thr_sstep_p (&th, step); + ret = td_thr_sstep_p (&th, resume_all ? step : 2); if (ret) error (thread_db_err_str (ret)); ret = td_thr_get_info_p (&th, &ti); From owner-p4-projects@FreeBSD.ORG Tue Jul 20 06:59:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FF0016A4D0; Tue, 20 Jul 2004 06:59:49 +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 1216216A4CE for ; Tue, 20 Jul 2004 06:59:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D39143D49 for ; Tue, 20 Jul 2004 06:59:49 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K6xmhJ083298 for ; Tue, 20 Jul 2004 06:59:48 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K6xmj5083295 for perforce@freebsd.org; Tue, 20 Jul 2004 06:59:48 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 20 Jul 2004 06:59:48 GMT Message-Id: <200407200659.i6K6xmj5083295@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 57766 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: Tue, 20 Jul 2004 06:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=57766 Change 57766 by davidxu@davidxu_celeron on 2004/07/20 06:59:46 Always set and unset TMDF_DONOTRUNUSER flag even if it is a system scope thread, so you can retrieve suspension status from td_thr_getinfo. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#12 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#12 (text+ko) ==== @@ -854,7 +854,8 @@ ret = ps_lstop(ta->ph, lwp); else ret = ps_lcontinue(ta->ph, lwp); - return (P2T(ret)); + if (ret) + return (P2T(ret)); } ret = ps_pread(ta->ph, From owner-p4-projects@FreeBSD.ORG Tue Jul 20 07:57:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6EDA16A4D0; Tue, 20 Jul 2004 07:57:00 +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 84EDB16A4CE for ; Tue, 20 Jul 2004 07:57:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67EAB43D5C for ; Tue, 20 Jul 2004 07:57:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K7v0pK085404 for ; Tue, 20 Jul 2004 07:57:00 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K7v034085399 for perforce@freebsd.org; Tue, 20 Jul 2004 07:57:00 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 20 Jul 2004 07:57:00 GMT Message-Id: <200407200757.i6K7v034085399@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 57771 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: Tue, 20 Jul 2004 07:57:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=57771 Change 57771 by davidxu@davidxu_celeron on 2004/07/20 07:56:28 Don't forget to unbind the temporarily bound thread. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#16 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#16 (text+ko) ==== @@ -72,6 +72,8 @@ /* The last thread we are single stepping */ static lwpid_t last_single_step_lwp; +static ptid_t last_single_step_ptid; + /* Pointers to the libthread_db functions. */ static td_err_e (*td_init_p) (void); @@ -115,6 +117,7 @@ /* Prototypes for local functions. */ static void fbsd_thread_find_new_threads (void); +static int fbsd_thread_alive (ptid_t ptid); /* Building process ids. */ @@ -409,6 +412,26 @@ work_ptid = inferior_ptid; } + /* + * For KSE thread, if last time we were single stepping + * a thread, first we unbind thread because we had bound it, + * may rebind it in following code. + */ + if (!ptid_equal(last_single_step_ptid, null_ptid)) + { + ret = td_ta_map_id2thr_p (thread_agent, + GET_THREAD(last_single_step_ptid), &th); + if (ret == TD_OK) + { + /* + * keep stepping flag (may be cleared in following code), + * but unbind the thread + */ + td_thr_sstep_p (&th, 1); + } + last_single_step_ptid = null_ptid; + } + lwp = GET_LWP (work_ptid); if (lwp == 0) { @@ -418,13 +441,13 @@ error (thread_db_err_str (ret)); /* - * For M:N thread, we need to tell UTS to set/unset single step + * For KSE thread, we need to tell UTS to set/unset single step * flag at context switch time, the flag will be written into * thread mailbox. This becauses some architecture may not have * machine single step flag in ucontext, so we put the flag in mailbox, * when the thread switches back, kse_switchin restores the single step * state. - */ + */ ret = td_thr_sstep_p (&th, resume_all ? step : 2); if (ret) error (thread_db_err_str (ret)); @@ -432,6 +455,8 @@ if (ret) error (thread_db_err_str (ret)); lwp = ti.ti_lid; + if (!resume_all) + last_single_step_ptid = work_ptid; } if (!resume_all && lwp == 0) @@ -457,6 +482,14 @@ free (lwps); } + /* + * FIX ME! if we can let PT_CONTINUE continue a single lwp, + * we needn't to iterate through lwp list to suspend/resume them, + * we just let the lwp run, this frees PT_SUSPEND PT_RESUME to user, + * so td_thr_dbsuspend/resume can be used to suspend or resume + * thread by user on command line... + */ + int i; if (last_single_step_lwp != 0) { @@ -483,10 +516,9 @@ last_single_step_lwp = 0; free (lwps); -/* ret = ptrace(PT_RESUME, lwp, 0, 0); */ /* now continue the process, suspended thread wont run */ - if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1, + if (ptrace (PT_CONTINUE, proc_handle.pid, (caddr_t)1, target_signal_to_host(signo))) perror_with_name ("PT_CONTINUE"); } From owner-p4-projects@FreeBSD.ORG Tue Jul 20 23:42:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E16D16A4D0; Tue, 20 Jul 2004 23:42:34 +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 3445516A4CE for ; Tue, 20 Jul 2004 23:42:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AFB943D46 for ; Tue, 20 Jul 2004 23:42:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6KNgYKN023184 for ; Tue, 20 Jul 2004 23:42:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6KNgREY023181 for perforce@freebsd.org; Tue, 20 Jul 2004 23:42:27 GMT (envelope-from peter@freebsd.org) Date: Tue, 20 Jul 2004 23:42:27 GMT Message-Id: <200407202342.i6KNgREY023181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57808 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: Tue, 20 Jul 2004 23:42:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=57808 Change 57808 by peter@peter_melody on 2004/07/20 23:42:13 IFC @57807 Affected files ... .. //depot/projects/hammer/bin/cat/cat.c#5 integrate .. //depot/projects/hammer/bin/df/df.1#9 integrate .. //depot/projects/hammer/bin/df/df.c#18 integrate .. //depot/projects/hammer/bin/ps/print.c#14 integrate .. //depot/projects/hammer/contrib/ntp/COPYRIGHT#3 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog-4.1.0#2 integrate .. //depot/projects/hammer/contrib/ntp/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/NEWS#3 integrate .. //depot/projects/hammer/contrib/ntp/README#2 integrate .. //depot/projects/hammer/contrib/ntp/README.bk#2 integrate .. //depot/projects/hammer/contrib/ntp/README.cvs#3 delete .. //depot/projects/hammer/contrib/ntp/README.des#2 delete .. //depot/projects/hammer/contrib/ntp/README.hackers#2 integrate .. //depot/projects/hammer/contrib/ntp/README.patches#1 branch .. //depot/projects/hammer/contrib/ntp/README.rsa#3 delete .. //depot/projects/hammer/contrib/ntp/TODO#2 integrate .. //depot/projects/hammer/contrib/ntp/acconfig.h#3 delete .. //depot/projects/hammer/contrib/ntp/acinclude.m4#3 integrate .. //depot/projects/hammer/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/hammer/contrib/ntp/adjtimed/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/arlib/COPYING#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/INSTALL#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/Makefile.am#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/Makefile.in#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/README#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/UNSHAR.HDR#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/arlib.3#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/arlib.c#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/arlib.h#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/arplib.h#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/configure#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/configure.in#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/depcomp#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/install-sh#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/missing#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/ntp/arlib/sample.c#1 branch .. //depot/projects/hammer/contrib/ntp/build#2 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/compile#1 branch .. //depot/projects/hammer/contrib/ntp/conf/README#2 integrate .. //depot/projects/hammer/contrib/ntp/conf/baldwin.conf#2 integrate .. //depot/projects/hammer/contrib/ntp/conf/dewey.conf#2 delete .. //depot/projects/hammer/contrib/ntp/conf/grundoon.conf#2 integrate .. //depot/projects/hammer/contrib/ntp/conf/malarky.conf#2 integrate .. //depot/projects/hammer/contrib/ntp/conf/pogo.conf#2 integrate .. //depot/projects/hammer/contrib/ntp/conf/rackety.conf#2 integrate .. //depot/projects/hammer/contrib/ntp/config.guess#3 integrate .. //depot/projects/hammer/contrib/ntp/config.h.in#3 integrate .. //depot/projects/hammer/contrib/ntp/config.sub#3 integrate .. //depot/projects/hammer/contrib/ntp/configure#3 integrate .. //depot/projects/hammer/contrib/ntp/configure.in#3 integrate .. //depot/projects/hammer/contrib/ntp/depcomp#3 integrate .. //depot/projects/hammer/contrib/ntp/flock-build#3 integrate .. //depot/projects/hammer/contrib/ntp/html/Oncore-SHMEM.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/accopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/accopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/assoc.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/assoc.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/audio.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/audio.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/authopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/authopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/biblio.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/build.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/build.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/clockopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/clockopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/config.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/config.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/confopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/confopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/copyright.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/copyright.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/debug.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/debug.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/driver1.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver10.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver11.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver12.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver16.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver18.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver19.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver2.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver20.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver22.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver23.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver24.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver26.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver27.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver28.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver29.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver3.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver30.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver32.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver33.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver34.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver35.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver36.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver37.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver38.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver39.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver4.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver40.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver42.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver43.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver44.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver5.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver6.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver7.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver8.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/driver9.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/drivers/driver1.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver10.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver11.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver12.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver16.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver18.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver19.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver2.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver20.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver22.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver23.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver24.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver26.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver27.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver28.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver29.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver3.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver30.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver32.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver33.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver34.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver35.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver36.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver37.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver38.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver39.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver4.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver40.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver42.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver43.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver44.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver5.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver6.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver7.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver8.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver9.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/icons/home.gif#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/icons/mail2.gif#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/oncore-shmem.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/exec.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/extern.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/extern.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/gadget.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/genkeys.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints/netbsd#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints/sco.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/sco.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints/solaris-dosynctodr.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/hints/vxworks.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/vxworks.html#3 integrate .. //depot/projects/hammer/contrib/ntp/html/hints/winnt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/winnt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/howto.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/howto.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/htmlprimer.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/icons/home.gif#1 branch .. //depot/projects/hammer/contrib/ntp/html/icons/mail2.gif#1 branch .. //depot/projects/hammer/contrib/ntp/html/index.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/index.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/kern.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/kern.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/kernpps.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/keygen.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ldisc.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ldisc.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/leap.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/manyopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/measure.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/measure.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/miscopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/miscopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/monopt.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/monopt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/msyslog.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/mx4200data.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/mx4200data.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/notes.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/notes.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpd.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntpd.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpdate.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntpdate.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpdc.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntpdc.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpdsim.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpq.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntpq.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntptime.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntptime.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntptrace.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/ntptrace.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/parsedata.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/parsedata.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/parsenew.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/parsenew.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/patches.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/patches.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/porting.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/porting.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/pps.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/pps.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/prefer.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/prefer.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/qth.htm#3 delete .. //depot/projects/hammer/contrib/ntp/html/quick.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/quick.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/rdebug.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/rdebug.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/refclock.htm#3 delete .. //depot/projects/hammer/contrib/ntp/html/refclock.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/release.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/release.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/footer.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links10.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links11.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links12.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links7.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links8.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/links9.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/scripts/style.css#1 branch .. //depot/projects/hammer/contrib/ntp/html/sntp.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/tickadj.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/tickadj.html#1 branch .. //depot/projects/hammer/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/audio.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/app.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/assertions.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/boolean.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/error.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/formatcheck.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/int.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/interfaceiter.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/ipv6.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/lang.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/lib.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/list.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/magic.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/mem.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/msgcat.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/msgs.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/mutex.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/net.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/netaddr.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/offset.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/once.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/platform.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/print.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/result.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/sockaddr.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/strerror.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/string.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/types.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/util.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/l_stdlib.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/md5.h#2 delete .. //depot/projects/hammer/contrib/ntp/include/ntp.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_if.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_io.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_machine.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_md5.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_request.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_rfc2553.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/ntp_sprintf.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_unixtime.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntpsim.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/rsa_md5.h#1 branch .. //depot/projects/hammer/contrib/ntp/install-sh#3 integrate .. //depot/projects/hammer/contrib/ntp/kernel/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/tt560_api.h#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/assertions.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/error.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/ifiter_ioctl.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/ifiter_sysctl.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/inet_ntop.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/interfaceiter.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/isc_strerror.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/lib.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/mem.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/msgcat.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/net.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/strerror.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/adjtime.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/authencrypt.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/authkeys.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/authparity.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/authreadkeys.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/authusekey.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/binio.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/clocktypes.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/dofptoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/fptoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/fptoms.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/ieee754io.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/iosignal.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/log.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/machines.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/md5c.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/memmove.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/mfptoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/mfptoms.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/mktime.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/msyslog.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/netof.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/ntp_rfc2553.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/refnumtoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/snprintf.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/socktoa.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/socktohost.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/strerror.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/strstr.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/systime_s.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/librsaref/Makefile.am#3 delete .. //depot/projects/hammer/contrib/ntp/librsaref/Makefile.in#3 delete .. //depot/projects/hammer/contrib/ntp/missing#3 integrate .. //depot/projects/hammer/contrib/ntp/mkinstalldirs#3 integrate .. //depot/projects/hammer/contrib/ntp/ntp_update#2 delete .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/check_y2k.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_config.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_control.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_intres.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_io.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_loopfilter.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_proto.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_request.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_timer.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntpsim.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_as2201.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_chronolog.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_chu.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_conf.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_local.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_oncore.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_pcf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_tpro.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_trak.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_true.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_usno.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.h#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/layout.std#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/nl.pl#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/nl.pl.in#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/nl_in.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-layout.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc_ops.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq_ops.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntptrace/Makefile.am#3 delete .. //depot/projects/hammer/contrib/ntp/ntptrace/Makefile.in#3 delete .. //depot/projects/hammer/contrib/ntp/ntptrace/README#2 delete .. //depot/projects/hammer/contrib/ntp/ntptrace/ntptrace.c#3 delete .. //depot/projects/hammer/contrib/ntp/ntptrace/ntptrace.h#2 delete .. //depot/projects/hammer/contrib/ntp/parseutil/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/dcfd.c#3 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/scripts/ntptrace.in#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/Makefile.am#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/Makefile.in#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/README#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/config.guess#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/config.sub#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/configure#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/configure.ac#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/depcomp#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/header.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/install-sh#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/internet.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/internet.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/kludges.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/main.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/missing#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/socket.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/timing.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/unix.c#1 branch .. //depot/projects/hammer/contrib/ntp/stamp-h.in#2 delete .. //depot/projects/hammer/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/util/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/ntp/util/README#2 integrate .. //depot/projects/hammer/contrib/ntp/util/audio-pcm.c#1 branch .. //depot/projects/hammer/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/ntp-genkeys.c#3 delete .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen.c#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/pps-api.c#1 branch .. //depot/projects/hammer/contrib/ntp/util/sht.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/tickadj.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/timetrim.c#2 integrate .. //depot/projects/hammer/contrib/ntp/version#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#24 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#15 integrate .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/powerpc/stdlib/gdtoa.mk#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/fputwc.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#8 integrate .. //depot/projects/hammer/lib/libc/sys/statfs.2#5 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.help#2 integrate .. //depot/projects/hammer/share/man/man4/netgraph.4#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#94 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#43 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#2 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/arm/include/profile.h#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate .. //depot/projects/hammer/sys/boot/efi/loader/Makefile#4 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#16 integrate .. //depot/projects/hammer/sys/conf/NOTES#56 integrate .. //depot/projects/hammer/sys/conf/options#48 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#25 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#27 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#18 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#20 integrate .. //depot/projects/hammer/sys/net/if_clone.c#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#6 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/hammer/sys/powerpc/include/float.h#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#19 integrate .. //depot/projects/hammer/tools/regression/pipe/pipe-fstatbug.c#1 branch .. //depot/projects/hammer/usr.bin/make/cond.c#8 integrate .. //depot/projects/hammer/usr.bin/make/make.h#4 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#12 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/arlib/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/ntp/config.h#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/ntp-genkeys.8#5 delete .. //depot/projects/hammer/usr.sbin/ntp/libntp/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntp-genkeys/Makefile#3 delete .. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdate/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntptrace/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/scripts/mkver#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/scripts/ntptrace#1 branch .. //depot/projects/hammer/usr.sbin/ntp/sntp/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/ppp/physical.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#9 integrate Differences ... ==== //depot/projects/hammer/bin/cat/cat.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.30 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.31 2004/07/20 05:47:06 tjr Exp $"); #include #include @@ -298,11 +298,11 @@ switch(flags & O_ACCMODE) { case O_RDONLY: if (shutdown(fd, SHUT_WR) == -1) - perror("cat"); + warn(NULL); break; case O_WRONLY: if (shutdown(fd, SHUT_RD) == -1) - perror("cat"); + warn(NULL); break; default: break; ==== //depot/projects/hammer/bin/df/df.1#9 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.35 2004/07/02 21:04:17 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.36 2004/07/20 18:24:47 csjp Exp $ .\" .Dd April 22, 2004 .Dt DF 1 @@ -149,7 +149,9 @@ .Sh BUGS The .Fl n -flag is ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. Also, if a mount +point is not accessible by the user, it is possible that the file system +information could be stale. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/hammer/bin/df/df.c#18 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.62 2004/06/04 09:30:51 das Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.63 2004/07/20 18:24:47 csjp Exp $"); #include #include @@ -298,7 +298,7 @@ static size_t regetmntinfo(struct statfs **mntbufp, long mntsize, const char **vfslist) { - int i, j; + int error, i, j; struct statfs *mntbuf; if (vfslist == NULL) @@ -308,10 +308,20 @@ for (j = 0, i = 0; i < mntsize; i++) { if (checkvfsname(mntbuf[i].f_fstypename, vfslist)) continue; - if (!nflag) - (void)statfs(mntbuf[i].f_mntonname,&mntbuf[j]); - else if (i != j) - mntbuf[j] = mntbuf[i]; + /* + * XXX statfs(2) can fail for various reasons. It may be + * possible that the user does not have access to the + * pathname, if this happens, we will fall back on + * "stale" filesystem statistics. + */ + error = statfs(mntbuf[i].f_mntonname, &mntbuf[j]); + if (nflag || error < 0) + if (i != j) { + if (error < 0) + warnx("%s stats possibly stale", + mntbuf[i].f_mntonname); + mntbuf[j] = mntbuf[i]; + } j++; } return (j); ==== //depot/projects/hammer/bin/ps/print.c#14 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); #include #include @@ -785,7 +785,7 @@ v = ve->var; string = NULL; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); goto out; } error = mac_get_pid(k->ki_p->ki_pid, proclabel); @@ -811,7 +811,7 @@ int error, size = 0; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); return (0); } error = mac_get_pid(k->ki_p->ki_pid, proclabel); ==== //depot/projects/hammer/contrib/ntp/COPYRIGHT#3 (text+ko) ==== @@ -1,17 +1,19 @@ -This file is automatically generated from html/copyright.htm +This file is automatically generated from html/copyright.html Copyright Notice - - [sheepb.jpg] "Clone me," says Dolly sheepishly + + jpg "Clone me," says Dolly sheepishly + + Last update: 15:44 UTC Tuesday, July 15, 2003 _________________________________________________________________ - + The following copyright notice applies to all files collectively called the Network Time Protocol Version 4 Distribution. Unless specifically declared otherwise in an individual file, this notice applies as if the text was explicitly included in the file. *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2001 * +* Copyright (c) David L. Mills 1992-2003 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose and without fee is hereby * @@ -30,144 +32,145 @@ The following individuals contributed in part to the Network Time Protocol Distribution Version 4 and are acknowledged as authors of this work. - 1. [1]Mark Andrews Leitch atomic clock + 1. [1]Mark Andrews Leitch atomic clock controller 2. [2]Bernd Altmeier hopf Elektronik serial line and PCI-bus devices 3. [3]Viraj Bais and [4]Clayton Kirkwood port to WindowsNT 3.5 4. [5]Michael Barone GPSVME fixes - 5. [6]Karl Berry syslog to file option - 6. [7]Greg Brackley Major rework of WINNT + 5. [6]Jean-Francois Boudreault + IPv6 support + 6. [7]Karl Berry syslog to file option + 7. [8]Greg Brackley Major rework of WINNT port. Clean up recvbuf and iosignal code into separate modules. - 7. [8]Marc Brett Magnavox GPS clock driver - 8. [9]Piete Brooks MSF clock driver, + 8. [9]Marc Brett Magnavox GPS clock driver + 9. [10]Piete Brooks MSF clock driver, Trimble PARSE support - 9. [10]Reg Clemens Oncore driver (Current maintainer) - 10. [11]Steve Clift OMEGA clock driver - 11. [12]Casey Crellin vxWorks (Tornado) port and + 10. [11]Reg Clemens Oncore driver (Current maintainer) + 11. [12]Steve Clift OMEGA clock driver + 12. [13]Casey Crellin vxWorks (Tornado) port and help with target configuration - 12. [13]Sven Dietrich Palisade reference + 13. [14]Sven Dietrich Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port. - 13. [14]John A. Dundas III Apple A/UX port - 14. [15]Torsten Duwe Linux + 14. [15]John A. Dundas III Apple A/UX port + 15. [16]Torsten Duwe Linux port - 15. [16]Dennis Ferguson foundation code for + 16. [17]Dennis Ferguson foundation code for NTP Version 2 as specified in RFC-1119 - 16. [17]Glenn Hollinger GOES clock driver - 17. [18]Mike Iglesias DEC Alpha port - 18. [19]Jim Jagielski A/UX port - 19. [20]Jeff Johnson massive prototyping + 17. [18]John Hay IPv6 support and testing + 18. [19]Glenn Hollinger GOES clock driver + 19. [20]Mike Iglesias DEC Alpha port + 20. [21]Jim Jagielski A/UX port + 21. [22]Jeff Johnson massive prototyping overhaul - 20. [21]Hans Lambermont or - [22] ntpsweep - 21. [23]Poul-Henning Kamp Oncore driver (Original + 22. [23]Hans Lambermont or + [24] ntpsweep + 23. [25]Poul-Henning Kamp Oncore driver (Original author) - 22. [24]Frank Kardel [25] + 24. [26]Frank Kardel [27] PARSE driver (14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup - 23. [26]William L. Jones RS/6000 AIX + 25. [28]William L. Jones RS/6000 AIX modifications, HPUX modifications - 24. [27]Dave Katz RS/6000 AIX port - 25. [28]Craig Leres 4.4BSD port, ppsclock, Magnavox + 26. [29]Dave Katz RS/6000 AIX port + 27. [30]Craig Leres 4.4BSD port, ppsclock, Magnavox GPS clock driver - 26. [29]George Lindholm SunOS 5.1 port - 27. [30]Louis A. Mamakos MD5-based authentication - 28. [31]Lars H. Mathiesen adaptation of foundation + 28. [31]George Lindholm SunOS 5.1 port + 29. [32]Louis A. Mamakos MD5-based authentication + 30. [33]Lars H. Mathiesen adaptation of foundation code for Version 3 as specified in RFC-1305 - 29. [32]David L. Mills Version 4 foundation: clock + 31. [34]Danny Mayer Network I/O, Windows Port, Code + Maintenance + 32. [35]David L. Mills Version 4 foundation: clock discipline, authentication, precision kernel; clock drivers: Spectracom, Austron, Arbiter, Heath, ATOM, ACTS, KSI/Odetics; audio clock drivers: CHU, WWV/H, IRIG - 30. [33]Wolfgang Moeller VMS port - 31. [34]Jeffrey Mogul ntptrace utility - 32. [35]Tom Moore i386 svr4 port - 33. [36]Kamal A Mostafa SCO OpenServer port - 34. [37]Derek Mulcahy and [38]Damon + 33. [36]Wolfgang Moeller VMS port + 34. [37]Jeffrey Mogul ntptrace utility + 35. [38]Tom Moore i386 svr4 port + 36. [39]Kamal A Mostafa SCO OpenServer port + 37. [40]Derek Mulcahy and [41]Damon Hart-Davis ARCRON MSF clock driver - 35. [39]Rainer Pruy + 38. [42]Rainer Pruy monitoring/trap scripts, statistics file handling - 36. [40]Dirce Richards Digital UNIX V4.0 port - 37. [41]Wilfredo Sánchez added support for + 39. [43]Dirce Richards Digital UNIX V4.0 port + 40. [44]Wilfredo Sánchez added support for NetInfo - 38. [42]Nick Sayer SunOS streams modules - 39. [43]Jack Sasportas Saved a Lot of + 41. [45]Nick Sayer SunOS streams modules + 42. [46]Jack Sasportas Saved a Lot of space on the stuff in the html/pic/ subdirectory - 40. [44]Ray Schnitzler Unixware1 port - 41. [45]Michael Shields USNO clock driver - 42. [46]Jeff Steinman Datum PTS clock + 43. [47]Ray Schnitzler Unixware1 port + 44. [48]Michael Shields USNO clock driver + 45. [49]Jeff Steinman Datum PTS clock driver - 43. [47]Harlan Stenn GNU automake/autoconfigure + 46. [50]Harlan Stenn GNU automake/autoconfigure makeover, various other bits (see the ChangeLog) - 44. [48]Kenneth Stone HP-UX port - 45. [49]Ajit Thyagarajan IP multicast/anycast + 47. [51]Kenneth Stone HP-UX port + 48. [52]Ajit Thyagarajan IP multicast/anycast support - 46. [50]Tomoaki TSURUOKA TRAK clock + 49. [53]Tomoaki TSURUOKA TRAK clock driver - 47. [51]Paul A Vixie TrueTime GPS driver, generic + 50. [54]Paul A Vixie TrueTime GPS driver, generic TrueTime clock driver - 48. [52]Ulrich Windl corrected and + 51. [55]Ulrich Windl corrected and validated HTML documents according to the HTML DTD _________________________________________________________________ - - [53]gif - - - [54]David L. Mills References - 1. mailto:marka@syd.dms.csiro.au - 2. mailto:altmeier@atlsoft.de - 3. mailto:vbais@mailman1.intel.co - 4. mailto:kirkwood@striderfm.intel.com - 5. mailto:michael.barone@lmco.com - 6. mailto:karl@owl.HQ.ileaf.com - 7. mailto:greg.brackley@bigfoot.com - 8. mailto:Marc.Brett@westgeo.com - 9. mailto:Piete.Brooks@cl.cam.ac.uk - 10. mailto:reg@dwf.com - 11. mailto:clift@ml.csiro.au - 12. mailto:casey@csc.co.za - 13. mailto:Sven_Dietrich@trimble.COM - 14. mailto:dundas@salt.jpl.nasa.gov - 15. mailto:duwe@immd4.informatik.uni-erlangen.de - 16. mailto:dennis@mrbill.canet.ca - 17. mailto:glenn@herald.usask.ca - 18. mailto:iglesias@uci.edu - 19. mailto:jagubox.gsfc.nasa.gov - 20. mailto:jbj@chatham.usdesign.com - 21. mailto:Hans.Lambermont@nl.origin-it.com - 22. mailto:H.Lambermont@chello.nl - 23. mailto:phk@FreeBSD.ORG - 24. http://www4.informatik.uni-erlangen.de/~kardel - 25. mailto:Frank.Kardel@informatik.uni-erlangen.de - 26. mailto:jones@hermes.chpc.utexas.edu - 27. mailto:dkatz@cisco.com - 28. mailto:leres@ee.lbl.gov - 29. mailto:lindholm@ucs.ubc.ca - 30. mailto:louie@ni.umd.edu - 31. mailto:thorinn@diku.dk - 32. mailto:mills@udel.edu - 33. mailto:moeller@gwdgv1.dnet.gwdg.de - 34. mailto:mogul@pa.dec.com - 35. mailto:tmoore@fievel.daytonoh.ncr.com - 36. mailto:kamal@whence.com - 37. mailto:derek@toybox.demon.co.uk - 38. mailto:d@hd.org - 39. mailto:Rainer.Pruy@informatik.uni-erlangen.de - 40. mailto:dirce@zk3.dec.com - 41. mailto:wsanchez@apple.com - 42. mailto:mrapple@quack.kfu.com - 43. mailto:jack@innovativeinternet.com - 44. mailto:schnitz@unipress.com - 45. mailto:shields@tembel.org - 46. mailto:pebbles.jpl.nasa.gov - 47. mailto:harlan@pfcs.com - 48. mailto:ken@sdd.hp.com - 49. mailto:ajit@ee.udel.edu - 50. mailto:tsuruoka@nc.fukuoka-u.ac.jp - 51. mailto:vixie@vix.com - 52. mailto:Ulrich.Windl@rz.uni-regensburg.de - 53. file://localhost/backroom/ntp-stable/html/index.htm - 54. mailto:mills@udel.edu + 1. mailto:%20mark_andrews@isc.org + 2. mailto:%20altmeier@atlsoft.de + 3. mailto:%20vbais@mailman1.intel.co + 4. mailto:%20kirkwood@striderfm.intel.com + 5. mailto:%20michael.barone@lmco.com + 6. mailto:%20Jean-Francois.Boudreault@viagenie.qc.ca + 7. mailto:%20karl@owl.HQ.ileaf.com + 8. mailto:%20greg.brackley@bigfoot.com + 9. mailto:%20Marc.Brett@westgeo.com + 10. mailto:%20Piete.Brooks@cl.cam.ac.uk + 11. mailto:%20reg@dwf.com + 12. mailto:%20clift@ml.csiro.au + 13. mailto:casey@csc.co.za + 14. mailto:%20Sven_Dietrich@trimble.COM + 15. mailto:%20dundas@salt.jpl.nasa.gov + 16. mailto:%20duwe@immd4.informatik.uni-erlangen.de + 17. mailto:%20dennis@mrbill.canet.ca + 18. mailto:%20jhay@icomtek.csir.co.za + 19. mailto:%20glenn@herald.usask.ca + 20. mailto:%20iglesias@uci.edu + 21. mailto:%20jagubox.gsfc.nasa.gov + 22. mailto:%20jbj@chatham.usdesign.com + 23. mailto:Hans.Lambermont@nl.origin-it.com + 24. mailto:H.Lambermont@chello.nl + 25. mailto:%20phk@FreeBSD.ORG + 26. http://www4.informatik.uni-erlangen.de/%7ekardel + 27. mailto:%20Frank.Kardel@informatik.uni-erlangen.de + 28. mailto:%20jones@hermes.chpc.utexas.edu + 29. mailto:%20dkatz@cisco.com + 30. mailto:%20leres@ee.lbl.gov + 31. mailto:%20lindholm@ucs.ubc.ca + 32. mailto:%20louie@ni.umd.edu + 33. mailto:%20thorinn@diku.dk + 34. mailto:%20mayer@ntp.org + 35. mailto:%20mills@udel.edu + 36. mailto:%20moeller@gwdgv1.dnet.gwdg.de + 37. mailto:%20mogul@pa.dec.com + 38. mailto:%20tmoore@fievel.daytonoh.ncr.com + 39. mailto:%20kamal@whence.com + 40. mailto:%20derek@toybox.demon.co.uk + 41. mailto:%20d@hd.org + 42. mailto:%20Rainer.Pruy@informatik.uni-erlangen.de + 43. mailto:%20dirce@zk3.dec.com + 44. mailto:%20wsanchez@apple.com + 45. mailto:%20mrapple@quack.kfu.com + 46. mailto:%20jack@innovativeinternet.com + 47. mailto:%20schnitz@unipress.com + 48. mailto:%20shields@tembel.org + 49. mailto:%20pebbles.jpl.nasa.gov + 50. mailto:%20harlan@pfcs.com + 51. mailto:%20ken@sdd.hp.com + 52. mailto:%20ajit@ee.udel.edu + 53. mailto:%20tsuruoka@nc.fukuoka-u.ac.jp + 54. mailto:%20vixie@vix.com + 55. mailto:%20Ulrich.Windl@rz.uni-regensburg.de ==== //depot/projects/hammer/contrib/ntp/ChangeLog#3 (text+ko) ==== @@ -1,1995 +1,20241 @@ -ChangeSet@1.786, 2002-02-26 22:44:34-05:00, stenn@whimsy.udel.edu - ntp-4.1.1 - TAG: NTP_4_1_1 +ChangeSet + 1.1161 03/10/15 05:51:42 stenn@whimsy.udel.edu +2 -0 + 4.2.0 configure.in - 1.235 02/02/26 22:44:33 stenn@whimsy.udel.edu +1 -1 - ntp-4.1.1 + 1.333 03/10/15 05:50:45 stenn@whimsy.udel.edu +1 -1 + 4.2.0 NEWS - 1.38 02/02/26 22:44:32 stenn@whimsy.udel.edu +1 -0 - Update the NEWS file. + 1.45 03/10/15 05:50:45 stenn@whimsy.udel.edu +3 -1 + 4.2.0 + +ChangeSet >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 21 01:22:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 366BF16A4D0; Wed, 21 Jul 2004 01:22:35 +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 0EF4216A4CE for ; Wed, 21 Jul 2004 01:22:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E551443D53 for ; Wed, 21 Jul 2004 01:22:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6L1MYbk025828 for ; Wed, 21 Jul 2004 01:22:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6L1MYag025825 for perforce@freebsd.org; Wed, 21 Jul 2004 01:22:34 GMT (envelope-from peter@freebsd.org) Date: Wed, 21 Jul 2004 01:22:34 GMT Message-Id: <200407210122.i6L1MYag025825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57811 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: Wed, 21 Jul 2004 01:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=57811 Change 57811 by peter@peter_melody on 2004/07/21 01:22:16 IFC @57810 (commit sync) Affected files ... .. //depot/projects/hammer/sys/vm/vm_map.c#40 integrate Differences ... ==== //depot/projects/hammer/sys/vm/vm_map.c#40 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.342 2004/07/15 18:00:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.343 2004/07/21 00:29:21 peter Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Wed Jul 21 01:41:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CFD616A4D0; Wed, 21 Jul 2004 01:41:59 +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 C0C0C16A4CE for ; Wed, 21 Jul 2004 01:41:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8F6F43D49 for ; Wed, 21 Jul 2004 01:41:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6L1fw4B026460 for ; Wed, 21 Jul 2004 01:41:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6L1fw8K026457 for perforce@freebsd.org; Wed, 21 Jul 2004 01:41:58 GMT (envelope-from peter@freebsd.org) Date: Wed, 21 Jul 2004 01:41:58 GMT Message-Id: <200407210141.i6L1fw8K026457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57812 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: Wed, 21 Jul 2004 01:42:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=57812 Change 57812 by peter@peter_melody on 2004/07/21 01:41:36 Integ -I -b i386_hammer to sync up with i386. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#95 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#95 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#49 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#46 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#47 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#36 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#21 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#44 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#28 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#9 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#12 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#29 (text+ko) ==== @@ -53,7 +53,7 @@ /* * cpu_throw() * - * This is the second half of cpu_swtch(). It is used when the current + * This is the second half of cpu_switch(). It is used when the current * thread is either a dummy or slated to die, and we no longer care * about its state. This is only a slight optimization and is probably * not worth it anymore. Note that we need to clear the pm_active bits so ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#21 (text+ko) ==== @@ -33,11 +33,9 @@ #include #include #include -#include #include #include #include -#include #include ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#38 (text+ko) ==== @@ -194,7 +194,7 @@ { int i; - if (apic_id > MAX_APICID) { + if (apic_id >= MAX_APICID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#95 (text+ko) ==== @@ -94,6 +94,11 @@ #include #include +#ifdef DDB +#ifndef KDB +#error KDB must be enabled in order for DDB to work! +#endif +#endif #include #include ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#95 (text+ko) ==== @@ -1058,7 +1058,6 @@ if (va >= VM_MAXUSER_ADDRESS) return 0; -/* XXX this should be an error, all cases should be caught now */ if (ptepde == 0) ptepde = *pmap_pde(pmap, va); mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); @@ -1511,6 +1510,7 @@ pt_entry_t oldpte; vm_page_t m; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = pte_load_clear(ptq); if (oldpte & PG_W) @@ -1552,6 +1552,7 @@ pd_entry_t ptepde; pt_entry_t *pte; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); pte = pmap_pte_pde(pmap, va, &ptepde); if (pte == NULL || (*pte & PG_V) == 0) ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#49 (text+ko) ==== @@ -286,7 +286,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap (type, 0, &frame); + kdb_trap(type, 0, &frame); } #endif /* KDB */ goto userout; ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#46 (text+ko) ==== @@ -314,6 +314,7 @@ * Set the trap frame to point at the beginning of the uts * function. */ + td->td_frame->tf_rbp = 0; td->td_frame->tf_rsp = ((register_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#47 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#36 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1164) +# (XXX from i386:NOTES,v 1.1165) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.14 2004/05/17 22:13:14 peter Exp $ # ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb.h#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#44 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#28 (text+ko) ==== @@ -212,6 +212,7 @@ static void rtcintr(struct clockframe *frame) { + while (rtcin(RTC_INTR) & RTCIR_PERIOD) { if (profprocs != 0) { if (--pscnt == 0) @@ -295,7 +296,7 @@ * multiplications and divisions to scale the count take a while). * * However, if ddb is active then use a fake counter since reading - * the i8254 counter involves acquiring a lock. ddb must not go + * the i8254 counter involves acquiring a lock. ddb must not do * locking for many reasons, but it calls here for at least atkbd * input. */ ==== //depot/projects/hammer/sys/amd64/isa/isa.h#9 (text+ko) ==== @@ -64,69 +64,9 @@ #define IO_NPX 0x0F0 /* Numeric Coprocessor */ /* Cards */ - /* 0x100 - 0x16F Open */ - -#define IO_WD2 0x170 /* Secondary Fixed Disk Controller */ - -#define IO_PMP2 0x178 /* 82347 Power Management Peripheral */ - - /* 0x17A - 0x1EF Open */ - -#define IO_WD1 0x1F0 /* Primary Fixed Disk Controller */ -#define IO_GAME 0x201 /* Game Controller */ - - /* 0x202 - 0x22A Open */ - -#define IO_ASC2 0x22B /* AmiScan addr.grp. 2 */ - - /* 0x230 - 0x26A Open */ - -#define IO_ASC3 0x26B /* AmiScan addr.grp. 3 */ -#define IO_GSC1 0x270 /* -- 0x27B! GeniScan GS-4500 addr.grp. 1 */ -#define IO_LPT2 0x278 /* Parallel Port #2 */ - - /* 0x280 - 0x2AA Open */ - -#define IO_ASC4 0x2AB /* AmiScan addr.grp. 4 */ - - /* 0x2B0 - 0x2DF Open */ - -#define IO_GSC2 0x2E0 /* GeniScan GS-4500 addr.grp. 2 */ -#define IO_COM4 0x2E8 /* COM4 i/o address */ -#define IO_ASC5 0x2EB /* AmiScan addr.grp. 5 */ - - /* 0x2F0 - 0x2F7 Open */ - -#define IO_COM2 0x2F8 /* COM2 i/o address */ - - /* 0x300 - 0x32A Open */ - -#define IO_ASC6 0x32B /* AmiScan addr.grp. 6 */ -#define IO_AHA0 0x330 /* adaptec 1542 default addr. */ -#define IO_BT0 0x330 /* bustek 742a default addr. */ -#define IO_UHA0 0x330 /* ultrastore 14f default addr. */ -#define IO_AHA1 0x334 /* adaptec 1542 default addr. */ -#define IO_BT1 0x334 /* bustek 742a default addr. */ - - /* 0x340 - 0x36A Open */ - -#define IO_ASC7 0x36B /* AmiScan addr.grp. 7 */ -#define IO_GSC3 0x370 /* GeniScan GS-4500 addr.grp. 3 */ -#define IO_FD2 0x370 /* secondary base i/o address */ -#define IO_LPT1 0x378 /* Parallel Port #1 */ - - /* 0x380 - 0x3AA Open */ - -#define IO_ASC8 0x3AB /* AmiScan addr.grp. 8 */ -#define IO_MDA 0x3B0 /* Monochome Adapter */ -#define IO_LPT3 0x3BC /* Monochome Adapter Printer Port */ #define IO_VGA 0x3C0 /* E/VGA Ports */ #define IO_CGA 0x3D0 /* CGA Ports */ -#define IO_GSC4 0x3E0 /* GeniScan GS-4500 addr.grp. 4 */ -#define IO_COM3 0x3E8 /* COM3 i/o address */ -#define IO_ASC1 0x3EB /* AmiScan addr.grp. 1 */ -#define IO_FD1 0x3F0 /* primary base i/o address */ -#define IO_COM1 0x3F8 /* COM1 i/o address */ +#define IO_MDA 0x3B0 /* Monochome Adapter */ #define IO_ISAEND 0x3FF /* End (actually Max) of I/O Regs */ #endif /* !IO_ISABEGIN */ @@ -138,25 +78,10 @@ #ifndef IO_ISASIZES #define IO_ISASIZES -#define IO_ASCSIZE 5 /* AmiScan GI1904-based hand scanner */ #define IO_CGASIZE 12 /* CGA controllers */ -#define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ -#define IO_DMASIZE 16 /* 8237 DMA controllers */ -#define IO_DPGSIZE 32 /* 74LS612 DMA page registers */ -#define IO_FDCSIZE 8 /* Nec765 floppy controllers */ -#define IO_GAMSIZE 16 /* AT compatible game controllers */ -#define IO_GSCSIZE 8 /* GeniScan GS-4500G hand scanner */ -#define IO_ICUSIZE 16 /* 8259A interrupt controllers */ -#define IO_KBDSIZE 16 /* 8042 Keyboard controllers */ -#define IO_LPTSIZE 8 /* LPT controllers, some use only 4 */ #define IO_MDASIZE 12 /* Monochrome display controllers */ #define IO_NPXSIZE 16 /* 80387/80487 NPX registers */ -#define IO_PMPSIZE 2 /* 82347 power management peripheral */ -#define IO_PSMSIZE 5 /* 8042 Keyboard controllers */ -#define IO_RTCSIZE 16 /* CMOS real time clock, NMI control */ -#define IO_TMRSIZE 16 /* 8253 programmable timers */ #define IO_VGASIZE 16 /* VGA controllers */ -#define IO_WDCSIZE 8 /* WD compatible disk controllers */ #endif /* !IO_ISASIZES */ ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#12 (text+ko) ==== @@ -103,12 +103,20 @@ { void *buf; + /* + * If a DMA channel is shared, both drivers have to call isa_dmainit + * since they don't know that the other driver will do it. + * Just return if we're already set up good. + * XXX: this only works if they agree on the bouncebuf size. This + * XXX: is typically the case since they are multiple instances of + * XXX: the same driver. + */ + if (dma_bouncebuf[chan] != NULL) + return; + #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) panic("isa_dmainit: channel out of range"); - - if (dma_bouncebuf[chan] != NULL) - panic("isa_dmainit: impossible request"); #endif dma_bouncebufsize[chan] = bouncebufsize; From owner-p4-projects@FreeBSD.ORG Wed Jul 21 05:36:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD0C516A4D0; Wed, 21 Jul 2004 05:36:45 +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 8227616A4CE for ; Wed, 21 Jul 2004 05:36:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6463143D41 for ; Wed, 21 Jul 2004 05:36:45 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6L5ajT5033529 for ; Wed, 21 Jul 2004 05:36:45 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6L5ajGx033526 for perforce@freebsd.org; Wed, 21 Jul 2004 05:36:45 GMT (envelope-from scottl@freebsd.org) Date: Wed, 21 Jul 2004 05:36:45 GMT Message-Id: <200407210536.i6L5ajGx033526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 57822 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: Wed, 21 Jul 2004 05:36:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=57822 Change 57822 by scottl@scottl-junior on 2004/07/21 05:35:50 Add subr_scsiport.c to hold the SCSI.SYS API. Mostly just stubs for now. Affected files ... .. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_scsiport.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 21 18:20:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 711E216A4D0; Wed, 21 Jul 2004 18:20:00 +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 4406716A4CE for ; Wed, 21 Jul 2004 18:20:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A49443D31 for ; Wed, 21 Jul 2004 18:20:00 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6LIK0Bw066454 for ; Wed, 21 Jul 2004 18:20:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6LIJrg9066451 for perforce@freebsd.org; Wed, 21 Jul 2004 18:19:53 GMT (envelope-from marcel@freebsd.org) Date: Wed, 21 Jul 2004 18:19:53 GMT Message-Id: <200407211819.i6LIJrg9066451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57864 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: Wed, 21 Jul 2004 18:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=57864 Change 57864 by marcel@marcel_nfs on 2004/07/21 18:19:15 IFC @57863 Affected files ... .. //depot/projects/gdb/bin/cat/cat.c#3 integrate .. //depot/projects/gdb/bin/df/df.1#7 integrate .. //depot/projects/gdb/bin/df/df.c#10 integrate .. //depot/projects/gdb/bin/ps/print.c#8 integrate .. //depot/projects/gdb/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/gdb/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/gdb/contrib/ntp/ChangeLog-4.1.0#2 integrate .. //depot/projects/gdb/contrib/ntp/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/NEWS#2 integrate .. //depot/projects/gdb/contrib/ntp/README#2 integrate .. //depot/projects/gdb/contrib/ntp/README.bk#2 integrate .. //depot/projects/gdb/contrib/ntp/README.cvs#2 delete .. //depot/projects/gdb/contrib/ntp/README.des#2 delete .. //depot/projects/gdb/contrib/ntp/README.hackers#2 integrate .. //depot/projects/gdb/contrib/ntp/README.patches#1 branch .. //depot/projects/gdb/contrib/ntp/README.rsa#2 delete .. //depot/projects/gdb/contrib/ntp/TODO#2 integrate .. //depot/projects/gdb/contrib/ntp/acconfig.h#2 delete .. //depot/projects/gdb/contrib/ntp/acinclude.m4#2 integrate .. //depot/projects/gdb/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/gdb/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/arlib/COPYING#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/INSTALL#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/Makefile.am#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/Makefile.in#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/README#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/UNSHAR.HDR#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/aclocal.m4#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/arlib.3#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/arlib.c#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/arlib.h#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/arplib.h#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/configure#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/configure.in#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/depcomp#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/install-sh#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/missing#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/mkinstalldirs#1 branch .. //depot/projects/gdb/contrib/ntp/arlib/sample.c#1 branch .. //depot/projects/gdb/contrib/ntp/build#2 integrate .. //depot/projects/gdb/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/compile#1 branch .. //depot/projects/gdb/contrib/ntp/conf/README#2 integrate .. //depot/projects/gdb/contrib/ntp/conf/baldwin.conf#2 integrate .. //depot/projects/gdb/contrib/ntp/conf/dewey.conf#2 delete .. //depot/projects/gdb/contrib/ntp/conf/grundoon.conf#2 integrate .. //depot/projects/gdb/contrib/ntp/conf/malarky.conf#2 integrate .. //depot/projects/gdb/contrib/ntp/conf/pogo.conf#2 integrate .. //depot/projects/gdb/contrib/ntp/conf/rackety.conf#2 integrate .. //depot/projects/gdb/contrib/ntp/config.guess#2 integrate .. //depot/projects/gdb/contrib/ntp/config.h.in#2 integrate .. //depot/projects/gdb/contrib/ntp/config.sub#2 integrate .. //depot/projects/gdb/contrib/ntp/configure#2 integrate .. //depot/projects/gdb/contrib/ntp/configure.in#2 integrate .. //depot/projects/gdb/contrib/ntp/depcomp#2 integrate .. //depot/projects/gdb/contrib/ntp/flock-build#2 integrate .. //depot/projects/gdb/contrib/ntp/html/Oncore-SHMEM.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/accopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/accopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/assoc.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/assoc.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/audio.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/audio.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/authopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/authopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/biblio.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/build.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/build.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/clockopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/clockopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/config.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/config.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/confopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/confopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/copyright.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/copyright.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/debug.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/debug.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/driver1.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver10.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver11.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver12.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver16.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver18.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver19.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver2.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver20.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver22.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver23.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver24.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver26.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver27.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver28.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver29.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver3.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver30.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver32.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver33.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver34.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver35.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver36.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver37.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver38.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver39.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver4.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver40.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver42.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver43.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver44.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver5.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver6.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver7.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver8.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/driver9.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/drivers/driver1.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver10.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver11.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver12.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver16.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver18.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver19.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver2.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver20.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver22.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver23.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver24.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver26.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver27.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver28.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver29.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver3.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver30.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver32.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver33.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver34.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver35.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver36.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver37.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver38.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver39.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver4.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver40.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver42.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver43.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver44.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver5.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver6.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver7.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver8.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/driver9.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/icons/home.gif#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/icons/mail2.gif#1 branch .. //depot/projects/gdb/contrib/ntp/html/drivers/oncore-shmem.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/exec.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/extern.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/extern.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/gadget.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/genkeys.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/hints.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/hints.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/hints/netbsd#1 branch .. //depot/projects/gdb/contrib/ntp/html/hints/sco.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/hints/sco.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/hints/solaris-dosynctodr.html#2 integrate .. //depot/projects/gdb/contrib/ntp/html/hints/solaris.html#2 integrate .. //depot/projects/gdb/contrib/ntp/html/hints/vxworks.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/hints/vxworks.html#2 integrate .. //depot/projects/gdb/contrib/ntp/html/hints/winnt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/hints/winnt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/howto.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/howto.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/htmlprimer.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/icons/home.gif#1 branch .. //depot/projects/gdb/contrib/ntp/html/icons/mail2.gif#1 branch .. //depot/projects/gdb/contrib/ntp/html/index.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/index.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/kern.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/kern.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/kernpps.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/keygen.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ldisc.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ldisc.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/leap.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/manyopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/measure.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/measure.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/miscopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/miscopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/monopt.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/monopt.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/msyslog.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/mx4200data.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/mx4200data.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/notes.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/notes.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntpd.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntpd.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntpdate.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntpdate.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntpdc.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntpdc.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntpdsim.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntpq.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntpq.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntptime.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntptime.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/ntptrace.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/ntptrace.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/parsedata.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/parsedata.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/parsenew.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/parsenew.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/patches.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/patches.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/porting.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/porting.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/pps.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/pps.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/prefer.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/prefer.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/qth.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/quick.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/quick.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/rdebug.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/rdebug.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/refclock.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/refclock.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/release.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/release.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/footer.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links10.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links11.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links12.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links7.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links8.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/links9.txt#1 branch .. //depot/projects/gdb/contrib/ntp/html/scripts/style.css#1 branch .. //depot/projects/gdb/contrib/ntp/html/sntp.html#1 branch .. //depot/projects/gdb/contrib/ntp/html/tickadj.htm#2 delete .. //depot/projects/gdb/contrib/ntp/html/tickadj.html#1 branch .. //depot/projects/gdb/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/audio.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/isc/Makefile.am#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/app.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/assertions.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/boolean.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/error.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/formatcheck.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/int.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/interfaceiter.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/ipv6.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/lang.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/lib.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/list.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/magic.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/mem.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/msgcat.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/msgs.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/mutex.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/net.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/netaddr.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/offset.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/once.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/platform.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/print.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/result.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/sockaddr.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/strerror.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/string.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/types.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/isc/util.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/md5.h#2 delete .. //depot/projects/gdb/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_if.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_io.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_md5.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_rfc2553.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/ntp_sprintf.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_unixtime.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/ntpsim.h#1 branch .. //depot/projects/gdb/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/gdb/contrib/ntp/include/rsa_md5.h#1 branch .. //depot/projects/gdb/contrib/ntp/install-sh#2 integrate .. //depot/projects/gdb/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/kernel/sys/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/gdb/contrib/ntp/kernel/sys/tt560_api.h#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/assertions.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/error.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/ifiter_ioctl.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/ifiter_sysctl.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/inet_ntop.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/interfaceiter.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/isc_strerror.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/lib.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/mem.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/msgcat.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/net.c#1 branch .. //depot/projects/gdb/contrib/ntp/libisc/strerror.c#1 branch .. //depot/projects/gdb/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/authencrypt.c#2 delete .. //depot/projects/gdb/contrib/ntp/libntp/authkeys.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/authparity.c#2 delete .. //depot/projects/gdb/contrib/ntp/libntp/authreadkeys.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/authusekey.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/binio.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/dofptoa.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/fptoa.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/fptoms.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/ieee754io.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/log.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/md5c.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/memmove.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/mfptoa.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/mfptoms.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/netof.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/ntp_rfc2553.c#1 branch .. //depot/projects/gdb/contrib/ntp/libntp/refnumtoa.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/snprintf.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/socktoa.c#1 branch .. //depot/projects/gdb/contrib/ntp/libntp/socktohost.c#1 branch .. //depot/projects/gdb/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/strerror.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/strstr.c#1 branch .. //depot/projects/gdb/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/gdb/contrib/ntp/libntp/systime_s.c#1 branch .. //depot/projects/gdb/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/librsaref/Makefile.am#2 delete .. //depot/projects/gdb/contrib/ntp/librsaref/Makefile.in#2 delete .. //depot/projects/gdb/contrib/ntp/missing#2 integrate .. //depot/projects/gdb/contrib/ntp/mkinstalldirs#2 integrate .. //depot/projects/gdb/contrib/ntp/ntp_update#2 delete .. //depot/projects/gdb/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/check_y2k.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/ntpsim.c#1 branch .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_as2201.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_chronolog.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_pcf.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_tpro.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_trak.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_true.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_usno.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdate/ntpdate.h#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdc/layout.std#1 branch .. //depot/projects/gdb/contrib/ntp/ntpdc/nl.pl#1 branch .. //depot/projects/gdb/contrib/ntp/ntpdc/nl.pl.in#1 branch .. //depot/projects/gdb/contrib/ntp/ntpdc/nl_in.c#1 branch .. //depot/projects/gdb/contrib/ntp/ntpdc/ntpdc-layout.c#1 branch .. //depot/projects/gdb/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/gdb/contrib/ntp/ntpq/ntpq_ops.c#2 integrate .. //depot/projects/gdb/contrib/ntp/ntptrace/Makefile.am#2 delete .. //depot/projects/gdb/contrib/ntp/ntptrace/Makefile.in#2 delete .. //depot/projects/gdb/contrib/ntp/ntptrace/README#2 delete .. //depot/projects/gdb/contrib/ntp/ntptrace/ntptrace.c#2 delete .. //depot/projects/gdb/contrib/ntp/ntptrace/ntptrace.h#2 delete .. //depot/projects/gdb/contrib/ntp/parseutil/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/gdb/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/gdb/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/scripts/ntptrace.in#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/Makefile.am#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/Makefile.in#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/README#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/aclocal.m4#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/config.guess#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/config.sub#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/configure#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/configure.ac#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/depcomp#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/header.h#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/install-sh#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/internet.c#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/internet.h#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/kludges.h#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/main.c#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/missing#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/mkinstalldirs#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/socket.c#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/timing.c#1 branch .. //depot/projects/gdb/contrib/ntp/sntp/unix.c#1 branch .. //depot/projects/gdb/contrib/ntp/stamp-h.in#2 delete .. //depot/projects/gdb/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ntp/util/README#2 integrate .. //depot/projects/gdb/contrib/ntp/util/audio-pcm.c#1 branch .. //depot/projects/gdb/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/gdb/contrib/ntp/util/ntp-genkeys.c#2 delete .. //depot/projects/gdb/contrib/ntp/util/ntp-keygen.c#1 branch .. //depot/projects/gdb/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/gdb/contrib/ntp/util/pps-api.c#1 branch .. //depot/projects/gdb/contrib/ntp/util/sht.c#2 integrate .. //depot/projects/gdb/contrib/ntp/util/tickadj.c#2 integrate .. //depot/projects/gdb/contrib/ntp/util/timetrim.c#2 integrate .. //depot/projects/gdb/contrib/ntp/version#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#7 integrate .. //depot/projects/gdb/include/wchar.h#5 integrate .. //depot/projects/gdb/lib/Makefile#9 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/amd64/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/gdb/lib/libc/amd64/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/arm/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/arm/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/gdb/lib/libc/gen/frexp.c#1 branch .. //depot/projects/gdb/lib/libc/gen/signbit.3#2 delete .. //depot/projects/gdb/lib/libc/gen/signbit.c#2 delete .. //depot/projects/gdb/lib/libc/i386/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/i386/gen/flt_rounds.c#1 branch .. //depot/projects/gdb/lib/libc/i386/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/ia64/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/ia64/gen/flt_rounds.c#1 branch .. //depot/projects/gdb/lib/libc/ia64/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/gdb/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/gdb/lib/libc/locale/mbsnrtowcs.c#1 branch .. //depot/projects/gdb/lib/libc/locale/mbsrtowcs.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/mbsrtowcs.c#4 integrate .. //depot/projects/gdb/lib/libc/locale/mbstowcs.c#4 integrate .. //depot/projects/gdb/lib/libc/locale/none.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/setrunelocale.c#6 integrate .. //depot/projects/gdb/lib/libc/locale/table.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/wcsnrtombs.c#1 branch .. //depot/projects/gdb/lib/libc/locale/wcsrtombs.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/wcsrtombs.c#4 integrate .. //depot/projects/gdb/lib/libc/locale/wcstombs.c#4 integrate .. //depot/projects/gdb/lib/libc/net/gethostbydns.c#3 integrate .. //depot/projects/gdb/lib/libc/net/name6.c#7 integrate .. //depot/projects/gdb/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/Makefile.inc#5 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/powerpc/gen/makecontext.c#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/signalcontext.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/stdlib/gdtoa.mk#2 integrate .. //depot/projects/gdb/lib/libc/regex/grot/Makefile#2 integrate .. //depot/projects/gdb/lib/libc/regex/grot/debug.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/grot/limits.h#2 delete .. //depot/projects/gdb/lib/libc/regex/grot/stdlib.h#2 delete .. //depot/projects/gdb/lib/libc/sparc64/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/sparc64/gen/frexp.c#2 delete .. //depot/projects/gdb/lib/libc/stdio/fgetwc.c#5 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fputwc.c#4 integrate .. //depot/projects/gdb/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/ungetwc.c#4 integrate .. //depot/projects/gdb/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/gdb/lib/libpthread/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/gdb/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#10 integrate .. //depot/projects/gdb/lib/msun/man/signbit.3#1 branch .. //depot/projects/gdb/lib/msun/src/math.h#13 integrate .. //depot/projects/gdb/lib/msun/src/s_signbit.c#1 branch .. //depot/projects/gdb/sbin/atm/atmconfig/Makefile#4 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/atmconfig.help#2 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/diag.c#4 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/main.c#2 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/private.h#2 integrate .. //depot/projects/gdb/sbin/geom/class/nop/geom_nop.c#2 integrate .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#7 integrate .. //depot/projects/gdb/sbin/reboot/boot_i386.8#4 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#10 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/acpi_panasonic.4#1 branch .. //depot/projects/gdb/share/man/man4/netgraph.4#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#11 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#16 integrate .. //depot/projects/gdb/sys/alpha/include/pmap.h#8 integrate .. //depot/projects/gdb/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/gdb/sys/amd64/include/float.h#5 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#11 integrate .. //depot/projects/gdb/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/gdb/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/gdb/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/gdb/sys/arm/arm/support.S#2 integrate .. //depot/projects/gdb/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/gdb/sys/arm/include/float.h#2 integrate .. //depot/projects/gdb/sys/arm/include/profile.h#3 integrate .. //depot/projects/gdb/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/gdb/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/gdb/sys/boot/efi/loader/Makefile#3 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/gdb/sys/conf/NOTES#36 integrate .. //depot/projects/gdb/sys/conf/files.i386#24 integrate .. //depot/projects/gdb/sys/conf/options#33 integrate .. //depot/projects/gdb/sys/ddb/db_command.c#8 integrate .. //depot/projects/gdb/sys/ddb/ddb.h#10 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/gdb/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/gdb/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/gdb/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/gdb/sys/i386/conf/NOTES#17 integrate .. //depot/projects/gdb/sys/i386/i386/db_trace.c#12 integrate .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#13 integrate .. //depot/projects/gdb/sys/i386/include/float.h#5 integrate .. //depot/projects/gdb/sys/ia64/ia64/db_trace.c#6 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/gdb/sys/ia64/include/float.h#4 integrate .. //depot/projects/gdb/sys/ia64/include/pmap.h#7 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#14 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#22 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#20 integrate .. //depot/projects/gdb/sys/kern/subr_kdb.c#21 integrate .. //depot/projects/gdb/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf2.c#5 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/gdb/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/gdb/sys/net/if_clone.c#2 integrate .. //depot/projects/gdb/sys/net/netisr.c#2 integrate .. //depot/projects/gdb/sys/netatalk/at_control.c#5 integrate .. //depot/projects/gdb/sys/netatm/uni/unisig_subr.c#2 integrate .. //depot/projects/gdb/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/gdb/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/gdb/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/gdb/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/gdb/sys/pc98/i386/machdep.c#12 integrate .. //depot/projects/gdb/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/gdb/sys/powerpc/include/float.h#5 integrate .. //depot/projects/gdb/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/gdb/sys/sys/kdb.h#16 integrate .. //depot/projects/gdb/sys/sys/malloc.h#3 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#15 integrate .. //depot/projects/gdb/sys/sys/pipe.h#4 integrate .. //depot/projects/gdb/sys/sys/sched.h#6 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#12 integrate .. //depot/projects/gdb/sys/vm/vm_contig.c#7 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#13 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#13 integrate .. //depot/projects/gdb/sys/vm/vm_page.h#8 integrate .. //depot/projects/gdb/tools/regression/lib/libc/locale/Makefile#2 integrate .. //depot/projects/gdb/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/locale/test-towctrans.c#2 integrate .. //depot/projects/gdb/tools/regression/lib/libc/locale/test-wcsnrtombs.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/regex/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/msun/test-fenv.c#2 integrate .. //depot/projects/gdb/tools/regression/pipe/bigpipetest.c#2 integrate .. //depot/projects/gdb/tools/regression/pipe/pipe-fstatbug.c#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/gdb/usr.bin/fstat/fstat.c#5 integrate .. //depot/projects/gdb/usr.bin/lam/lam.c#2 integrate .. //depot/projects/gdb/usr.bin/look/look.1#4 integrate .. //depot/projects/gdb/usr.bin/look/look.c#2 integrate .. //depot/projects/gdb/usr.bin/make/cond.c#2 integrate .. //depot/projects/gdb/usr.bin/make/make.1#7 integrate .. //depot/projects/gdb/usr.bin/make/make.h#2 integrate .. //depot/projects/gdb/usr.bin/make/parse.c#5 integrate .. //depot/projects/gdb/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#11 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#24 integrate .. //depot/projects/gdb/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/arlib/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/ntp/config.h#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/doc/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/doc/ntp-genkeys.8#3 delete .. //depot/projects/gdb/usr.sbin/ntp/libntp/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntp-genkeys/Makefile#2 delete .. //depot/projects/gdb/usr.sbin/ntp/ntp-keygen/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/ntp/ntpd/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpdate/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpdc/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpq/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntptrace/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/scripts/mkver#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/scripts/ntptrace#1 branch .. //depot/projects/gdb/usr.sbin/ntp/sntp/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/ppp/physical.c#2 integrate .. //depot/projects/gdb/usr.sbin/pwd_mkdb/pwd_mkdb.c#2 integrate .. //depot/projects/gdb/usr.sbin/sysinstall/devices.c#2 integrate Differences ... ==== //depot/projects/gdb/bin/cat/cat.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.30 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.31 2004/07/20 05:47:06 tjr Exp $"); #include #include @@ -298,11 +298,11 @@ switch(flags & O_ACCMODE) { case O_RDONLY: if (shutdown(fd, SHUT_WR) == -1) - perror("cat"); + warn(NULL); break; case O_WRONLY: if (shutdown(fd, SHUT_RD) == -1) - perror("cat"); + warn(NULL); break; default: break; ==== //depot/projects/gdb/bin/df/df.1#7 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.35 2004/07/02 21:04:17 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.36 2004/07/20 18:24:47 csjp Exp $ .\" .Dd April 22, 2004 .Dt DF 1 @@ -149,7 +149,9 @@ .Sh BUGS The .Fl n -flag is ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. Also, if a mount +point is not accessible by the user, it is possible that the file system +information could be stale. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/gdb/bin/df/df.c#10 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.62 2004/06/04 09:30:51 das Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.63 2004/07/20 18:24:47 csjp Exp $"); #include #include @@ -298,7 +298,7 @@ static size_t regetmntinfo(struct statfs **mntbufp, long mntsize, const char **vfslist) { - int i, j; + int error, i, j; struct statfs *mntbuf; if (vfslist == NULL) @@ -308,10 +308,20 @@ for (j = 0, i = 0; i < mntsize; i++) { if (checkvfsname(mntbuf[i].f_fstypename, vfslist)) continue; - if (!nflag) - (void)statfs(mntbuf[i].f_mntonname,&mntbuf[j]); - else if (i != j) - mntbuf[j] = mntbuf[i]; + /* + * XXX statfs(2) can fail for various reasons. It may be + * possible that the user does not have access to the + * pathname, if this happens, we will fall back on + * "stale" filesystem statistics. + */ + error = statfs(mntbuf[i].f_mntonname, &mntbuf[j]); + if (nflag || error < 0) + if (i != j) { + if (error < 0) + warnx("%s stats possibly stale", + mntbuf[i].f_mntonname); + mntbuf[j] = mntbuf[i]; + } j++; } return (j); ==== //depot/projects/gdb/bin/ps/print.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); #include #include @@ -785,7 +785,7 @@ v = ve->var; string = NULL; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); goto out; } error = mac_get_pid(k->ki_p->ki_pid, proclabel); @@ -811,7 +811,7 @@ int error, size = 0; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); return (0); } error = mac_get_pid(k->ki_p->ki_pid, proclabel); ==== //depot/projects/gdb/contrib/ntp/COPYRIGHT#2 (text+ko) ==== @@ -1,17 +1,19 @@ -This file is automatically generated from html/copyright.htm +This file is automatically generated from html/copyright.html Copyright Notice - - [sheepb.jpg] "Clone me," says Dolly sheepishly + + jpg "Clone me," says Dolly sheepishly + + Last update: 15:44 UTC Tuesday, July 15, 2003 _________________________________________________________________ - + The following copyright notice applies to all files collectively called the Network Time Protocol Version 4 Distribution. Unless specifically declared otherwise in an individual file, this notice applies as if the text was explicitly included in the file. *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2001 * +* Copyright (c) David L. Mills 1992-2003 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose and without fee is hereby * @@ -30,144 +32,145 @@ The following individuals contributed in part to the Network Time Protocol Distribution Version 4 and are acknowledged as authors of this work. - 1. [1]Mark Andrews Leitch atomic clock + 1. [1]Mark Andrews Leitch atomic clock controller 2. [2]Bernd Altmeier hopf Elektronik serial line and PCI-bus devices 3. [3]Viraj Bais and [4]Clayton Kirkwood port to WindowsNT 3.5 4. [5]Michael Barone GPSVME fixes - 5. [6]Karl Berry syslog to file option - 6. [7]Greg Brackley Major rework of WINNT + 5. [6]Jean-Francois Boudreault + IPv6 support + 6. [7]Karl Berry syslog to file option + 7. [8]Greg Brackley Major rework of WINNT port. Clean up recvbuf and iosignal code into separate modules. - 7. [8]Marc Brett Magnavox GPS clock driver - 8. [9]Piete Brooks MSF clock driver, + 8. [9]Marc Brett Magnavox GPS clock driver + 9. [10]Piete Brooks MSF clock driver, Trimble PARSE support - 9. [10]Reg Clemens Oncore driver (Current maintainer) - 10. [11]Steve Clift OMEGA clock driver - 11. [12]Casey Crellin vxWorks (Tornado) port and + 10. [11]Reg Clemens Oncore driver (Current maintainer) + 11. [12]Steve Clift OMEGA clock driver + 12. [13]Casey Crellin vxWorks (Tornado) port and help with target configuration - 12. [13]Sven Dietrich Palisade reference + 13. [14]Sven Dietrich Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port. - 13. [14]John A. Dundas III Apple A/UX port - 14. [15]Torsten Duwe Linux + 14. [15]John A. Dundas III Apple A/UX port + 15. [16]Torsten Duwe Linux port - 15. [16]Dennis Ferguson foundation code for + 16. [17]Dennis Ferguson foundation code for NTP Version 2 as specified in RFC-1119 - 16. [17]Glenn Hollinger GOES clock driver - 17. [18]Mike Iglesias DEC Alpha port - 18. [19]Jim Jagielski A/UX port - 19. [20]Jeff Johnson massive prototyping + 17. [18]John Hay IPv6 support and testing + 18. [19]Glenn Hollinger GOES clock driver + 19. [20]Mike Iglesias DEC Alpha port + 20. [21]Jim Jagielski A/UX port + 21. [22]Jeff Johnson massive prototyping overhaul - 20. [21]Hans Lambermont or - [22] ntpsweep - 21. [23]Poul-Henning Kamp Oncore driver (Original + 22. [23]Hans Lambermont or + [24] ntpsweep + 23. [25]Poul-Henning Kamp Oncore driver (Original author) - 22. [24]Frank Kardel [25] + 24. [26]Frank Kardel [27] PARSE driver (14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup - 23. [26]William L. Jones RS/6000 AIX + 25. [28]William L. Jones RS/6000 AIX modifications, HPUX modifications - 24. [27]Dave Katz RS/6000 AIX port - 25. [28]Craig Leres 4.4BSD port, ppsclock, Magnavox + 26. [29]Dave Katz RS/6000 AIX port + 27. [30]Craig Leres 4.4BSD port, ppsclock, Magnavox GPS clock driver - 26. [29]George Lindholm SunOS 5.1 port - 27. [30]Louis A. Mamakos MD5-based authentication - 28. [31]Lars H. Mathiesen adaptation of foundation + 28. [31]George Lindholm SunOS 5.1 port + 29. [32]Louis A. Mamakos MD5-based authentication + 30. [33]Lars H. Mathiesen adaptation of foundation code for Version 3 as specified in RFC-1305 - 29. [32]David L. Mills Version 4 foundation: clock + 31. [34]Danny Mayer Network I/O, Windows Port, Code + Maintenance + 32. [35]David L. Mills Version 4 foundation: clock discipline, authentication, precision kernel; clock drivers: Spectracom, Austron, Arbiter, Heath, ATOM, ACTS, KSI/Odetics; audio clock drivers: CHU, WWV/H, IRIG - 30. [33]Wolfgang Moeller VMS port - 31. [34]Jeffrey Mogul ntptrace utility - 32. [35]Tom Moore i386 svr4 port - 33. [36]Kamal A Mostafa SCO OpenServer port - 34. [37]Derek Mulcahy and [38]Damon + 33. [36]Wolfgang Moeller VMS port + 34. [37]Jeffrey Mogul ntptrace utility + 35. [38]Tom Moore i386 svr4 port + 36. [39]Kamal A Mostafa SCO OpenServer port + 37. [40]Derek Mulcahy and [41]Damon Hart-Davis ARCRON MSF clock driver - 35. [39]Rainer Pruy + 38. [42]Rainer Pruy monitoring/trap scripts, statistics file handling - 36. [40]Dirce Richards Digital UNIX V4.0 port - 37. [41]Wilfredo Sánchez added support for + 39. [43]Dirce Richards Digital UNIX V4.0 port + 40. [44]Wilfredo Sánchez added support for NetInfo - 38. [42]Nick Sayer SunOS streams modules - 39. [43]Jack Sasportas Saved a Lot of + 41. [45]Nick Sayer SunOS streams modules + 42. [46]Jack Sasportas Saved a Lot of space on the stuff in the html/pic/ subdirectory - 40. [44]Ray Schnitzler Unixware1 port - 41. [45]Michael Shields USNO clock driver - 42. [46]Jeff Steinman Datum PTS clock + 43. [47]Ray Schnitzler Unixware1 port + 44. [48]Michael Shields USNO clock driver + 45. [49]Jeff Steinman Datum PTS clock driver - 43. [47]Harlan Stenn GNU automake/autoconfigure + 46. [50]Harlan Stenn GNU automake/autoconfigure makeover, various other bits (see the ChangeLog) - 44. [48]Kenneth Stone HP-UX port - 45. [49]Ajit Thyagarajan IP multicast/anycast + 47. [51]Kenneth Stone HP-UX port + 48. [52]Ajit Thyagarajan IP multicast/anycast support - 46. [50]Tomoaki TSURUOKA TRAK clock + 49. [53]Tomoaki TSURUOKA TRAK clock driver - 47. [51]Paul A Vixie TrueTime GPS driver, generic + 50. [54]Paul A Vixie TrueTime GPS driver, generic >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 21 20:30:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A42D916A4D0; Wed, 21 Jul 2004 20:30:32 +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 7D57416A4CE for ; Wed, 21 Jul 2004 20:30:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74D9C43D3F for ; Wed, 21 Jul 2004 20:30:32 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6LKUWYf070268 for ; Wed, 21 Jul 2004 20:30:32 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6LKUWrH070264 for perforce@freebsd.org; Wed, 21 Jul 2004 20:30:32 GMT (envelope-from julian@freebsd.org) Date: Wed, 21 Jul 2004 20:30:32 GMT Message-Id: <200407212030.i6LKUWrH070264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 57869 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: Wed, 21 Jul 2004 20:30:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=57869 Change 57869 by julian@julian_desk on 2004/07/21 20:29:40 Learn to spell "concurrency" Affected files ... .. //depot/projects/nsched/sys/kern/kern_exec.c#8 edit .. //depot/projects/nsched/sys/kern/kern_exit.c#15 edit .. //depot/projects/nsched/sys/kern/kern_kse.c#19 edit .. //depot/projects/nsched/sys/kern/kern_thr.c#11 edit .. //depot/projects/nsched/sys/kern/kern_thread.c#29 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#28 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#16 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -268,7 +268,7 @@ * upcalls and kses we may have picked up along the way. */ mtx_lock_spin(&sched_lock); - sched_set_concurrancy(td->td_ksegrp, 1); + sched_set_concurrency(td->td_ksegrp, 1); upcall_remove(td); mtx_unlock_spin(&sched_lock); p->p_flag &= ~(P_SA|P_HADTHREADS); ==== //depot/projects/nsched/sys/kern/kern_exit.c#15 (text+ko) ==== @@ -168,7 +168,7 @@ * Turn off threading support. */ mtx_lock_spin(&sched_lock); - sched_set_concurrancy(td->td_ksegrp, 1); + sched_set_concurrency(td->td_ksegrp, 1); upcall_remove(td); mtx_unlock_spin(&sched_lock); p->p_flag &= ~(P_SA|P_HADTHREADS); ==== //depot/projects/nsched/sys/kern/kern_kse.c#19 (text+ko) ==== @@ -313,7 +313,7 @@ * would have been discarded in previous calls to thread_exit(). * Effectively we have left threading mode.. * The only real thing left to do is ensure that the - * scheduler sets out concurrancy back to 1 as that may be a + * scheduler sets out concurrency back to 1 as that may be a * resource leak otherwise. * This is an A[PB]I issue.. what SHOULD we do? * One possibility is to return to the user. It may not cope well. @@ -321,7 +321,7 @@ */ p->p_flag &= ~P_SA; mtx_unlock_spin(&sched_lock); - sched_set_concurrancy(td->td_ksegrp, 1); + sched_set_concurrency(td->td_ksegrp, 1); PROC_UNLOCK(p); #if 1 return (0); @@ -552,7 +552,7 @@ /* * Initialize KSE group * - * For multiplxed group, set concurrancy equal to physical + * For multiplxed group, set concurrency equal to physical * cpus. This increases concurrent even if userland * is not MP safe and can only run on single CPU. * In ideal world, every physical cpu should execute a thread. @@ -567,7 +567,7 @@ * kind of group will never schedule an upcall when blocked, * this intends to simulate pthread system scope thread. */ - sched_set_concurrancy(newkg, ncpus); + sched_set_concurrency(newkg, ncpus); } newku = upcall_alloc(); newku->ku_mailbox = uap->mbx; ==== //depot/projects/nsched/sys/kern/kern_thr.c#11 (text+ko) ==== @@ -151,7 +151,7 @@ ncpus = mp_ncpus; if (virtual_cpu != 0) ncpus = virtual_cpu; - sched_set_concurrancy(td->td_ksegrp, ncpus); + sched_set_concurrency(td->td_ksegrp, ncpus); td->td_proc->p_flag |= P_HADTHREADS; } PROC_UNLOCK(td->td_proc); ==== //depot/projects/nsched/sys/kern/kern_thread.c#29 (text+ko) ==== @@ -603,7 +603,7 @@ td->td_ksegrp = NULL; PCPU_SET(deadthread, td); } else { - sched_set_concurrancy(kg, 1); + sched_set_concurrency(kg, 1); } } td->td_state = TDS_INACTIVE; ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#28 (text+ko) ==== @@ -116,12 +116,12 @@ /* to the system scheduler */ int skg_runq_threads; /* (j) Num KSEs on runq. */ int skg_avail_opennings; /* (j) Num KSEs on iq. */ - int skg_concurrancy; /* (j) desired concurrancy */ + int skg_concurrency; /* (j) desired concurrency */ }; #define kg_last_assigned kg_sched->skg_last_assigned #define kg_runq_threads kg_sched->skg_runq_threads #define kg_avail_opennings kg_sched->skg_avail_opennings -#define kg_concurrancy kg_sched->skg_concurrancy +#define kg_concurrency kg_sched->skg_concurrency /**************************************************************** @@ -813,7 +813,7 @@ newstd->std_state = STDS_THREAD; newstd->std_cpticks = 0; - newtd->td_ksegrp->kg_concurrancy = 1; + newtd->td_ksegrp->kg_concurrency = 1; /* non threaded process. ignore thread fairness stuff */ newtd->td_ksegrp->kg_avail_opennings = 1; /* Our child inherrits our estimated cpu requirement */ @@ -829,7 +829,7 @@ void sched_fork_ksegrp(struct thread *td, struct ksegrp *newkg) { - newkg->kg_concurrancy = 1; + newkg->kg_concurrency = 1; newkg->kg_avail_opennings = 1; newkg->kg_estcpu = td->td_ksegrp->kg_estcpu; } @@ -1215,7 +1215,7 @@ */ td_sched0.std_oncpu = NOCPU; /* wrong.. can we use PCPU(cpuid) yet? */ td_sched0.std_state = STDS_THREAD; - kg_sched0.skg_concurrancy = 1; + kg_sched0.skg_concurrency = 1; kg_sched0.skg_avail_opennings = 0; /* we are already running */ } @@ -1283,7 +1283,7 @@ kg->kg_runq_threads = 0; /* XXXKSE change name */ kg->kg_avail_opennings = 1; - kg->kg_concurrancy = 1; + kg->kg_concurrency = 1; } /* @@ -1316,13 +1316,13 @@ kg = FIRST_KSEGRP_IN_PROC(p); - KASSERT((kg->kg_concurrancy == 1), ("Cached proc with > 1 opennings ")); + KASSERT((kg->kg_concurrency == 1), ("Cached proc with > 1 opennings ")); } /* * (Re) assign resources to allow the ksegrp to implement - * teh requested concurrancy. At this time it means allocating + * teh requested concurrency. At this time it means allocating * or freeing KSE structures. * Called from: * kern_execve() (reverting to non threaded) @@ -1333,15 +1333,15 @@ * kse_create() (increasing) */ void -sched_set_concurrancy(struct ksegrp *kg, int concurrancy) +sched_set_concurrency(struct ksegrp *kg, int concurrency) { struct kg_sched *skg; skg = kg->kg_sched; mtx_lock_spin(&sched_lock); - if (concurrancy > skg->skg_concurrancy) { - skg->skg_concurrancy = concurrancy; - skg->skg_avail_opennings += concurrancy - skg->skg_concurrancy; + if (concurrency > skg->skg_concurrency) { + skg->skg_concurrency = concurrency; + skg->skg_avail_opennings += concurrency - skg->skg_concurrency; slot_fill(kg); } else { /* @@ -1349,8 +1349,8 @@ * they'll just get used up as they run. * XXXKSE Make this a true statement.. */ - skg->skg_concurrancy = concurrancy; - skg->skg_avail_opennings += concurrancy - skg->skg_concurrancy; + skg->skg_concurrency = concurrency; + skg->skg_avail_opennings += concurrency - skg->skg_concurrency; if (skg->skg_avail_opennings < 0) skg->skg_avail_opennings = 0; } @@ -1562,7 +1562,7 @@ * Given a surplus system slot, try assign a new runnable thread to it. * Called from: * sched_thread_exit() (local) - * sched_set_concurrancy() (local) + * sched_set_concurrency() (local) * sched_switch() (local) * sched_thread_exit() (local) * remrunqueue() (local) (commented out) @@ -1697,7 +1697,7 @@ /* * Decide whether to pass this newly runnable thread on to the - * system scheduler. This basically implements the concurrancy + * system scheduler. This basically implements the concurrency * limit for a KSE. (e.g. "threading fairness") * Called from: * kick_init() ==== //depot/projects/nsched/sys/kern/sched_ule.c#16 (text+ko) ==== @@ -285,7 +285,7 @@ int skg_runq_kses; /* (j) Num KSEs on runq. */ int skg_idle_kses; /* (j) Num KSEs on iq. */ int skg_kses; /* (j) Num KSEs in group. */ - int skg_concurrancy; /* (j) desired concurrancy */ + int skg_concurrency; /* (j) desired concurrency */ }; #define kg_slptime kg_sched->skg_slptime @@ -2195,7 +2195,7 @@ * sched_newproc() (local) * sched_thr_newthread() (local) * schedinit() (local) - * sched_set_concurrancy() (local) + * sched_set_concurrency() (local) * */ static void @@ -2275,7 +2275,7 @@ * Called from: * sched_destroyproc() * sched_thr_exit() - * sched_set_concurrancy() via REDUCE_KSES() + * sched_set_concurrency() via REDUCE_KSES() * kse_reassign() via REDUCE_KSES() */ static void @@ -2299,13 +2299,13 @@ } /* - * Whenever we have idle KSEs and there are too many for the concurrancy, + * Whenever we have idle KSEs and there are too many for the concurrency, * then free as many as we can. Don't free too many if we have threads * to run/kill. */ #define REDUCE_KSES(kg, skg) \ do { \ - while ((skg->skg_concurrancy < skg->skg_kses) && \ + while ((skg->skg_concurrency < skg->skg_kses) && \ (skg->skg_idle_kses > 0) && \ (skg->skg_kses > kg->kg_numthreads)) { \ kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ @@ -2338,7 +2338,7 @@ /* * (Re) assign resources to allow the ksegrp to implement - * teh requested concurrancy. At this time it means allocating + * teh requested concurrency. At this time it means allocating * or freeing KSE structures. * Called from: * kern_execve() (reverting to non threaded) @@ -2349,15 +2349,15 @@ * kse_create() (increasing) */ void -sched_set_concurrancy(struct ksegrp *kg, int concurrancy) +sched_set_concurrency(struct ksegrp *kg, int concurrency) { struct kse *newke; struct kg_sched *skg; skg = kg->kg_sched; - skg->skg_concurrancy = concurrancy; + skg->skg_concurrency = concurrency; REDUCE_KSES(kg, skg); - while (skg->skg_kses < skg->skg_concurrancy) { + while (skg->skg_kses < skg->skg_concurrency) { newke = kse_alloc(); bzero(&newke->ke_startzero, RANGEOF(struct kse, ke_startzero, ke_endzero)); @@ -2470,7 +2470,7 @@ * Assumes that the original thread is not runnable. * Called from: * sched_thread_exit() (local) - * sched_set_concurrancy() (local) + * sched_set_concurrency() (local) * sched_switch() (local) * sched_thread_exit() (local) * remrunqueue() (local) (commented out) @@ -2618,7 +2618,7 @@ /* * Decide whether to pass this newly runnable thread on to the - * system scheduler. This basically implements the concurrancy + * system scheduler. This basically implements the concurrency * limit for a KSE. (e.g. "threading fairness") * Called from: * kick_init() From owner-p4-projects@FreeBSD.ORG Thu Jul 22 07:09:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBF4016A4D0; Thu, 22 Jul 2004 07:09:49 +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 A575F16A4CE for ; Thu, 22 Jul 2004 07:09:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D08F43D2D for ; Thu, 22 Jul 2004 07:09:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6M79lfe090062 for ; Thu, 22 Jul 2004 07:09:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6M79k5P090059 for perforce@freebsd.org; Thu, 22 Jul 2004 07:09:46 GMT (envelope-from marcel@freebsd.org) Date: Thu, 22 Jul 2004 07:09:46 GMT Message-Id: <200407220709.i6M79k5P090059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57906 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: Thu, 22 Jul 2004 07:09:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=57906 Change 57906 by marcel@marcel_nfs on 2004/07/22 07:08:50 kgdb #2. This implementation is based on kgdb #1 that's in src/usr.bin/kgdb. This implementation links against libgdb directly instead of using the remote protocol as IPC with gdb(1). For that reason kgdb #2 is in src/gnu/usr.bin/gdb. The advantage of linking against libgdb is that we can make use of all the hooks that libgdb provides us, as well as push our own target onto the target stack and install a frame sniffer to deal with trapframes. It is also expected that this approach allows us to support relocatable kernel modules, although I have no clue how ATM. These new files provide: o A minimal manpage (can't be bad). o An implementation for main() that invokes gdb_main(). This gives us the debugger prompt and all the functionality that one is used to. o A gdb init hook that sets the prompt and loads the selected kernel as the symbol file. o The loading of the core file with -lkvm. o The kernel thread support functions. What is needed to make it a functional kernel debugger: o A new target that groks the kernel threads, uses -lkvm to read from the core file and provides for the necessary register fetching. o Some smartness to automaticly load the kernel modules as additional symbol files. o A bunch of commands to aid in debugging. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.1#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 22 12:18:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB98A16A4D0; Thu, 22 Jul 2004 12:18:02 +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 C426416A4CE for ; Thu, 22 Jul 2004 12:18:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC90243D53 for ; Thu, 22 Jul 2004 12:18:02 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MCI2ko099975 for ; Thu, 22 Jul 2004 12:18:02 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MCI2wP099972 for perforce@freebsd.org; Thu, 22 Jul 2004 12:18:02 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 12:18:02 GMT Message-Id: <200407221218.i6MCI2wP099972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57918 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: Thu, 22 Jul 2004 12:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=57918 Change 57918 by dfr@dfr_home on 2004/07/22 12:17:16 Add support for small amounts of static TLS use by dynamic modules. Required for NVidia libGL. Affected files ... .. //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#6 edit .. //depot/projects/kse/libexec/rtld-elf/i386/rtld_machdep.h#6 edit .. //depot/projects/kse/libexec/rtld-elf/ia64/rtld_machdep.h#3 edit .. //depot/projects/kse/libexec/rtld-elf/map_object.c#4 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.c#9 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.h#5 edit Differences ... ==== //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#6 (text+ko) ==== @@ -239,6 +239,22 @@ if (def == NULL) goto done; + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + goto done; + } + } + *where += (Elf_Addr) (def->st_value - defobj->tlsoffset); } break; @@ -332,6 +348,35 @@ return 0; } +bool +allocate_tls_offset(Obj_Entry *obj) +{ + size_t off; + + if (obj->tlsindex == 1) + off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); + else + off = calculate_tls_offset(tls_last_offset, tls_last_size, + obj->tlssize, obj->tlsalign); + + /* + * If we have already fixed the size of the static TLS block, we + * must stay within that size. When allocating the static TLS, we + * leave a small amount of space spare to be used for dynamically + * loading modules which use static TLS. + */ + if (tls_static_space) { + if (calculate_tls_end(off, obj->tlssize) > tls_static_space) + return false; + } + + tls_last_offset = obj->tlsoffset = off; + tls_last_size = obj->tlssize; + obj->tls_done = true; + + return true; +} + void * allocate_tls(Objlist* list, size_t tcbsize, size_t tcbalign) { @@ -340,15 +385,9 @@ size_t size; char *tls; Elf_Addr *dtv; - Elf_Addr segbase; + Elf_Addr segbase, addr; - size = 0; - STAILQ_FOREACH(entry, list, link) { - obj = entry->obj; - if (obj->tlsoffset > size) - size = obj->tlsoffset; - } - size = round(size, tcbalign); + size = round(tls_static_space, tcbalign); assert(tcbsize >= 2*sizeof(Elf_Addr)); tls = malloc(size + tcbsize); @@ -362,12 +401,16 @@ dtv[1] = tls_max_index; STAILQ_FOREACH(entry, list, link) { obj = entry->obj; - Elf_Addr addr = segbase - obj->tlsoffset; - memset((void*) (addr + obj->tlsinitsize), - 0, obj->tlssize - obj->tlsinitsize); - if (obj->tlsinit) - memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); - dtv[obj->tlsindex] = addr; + if (obj->tlsoffset) { + addr = segbase - obj->tlsoffset; + memset((void*) (addr + obj->tlsinitsize), + 0, obj->tlssize - obj->tlsinitsize); + if (obj->tlsinit) + memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); + dtv[obj->tlsindex + 1] = addr; + } else if (obj->tlsindex) { + dtv[obj->tlsindex + 1] = 0; + } } return (void*) segbase; @@ -376,8 +419,6 @@ void free_tls(Objlist *list, void *tls, size_t tcbsize, size_t tcbalign) { - Objlist_Entry *entry; - Obj_Entry *obj; size_t size; Elf_Addr* dtv; int dtvsize, i; @@ -387,13 +428,7 @@ * Figure out the size of the initial TLS block so that we can * find stuff which ___tls_get_addr() allocated dynamically. */ - size = 0; - STAILQ_FOREACH(entry, list, link) { - obj = entry->obj; - if (obj->tlsoffset > size) - size = obj->tlsoffset; - } - size = round(size, tcbalign); + size = round(tls_static_space, tcbalign); dtv = ((Elf_Addr**)tls)[1]; dtvsize = dtv[1]; @@ -411,10 +446,18 @@ void allocate_initial_tls(Objlist *list) { - void* tls = allocate_tls(list, 2*sizeof(Elf_Addr), 4); + void* tls; union descriptor ldt; int sel; + /* + * Fix the size of the static TLS block by using the maximum + * offset allocated so far and adding a bit for dynamic modules to + * use. + */ + tls_static_space = tls_last_offset + 64; + tls = allocate_tls(list, 2*sizeof(Elf_Addr), 4); + memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((Elf_Addr)tls) & 0xffffff; ==== //depot/projects/kse/libexec/rtld-elf/i386/rtld_machdep.h#6 (text+ko) ==== @@ -64,6 +64,7 @@ round(size, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ round((prev_offset) + (size), align) +#define calculate_tls_end(off, size) (off) typedef struct { unsigned long ti_module; ==== //depot/projects/kse/libexec/rtld-elf/ia64/rtld_machdep.h#3 (text+ko) ==== @@ -61,6 +61,7 @@ round(16, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ round(prev_offset + prev_size, align) +#define calculate_tls_end(off, size) ((off) + (size)) extern void *__tls_get_addr(unsigned long module, unsigned long offset); ==== //depot/projects/kse/libexec/rtld-elf/map_object.c#4 (text+ko) ==== @@ -237,18 +237,9 @@ tls_dtv_generation++; obj->tlsindex = ++tls_max_index; obj->tlssize = phtls->p_memsz; + obj->tlsalign = phtls->p_align; obj->tlsinitsize = phtls->p_filesz; obj->tlsinit = mapbase + phtls->p_vaddr; - if (obj->tlsindex == 1) - obj->tlsoffset = calculate_first_tls_offset(phtls->p_memsz, - phtls->p_align); - else - obj->tlsoffset = calculate_tls_offset(tls_last_offset, - tls_last_size, - phtls->p_memsz, - phtls->p_align); - tls_last_offset = obj->tlsoffset; - tls_last_size = obj->tlssize; } return obj; } ==== //depot/projects/kse/libexec/rtld-elf/rtld.c#9 (text+ko) ==== @@ -201,8 +201,9 @@ /* * Globals to control TLS allocation. */ -size_t tls_last_offset; /* TLS offset of last module */ -size_t tls_last_size; /* TLS size of last module */ +size_t tls_last_offset; /* Static TLS offset of last module */ +size_t tls_last_size; /* Static TLS size of last module */ +size_t tls_static_space; /* Static TLS space allocated */ int tls_dtv_generation = 1; /* Used to detect when dtv size changes */ int tls_max_index = 1; /* Largest module index allocated */ @@ -751,11 +752,8 @@ case PT_TLS: obj->tlsindex = 1; - obj->tlsoffset = calculate_first_tls_offset(ph->p_memsz, - ph->p_align); - tls_last_offset = obj->tlsoffset; - tls_last_size = obj->tlssize; obj->tlssize = ph->p_memsz; + obj->tlsalign = ph->p_align; obj->tlsinitsize = ph->p_filesz; obj->tlsinit = (void*) ph->p_vaddr; break; ==== //depot/projects/kse/libexec/rtld-elf/rtld.h#5 (text+ko) ==== @@ -65,6 +65,7 @@ extern size_t tls_last_offset; extern size_t tls_last_size; +extern size_t tls_static_space; extern int tls_dtv_generation; extern int tls_max_index; @@ -147,7 +148,8 @@ void *tlsinit; /* Base address of TLS init block */ size_t tlsinitsize; /* Size of TLS init block for this module */ size_t tlssize; /* Size of TLS block for this module */ - size_t tlsoffset; /* Offset of TLS block for this module */ + size_t tlsoffset; /* Offset of static TLS block for this module */ + size_t tlsalign; /* Alignment of static TLS block */ /* Items from the dynamic section. */ Elf_Addr *pltgot; /* PLT or GOT, depending on architecture */ @@ -182,6 +184,7 @@ bool traced; /* Already printed in ldd trace output */ bool jmpslots_done; /* Already have relocated the jump slots */ bool init_done; /* Already have added object to init list */ + bool tls_done; /* Already allocated offset for static TLS */ struct link_map linkmap; /* for GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ @@ -238,6 +241,7 @@ int reloc_non_plt(Obj_Entry *, Obj_Entry *); int reloc_plt(Obj_Entry *); int reloc_jmpslots(Obj_Entry *); +bool allocate_tls_offset(Obj_Entry *obj); void *allocate_tls(Objlist *, size_t, size_t); void free_tls(Objlist *, void *, size_t, size_t); void allocate_initial_tls(Objlist *); From owner-p4-projects@FreeBSD.ORG Thu Jul 22 13:17:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8F8816A4D0; Thu, 22 Jul 2004 13:17:14 +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 7ACD216A4CE for ; Thu, 22 Jul 2004 13:17:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60C2F43D4C for ; Thu, 22 Jul 2004 13:17:14 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MDHE0M001718 for ; Thu, 22 Jul 2004 13:17:14 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MDHDpg001715 for perforce@freebsd.org; Thu, 22 Jul 2004 13:17:13 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 13:17:13 GMT Message-Id: <200407221317.i6MDHDpg001715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57919 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: Thu, 22 Jul 2004 13:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=57919 Change 57919 by dfr@dfr_home on 2004/07/22 13:16:57 Add dynamic static TLS support for ia64 (untested). Affected files ... .. //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#4 edit Differences ... ==== //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#4 (text+ko) ==== @@ -319,6 +319,22 @@ if (def == NULL) return -1; + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + return -1; + } + } + store64(where, defobj->tlsoffset + def->st_value + rela->r_addend); break; } @@ -600,6 +616,35 @@ pltres[2] = FPTR_GP(_rtld_bind_start); } +bool +allocate_tls_offset(Obj_Entry *obj) +{ + size_t off; + + if (obj->tlsindex == 1) + off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); + else + off = calculate_tls_offset(tls_last_offset, tls_last_size, + obj->tlssize, obj->tlsalign); + + /* + * If we have already fixed the size of the static TLS block, we + * must stay within that size. When allocating the static TLS, we + * leave a small amount of space spare to be used for dynamically + * loading modules which use static TLS. + */ + if (tls_static_space) { + if (calculate_tls_end(off, obj->tlssize) > tls_static_space) + return false; + } + + tls_last_offset = obj->tlsoffset = off; + tls_last_size = obj->tlssize; + obj->tls_done = true; + + return true; +} + void allocate_tls(Objlist *list, size_t tcbsize, size_t tcbalign) { @@ -609,18 +654,13 @@ char *tls; Elf_Addr *dtv; union descriptor ldt; - Elf_Addr segbase; + Elf_Addr segbase, addr; int sel; assert(tcbsize == 16); assert(tcbalign == 16); - size = 0; - STAILQ_FOREACH(entry, list, link) { - obj = entry->obj; - if (obj->tlsoffset + obj->tlssize > size) - size = obj->tlsoffset + obj->tlssize; - } + size = tls_static_space; tls = malloc(size); dtv = malloc((tls_max_index + 2) * sizeof(Elf_Addr)); @@ -629,13 +669,18 @@ dtv[0] = tls_dtv_generation; dtv[1] = tls_max_index; - for (obj = list; obj; obj = obj->next) { - Elf_Addr addr = tls + obj->tlsoffset; - memset((void*) (addr + obj->tlsinitsize), - 0, obj->tlssize - obj->tlsinitsize); - if (obj->tlsinit) - memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); - dtv[obj->tlsindex] = addr; + STAILQ_FOREACH(entry, list, link) { + obj = entry->obj; + if (obj->tlsoffset) { + addr = tls + obj->tlsoffset; + memset((void*) (addr + obj->tlsinitsize), + 0, obj->tlssize - obj->tlsinitsize); + if (obj->tlsinit) + memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); + dtv[obj->tlsindex + 1] = addr; + } else if (obj->tlsindex) { + dtv[obj->tlsindex + 1] = 0; + } } return tls; @@ -644,8 +689,6 @@ void free_tls(Objlist *list, void *tls, size_t tcbsize, size_t tcbalign) { - Objlist_Entry *entry; - Obj_Entry *obj; size_t size; Elf_Addr* dtv; int dtvsize, i; @@ -655,12 +698,7 @@ * Figure out the size of the initial TLS block so that we can * find stuff which __tls_get_addr() allocated dynamically. */ - size = 0; - STAILQ_FOREACH(entry, list, link) { - obj = entry->obj; - if (obj->tlsoffset + obj->tlssize > size) - size = obj->tlsoffset + obj->tlssize; - } + size = tls_static_space; dtv = ((Elf_Addr**)tls)[0]; dtvsize = dtv[1]; @@ -680,6 +718,13 @@ { register struct Elf_Addr** tp __asm__("r13"); + /* + * Fix the size of the static TLS block by using the maximum + * offset allocated so far and adding a bit for dynamic modules to + * use. + */ + tls_static_space = tls_last_offset + tls_last_size + 64; + tp = allocate_tls(list, 16, 16); } From owner-p4-projects@FreeBSD.ORG Thu Jul 22 15:29:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5309B16A4D0; Thu, 22 Jul 2004 15:29:56 +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 EE26716A4CE for ; Thu, 22 Jul 2004 15:29:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D53F243D2D for ; Thu, 22 Jul 2004 15:29:55 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MFTtq9005505 for ; Thu, 22 Jul 2004 15:29:55 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MFTtx8005502 for perforce@freebsd.org; Thu, 22 Jul 2004 15:29:55 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 15:29:55 GMT Message-Id: <200407221529.i6MFTtx8005502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57924 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: Thu, 22 Jul 2004 15:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=57924 Change 57924 by dfr@dfr_home on 2004/07/22 15:29:39 Move allocate_tls_offset() to MI code. Affected files ... .. //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#7 edit .. //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#5 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.c#10 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.h#6 edit Differences ... ==== //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#7 (text+ko) ==== @@ -348,35 +348,6 @@ return 0; } -bool -allocate_tls_offset(Obj_Entry *obj) -{ - size_t off; - - if (obj->tlsindex == 1) - off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); - else - off = calculate_tls_offset(tls_last_offset, tls_last_size, - obj->tlssize, obj->tlsalign); - - /* - * If we have already fixed the size of the static TLS block, we - * must stay within that size. When allocating the static TLS, we - * leave a small amount of space spare to be used for dynamically - * loading modules which use static TLS. - */ - if (tls_static_space) { - if (calculate_tls_end(off, obj->tlssize) > tls_static_space) - return false; - } - - tls_last_offset = obj->tlsoffset = off; - tls_last_size = obj->tlssize; - obj->tls_done = true; - - return true; -} - void * allocate_tls(Objlist* list, size_t tcbsize, size_t tcbalign) { ==== //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#5 (text+ko) ==== @@ -616,35 +616,6 @@ pltres[2] = FPTR_GP(_rtld_bind_start); } -bool -allocate_tls_offset(Obj_Entry *obj) -{ - size_t off; - - if (obj->tlsindex == 1) - off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); - else - off = calculate_tls_offset(tls_last_offset, tls_last_size, - obj->tlssize, obj->tlsalign); - - /* - * If we have already fixed the size of the static TLS block, we - * must stay within that size. When allocating the static TLS, we - * leave a small amount of space spare to be used for dynamically - * loading modules which use static TLS. - */ - if (tls_static_space) { - if (calculate_tls_end(off, obj->tlssize) > tls_static_space) - return false; - } - - tls_last_offset = obj->tlsoffset = off; - tls_last_size = obj->tlssize; - obj->tls_done = true; - - return true; -} - void allocate_tls(Objlist *list, size_t tcbsize, size_t tcbalign) { ==== //depot/projects/kse/libexec/rtld-elf/rtld.c#10 (text+ko) ==== @@ -2525,6 +2525,35 @@ return p; } +bool +allocate_tls_offset(Obj_Entry *obj) +{ + size_t off; + + if (obj->tlsindex == 1) + off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); + else + off = calculate_tls_offset(tls_last_offset, tls_last_size, + obj->tlssize, obj->tlsalign); + + /* + * If we have already fixed the size of the static TLS block, we + * must stay within that size. When allocating the static TLS, we + * leave a small amount of space spare to be used for dynamically + * loading modules which use static TLS. + */ + if (tls_static_space) { + if (calculate_tls_end(off, obj->tlssize) > tls_static_space) + return false; + } + + tls_last_offset = obj->tlsoffset = off; + tls_last_size = obj->tlssize; + obj->tls_done = true; + + return true; +} + void * _rtld_allocate_tls(size_t tcbsize, size_t tcbalign) { ==== //depot/projects/kse/libexec/rtld-elf/rtld.h#6 (text+ko) ==== @@ -233,6 +233,7 @@ const Obj_Entry *, bool); void *tls_get_addr_common(Elf_Addr** dtvp, int index, size_t offset); void *allocate_module_tls(int index); +bool allocate_tls_offset(Obj_Entry *obj); /* * MD function declarations. @@ -241,7 +242,6 @@ int reloc_non_plt(Obj_Entry *, Obj_Entry *); int reloc_plt(Obj_Entry *); int reloc_jmpslots(Obj_Entry *); -bool allocate_tls_offset(Obj_Entry *obj); void *allocate_tls(Objlist *, size_t, size_t); void free_tls(Objlist *, void *, size_t, size_t); void allocate_initial_tls(Objlist *); From owner-p4-projects@FreeBSD.ORG Thu Jul 22 15:42:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B2A916A4D0; Thu, 22 Jul 2004 15:42:11 +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 D1A1716A4CE for ; Thu, 22 Jul 2004 15:42:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD6A543D54 for ; Thu, 22 Jul 2004 15:42:10 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MFgARv005917 for ; Thu, 22 Jul 2004 15:42:10 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MFgA1X005914 for perforce@freebsd.org; Thu, 22 Jul 2004 15:42:10 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 15:42:10 GMT Message-Id: <200407221542.i6MFgA1X005914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57925 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: Thu, 22 Jul 2004 15:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=57925 Change 57925 by dfr@dfr_home on 2004/07/22 15:41:26 Allocate all the initial load group from the static TLS block even if they don't use static TLS relocations. Affected files ... .. //depot/projects/kse/libexec/rtld-elf/rtld.c#11 edit Differences ... ==== //depot/projects/kse/libexec/rtld-elf/rtld.c#11 (text+ko) ==== @@ -245,6 +245,7 @@ Elf_Auxinfo *aux; Elf_Auxinfo *auxp; const char *argv0; + Objlist_Entry *entry; Obj_Entry *obj; Obj_Entry **preload_tail; Objlist initlist; @@ -411,6 +412,13 @@ /* setup TLS for main thread */ dbg("initializing initial thread local storage"); + STAILQ_FOREACH(entry, &list_main, link) { + /* + * Allocate all the initial objects out of the static TLS + * block even if they didn't ask for it. + */ + allocate_tls_offset(entry->obj); + } allocate_initial_tls(&list_main); /* Make a list of init functions to call. */ From owner-p4-projects@FreeBSD.ORG Thu Jul 22 16:03:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B2B416A4D0; Thu, 22 Jul 2004 16:03:38 +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 4FA5116A4CE for ; Thu, 22 Jul 2004 16:03:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49C0343D53 for ; Thu, 22 Jul 2004 16:03:38 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MG3chj006684 for ; Thu, 22 Jul 2004 16:03:38 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MG3bdm006681 for perforce@freebsd.org; Thu, 22 Jul 2004 16:03:37 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 16:03:37 GMT Message-Id: <200407221603.i6MG3bdm006681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57928 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: Thu, 22 Jul 2004 16:03:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=57928 Change 57928 by dfr@dfr_home on 2004/07/22 16:03:00 Add some defines for non-i386 arches and flesh out the amd64 support (untested). Affected files ... .. //depot/projects/kse/libexec/rtld-elf/alpha/rtld_machdep.h#3 edit .. //depot/projects/kse/libexec/rtld-elf/amd64/reloc.c#3 edit .. //depot/projects/kse/libexec/rtld-elf/amd64/rtld_machdep.h#3 edit .. //depot/projects/kse/libexec/rtld-elf/sparc64/reloc.c#3 edit .. //depot/projects/kse/libexec/rtld-elf/sparc64/rtld_machdep.h#4 edit Differences ... ==== //depot/projects/kse/libexec/rtld-elf/alpha/rtld_machdep.h#3 (text+ko) ==== @@ -66,6 +66,7 @@ round(16, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ round(prev_offset + prev_size, align) +#define calculate_tls_end(off, size) ((off) + (size)) typedef struct { unsigned long ti_module; ==== //depot/projects/kse/libexec/rtld-elf/amd64/reloc.c#3 (text+ko) ==== @@ -48,6 +48,15 @@ #include "debug.h" #include "rtld.h" +#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ +#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ +#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ +#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ +#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ +#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ +#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ +#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ + /* * Process the special R_X86_64_COPY relocations in the main program. These * copy data from a shared object into a region in the main program's BSS @@ -200,6 +209,108 @@ } break; + case R_X86_64_TPOFF64: + { + const Elf_Sym *def; + const Obj_Entry *defobj; + + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + false, cache); + if (def == NULL) + goto done; + + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + goto done; + } + } + + *where = (Elf_Addr) (def->st_value - defobj->tlsoffset); + } + break; + + case R_X86_64_TPOFF32: + { + const Elf_Sym *def; + const Obj_Entry *defobj; + + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + false, cache); + if (def == NULL) + goto done; + + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + goto done; + } + } + + *where32 = (Elf32_Addr) (def->st_value - defobj->tlsoffset); + } + break; + + case R_X86_64_DTPMOD64: + { + const Elf_Sym *def; + const Obj_Entry *defobj; + + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + false, cache); + if (def == NULL) + goto done; + + *where += (Elf_Addr) defobj->tlsindex; + } + break; + + case R_X86_64_DTPOFF64: + { + const Elf_Sym *def; + const Obj_Entry *defobj; + + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + false, cache); + if (def == NULL) + goto done; + + *where += (Elf_Addr) def->st_value; + } + break; + + case R_X86_64_DTPOFF32: + { + const Elf_Sym *def; + const Obj_Entry *defobj; + + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + false, cache); + if (def == NULL) + goto done; + + *where32 += (Elf32_Addr) def->st_value; + } + break; + case R_X86_64_RELATIVE: *where = (Elf_Addr)(obj->relocbase + rela->r_addend); break; @@ -267,24 +378,20 @@ return 0; } -void -allocate_initial_tls(Obj_Entry *list) +void * +allocate_tls(Objlist* list, size_t tcbsize, size_t tcbalign) { + Objlist_Entry *entry; Obj_Entry *obj; size_t size; char *tls; Elf_Addr *dtv; - union descriptor ldt; - Elf_Addr segbase; - int sel; + Elf_Addr segbase, addr; - size = 0; - for (obj = list; obj; obj = obj->next) { - if (obj->tlsoffset > size) - size = obj->tlsoffset; - } + size = round(tls_static_space, tcbalign); - tls = malloc(size + 2*sizeof(Elf_Addr)); + assert(tcbsize >= 2*sizeof(Elf_Addr)); + tls = malloc(size + tcbsize); dtv = malloc((tls_max_index + 2) * sizeof(Elf_Addr)); segbase = (Elf_Addr)(tls + size); @@ -293,16 +400,60 @@ dtv[0] = tls_dtv_generation; dtv[1] = tls_max_index; - for (obj = list; obj; obj = obj->next) { - Elf_Addr addr = segbase - obj->tlsoffset; - memset((void*) (addr + obj->tlsinitsize), - 0, obj->tlssize - obj->tlsinitsize); - if (obj->tlsinit) - memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); - dtv[obj->tlsindex] = addr; + STAILQ_FOREACH(entry, list, link) { + obj = entry->obj; + if (obj->tlsoffset) { + addr = segbase - obj->tlsoffset; + memset((void*) (addr + obj->tlsinitsize), + 0, obj->tlssize - obj->tlsinitsize); + if (obj->tlsinit) + memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); + dtv[obj->tlsindex + 1] = addr; + } else if (obj->tlsindex) { + dtv[obj->tlsindex + 1] = 0; + } + } + + return (void*) segbase; +} + +void +free_tls(Objlist *list, void *tls, size_t tcbsize, size_t tcbalign) +{ + size_t size; + Elf_Addr* dtv; + int dtvsize, i; + Elf_Addr tlsstart, tlsend; + + /* + * Figure out the size of the initial TLS block so that we can + * find stuff which ___tls_get_addr() allocated dynamically. + */ + size = round(tls_static_space, tcbalign); + + dtv = ((Elf_Addr**)tls)[1]; + dtvsize = dtv[1]; + tlsend = (Elf_Addr) tls; + tlsstart = tlsend - size; + for (i = 0; i < dtvsize; i++) { + if (dtv[i+2] < tlsstart || dtv[i+2] > tlsend) { + free((void*) dtv[i+2]); + } } - amd64_set_fsbase(segbase); + free((void*) tlsstart); +} + +void +allocate_initial_tls(Obj_Entry *list) +{ + /* + * Fix the size of the static TLS block by using the maximum + * offset allocated so far and adding a bit for dynamic modules to + * use. + */ + tls_static_space = tls_last_offset + 64; + amd64_set_fsbase(allocate_tls(list, 2*sizeof(Elf_Addr), 4)); } void *__tls_get_addr(tls_index *ti) ==== //depot/projects/kse/libexec/rtld-elf/amd64/rtld_machdep.h#3 (text+ko) ==== @@ -64,6 +64,7 @@ round(size, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ round((prev_offset) + (size), align) +#define calculate_tls_end(off, size) (off) typedef struct { unsigned long ti_module; ==== //depot/projects/kse/libexec/rtld-elf/sparc64/reloc.c#3 (text+ko) ==== ==== //depot/projects/kse/libexec/rtld-elf/sparc64/rtld_machdep.h#4 (text+ko) ==== @@ -58,6 +58,7 @@ round(size, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ round((prev_offset) + (size), align) +#define calculate_tls_end(off, size) ((off) + (size)) typedef struct { unsigned long ti_module; From owner-p4-projects@FreeBSD.ORG Thu Jul 22 16:09:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF8B616A4D0; Thu, 22 Jul 2004 16:09:46 +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 8A51616A4CE for ; Thu, 22 Jul 2004 16:09:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8606543D3F for ; Thu, 22 Jul 2004 16:09:46 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MG9kVe006914 for ; Thu, 22 Jul 2004 16:09:46 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MG9kDX006911 for perforce@freebsd.org; Thu, 22 Jul 2004 16:09:46 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 16:09:46 GMT Message-Id: <200407221609.i6MG9kDX006911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57930 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: Thu, 22 Jul 2004 16:09:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=57930 Change 57930 by dfr@dfr_home on 2004/07/22 16:09:46 Add support for amd64 TLS (untested). Affected files ... .. //depot/projects/kse/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 edit .. //depot/projects/kse/lib/libpthread/arch/amd64/include/pthread_md.h#3 edit Differences ... ==== //depot/projects/kse/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include +#include "rtld_tls.h" #include "pthread_md.h" /* @@ -38,19 +39,19 @@ { struct tcb *tcb; - if ((tcb = malloc(sizeof(struct tcb))) != NULL) { - bzero(tcb, sizeof(struct tcb)); + tcb = _rtld_allocate_tls(sizeof(struct tcb), 16); + if (tcb) { tcb->tcb_thread = thread; - /* Allocate TDV */ + bzero(&tcb->tcb_tmbx, sizeof(tcb->tcb_tmbx)); } + return (tcb); } void _tcb_dtor(struct tcb *tcb) { - /* Free TDV */ - free(tcb); + _rtld_free_tls(tcb, sizeof(struct tcb), 16); } struct kcb * ==== //depot/projects/kse/lib/libpthread/arch/amd64/include/pthread_md.h#3 (text+ko) ==== @@ -62,9 +62,10 @@ }; struct tcb { - struct tdv *tcb_tdv; + struct tcb *tcb_self; /* required by rtld */ + void *tcb_dtv; /* required by rtld */ struct pthread *tcb_thread; - void *tcb_spare[2]; /* align tcb_tmbx to 16 bytes */ + void *tcb_spare[1]; /* align tcb_tmbx to 16 bytes */ struct kse_thr_mailbox tcb_tmbx; }; From owner-p4-projects@FreeBSD.ORG Thu Jul 22 17:19:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D492C16A4D0; Thu, 22 Jul 2004 17:19:11 +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 B001916A4CE for ; Thu, 22 Jul 2004 17:19:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABD0543D39 for ; Thu, 22 Jul 2004 17:19:11 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MHJBV2008730 for ; Thu, 22 Jul 2004 17:19:11 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MHJBiV008727 for perforce@freebsd.org; Thu, 22 Jul 2004 17:19:11 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 17:19:11 GMT Message-Id: <200407221719.i6MHJBiV008727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57934 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: Thu, 22 Jul 2004 17:19:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=57934 Change 57934 by dfr@dfr_home on 2004/07/22 17:18:30 Add testcase for dynamically loading a module which uses static TLS. Affected files ... .. //depot/projects/kse/tools/regression/tls/Makefile#3 edit .. //depot/projects/kse/tools/regression/tls/ttls1/Makefile#2 edit .. //depot/projects/kse/tools/regression/tls/ttls3/Makefile#1 add .. //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#1 add .. //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#1 add .. //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#1 add Differences ... ==== //depot/projects/kse/tools/regression/tls/Makefile#3 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR=libxx libyy ttls1 ttls2 +SUBDIR=libxx libyy ttls1 ttls2 ttls3 .include ==== //depot/projects/kse/tools/regression/tls/ttls1/Makefile#2 (text+ko) ==== @@ -3,6 +3,7 @@ LDADD+= -L../libyy -lyy -Wl,--rpath=${.CURDIR}/../libyy LDADD+= -L${.CURDIR}/../../../../lib/libc -lc LDADD+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc +LDADD+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1 NOMAN= t DEBUG_FLAGS= -g From owner-p4-projects@FreeBSD.ORG Thu Jul 22 17:30:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EA1916A4D0; Thu, 22 Jul 2004 17:30:26 +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 EA1E616A4CE for ; Thu, 22 Jul 2004 17:30:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E31CB43D46 for ; Thu, 22 Jul 2004 17:30:25 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MHUPBL008995 for ; Thu, 22 Jul 2004 17:30:25 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MHUPC8008970 for perforce@freebsd.org; Thu, 22 Jul 2004 17:30:25 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 17:30:25 GMT Message-Id: <200407221730.i6MHUPC8008970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57935 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: Thu, 22 Jul 2004 17:30:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=57935 Change 57935 by dfr@dfr_home on 2004/07/22 17:29:41 IFC Affected files ... .. //depot/projects/kse/bin/ps/print.c#19 integrate .. //depot/projects/kse/include/wchar.h#13 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#11 integrate .. //depot/projects/kse/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/kse/lib/libc/locale/mbsnrtowcs.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#5 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#5 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.c#6 integrate .. //depot/projects/kse/lib/libc/locale/none.c#5 integrate .. //depot/projects/kse/lib/libc/locale/setrunelocale.c#7 integrate .. //depot/projects/kse/lib/libc/locale/table.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wcsnrtombs.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcsrtombs.3#5 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wcstombs.c#6 integrate .. //depot/projects/kse/lib/libc/net/gethostbydns.c#5 integrate .. //depot/projects/kse/lib/libc/net/name6.c#8 integrate .. //depot/projects/kse/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/kse/lib/libc/powerpc/gen/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/powerpc/gen/makecontext.c#2 integrate .. //depot/projects/kse/lib/libc/powerpc/gen/signalcontext.c#1 branch .. //depot/projects/kse/lib/libc/powerpc/stdlib/gdtoa.mk#2 integrate .. //depot/projects/kse/lib/libc/regex/grot/Makefile#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#7 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/fputwc.c#6 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#6 integrate .. //depot/projects/kse/lib/libc/sys/statfs.2#4 integrate .. //depot/projects/kse/lib/libpthread/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/kse/sys/alpha/alpha/db_trace.c#9 integrate .. //depot/projects/kse/sys/alpha/alpha/interrupt.c#19 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#40 integrate .. //depot/projects/kse/sys/alpha/include/pmap.h#17 integrate .. //depot/projects/kse/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/kse/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/kse/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/kse/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/kse/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/kse/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/kse/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/kse/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/kse/sys/arm/arm/support.S#2 integrate .. //depot/projects/kse/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/kse/sys/arm/include/pcb.h#3 integrate .. //depot/projects/kse/sys/arm/include/pmap.h#3 integrate .. //depot/projects/kse/sys/arm/include/profile.h#2 integrate .. //depot/projects/kse/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#6 integrate .. //depot/projects/kse/sys/boot/efi/libefi/arch/ia64/start.S#6 integrate .. //depot/projects/kse/sys/boot/efi/loader/Makefile#9 integrate .. //depot/projects/kse/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/kse/sys/conf/NOTES#24 integrate .. //depot/projects/kse/sys/conf/files.i386#35 integrate .. //depot/projects/kse/sys/conf/options#33 integrate .. //depot/projects/kse/sys/ddb/db_command.c#9 integrate .. //depot/projects/kse/sys/ddb/ddb.h#7 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_timer.c#11 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/kse/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/kse/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/kse/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/kse/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/kse/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/kse/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/kse/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/kse/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/kse/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#26 integrate .. //depot/projects/kse/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/kse/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/kse/sys/dev/usb/uhci.c#22 integrate .. //depot/projects/kse/sys/dev/usb/usbdi.c#12 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/kse/sys/i386/conf/NOTES#45 integrate .. //depot/projects/kse/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/kse/sys/i386/i386/db_trace.c#12 integrate .. //depot/projects/kse/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#50 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#71 integrate .. //depot/projects/kse/sys/ia64/ia64/db_trace.c#10 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#38 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#38 integrate .. //depot/projects/kse/sys/kern/kern_prot.c#37 integrate .. //depot/projects/kse/sys/kern/kern_shutdown.c#38 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#71 integrate .. //depot/projects/kse/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/kse/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/kse/sys/kern/uipc_mbuf.c#15 integrate .. //depot/projects/kse/sys/kern/uipc_mbuf2.c#8 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/kse/sys/modules/acpi/Makefile#13 integrate .. //depot/projects/kse/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/kse/sys/net/if_clone.c#2 integrate .. //depot/projects/kse/sys/netatalk/at_control.c#7 integrate .. //depot/projects/kse/sys/netatm/uni/unisig_subr.c#5 integrate .. //depot/projects/kse/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/kse/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/kse/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/kse/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/kse/sys/netgraph/ng_device.c#5 integrate .. //depot/projects/kse/sys/netgraph/ng_ether.c#12 integrate .. //depot/projects/kse/sys/netgraph/ng_gif.c#6 integrate .. //depot/projects/kse/sys/netgraph/ng_sample.c#5 integrate .. //depot/projects/kse/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/kse/sys/netinet/raw_ip.c#22 integrate .. //depot/projects/kse/sys/netinet/tcp_output.c#18 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#39 integrate .. //depot/projects/kse/sys/powerpc/include/float.h#6 integrate .. //depot/projects/kse/sys/powerpc/include/frame.h#7 integrate .. //depot/projects/kse/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/kse/sys/powerpc/powerpc/elf_machdep.c#8 integrate .. //depot/projects/kse/sys/powerpc/powerpc/genassym.c#20 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#28 integrate .. //depot/projects/kse/sys/powerpc/powerpc/swtch.S#3 integrate .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#20 integrate .. //depot/projects/kse/sys/sparc64/sparc64/db_trace.c#14 integrate .. //depot/projects/kse/sys/sys/cdefs.h#22 integrate .. //depot/projects/kse/sys/sys/kdb.h#2 integrate .. //depot/projects/kse/sys/sys/mbuf.h#20 integrate .. //depot/projects/kse/sys/sys/pipe.h#5 integrate .. //depot/projects/kse/sys/vm/uma_core.c#19 integrate .. //depot/projects/kse/sys/vm/vm_contig.c#14 integrate .. //depot/projects/kse/sys/vm/vm_map.c#31 integrate .. //depot/projects/kse/sys/vm/vm_page.c#22 integrate .. //depot/projects/kse/tools/regression/lib/libc/locale/Makefile#2 integrate .. //depot/projects/kse/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#1 branch .. //depot/projects/kse/tools/regression/lib/libc/locale/test-towctrans.c#2 integrate .. //depot/projects/kse/tools/regression/lib/libc/locale/test-wcsnrtombs.c#1 branch .. //depot/projects/kse/tools/regression/lib/libc/regex/Makefile#1 branch .. //depot/projects/kse/tools/regression/pipe/bigpipetest.c#2 integrate .. //depot/projects/kse/tools/regression/pipe/pipe-fstatbug.c#1 branch .. //depot/projects/kse/tools/regression/pipe/pipe-reverse.c#1 branch .. //depot/projects/kse/tools/regression/pipe/pipe-wraparound.c#1 branch Differences ... ==== //depot/projects/kse/bin/ps/print.c#19 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); #include #include @@ -785,7 +785,7 @@ v = ve->var; string = NULL; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); goto out; } error = mac_get_pid(k->ki_p->ki_pid, proclabel); @@ -811,7 +811,7 @@ int error, size = 0; if (mac_prepare_process_label(&proclabel) == -1) { - perror("mac_prepare_process_label"); + warn("mac_prepare_process_label"); return (0); } error = mac_get_pid(k->ki_p->ki_pid, proclabel); ==== //depot/projects/kse/include/wchar.h#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.43 2004/07/21 10:54:57 tjr Exp $ */ /*- @@ -209,6 +209,10 @@ #if __BSD_VISIBLE wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); +size_t mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, + size_t, mbstate_t * __restrict); +size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, + size_t, mbstate_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.56 2004/07/08 06:43:37 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.57 2004/07/21 10:54:57 tjr Exp $ # locale sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale @@ -8,11 +8,13 @@ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mblen.c \ mbrlen.c \ - mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ + mbrtowc.c mbrune.c mbsinit.c mbsnrtowcs.c \ + mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nextwctype.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c srune.c \ table.c \ - tolower.c toupper.c utf2.c utf8.c wcrtomb.c wcsrtombs.c wcsftime.c \ + tolower.c toupper.c utf2.c utf8.c wcrtomb.c wcsnrtombs.c \ + wcsrtombs.c wcsftime.c \ wcstof.c wcstod.c \ wcstoimax.c wcstol.c wcstold.c wcstoll.c \ wcstombs.c \ @@ -47,9 +49,11 @@ iswalnum.3 iswupper.3 iswalnum.3 iswxdigit.3 MLINKS+=isxdigit.3 ishexnumber.3 MLINKS+=mbrune.3 mbmb.3 mbrune.3 mbrrune.3 +MLINKS+=mbsrtowcs.3 mbsnrtowcs.3 MLINKS+=rune.3 fgetrune.3 rune.3 fputrune.3 rune.3 fungetrune.3 \ rune.3 setinvalidrune.3 rune.3 setrunelocale.3 rune.3 sgetrune.3 \ rune.3 sputrune.3 +MLINKS+=wcsrtombs.3 wcsnrtombs.3 MLINKS+=wcstod.3 wcstof.3 wcstod.3 wcstold.3 MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 ==== //depot/projects/kse/lib/libc/locale/mblocal.h#2 (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/libc/locale/mblocal.h,v 1.2 2004/05/13 11:20:27 tjr Exp $ + * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.3 2004/07/21 10:54:57 tjr Exp $ */ #ifndef _MBLOCAL_H_ @@ -37,11 +37,11 @@ extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); extern int (*__mbsinit)(const mbstate_t *); -extern size_t (*__mbsrtowcs)(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict); -extern size_t (*__wcsrtombs)(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); /* * Conversion functions for "NONE"/C/POSIX encoding. @@ -49,17 +49,17 @@ extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); extern int _none_mbsinit(const mbstate_t *); -extern size_t _none_mbsrtowcs(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t _none_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); extern size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -extern size_t _none_wcsrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); -extern size_t __mbsrtowcs_std(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); -extern size_t __wcsrtombs_std(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); +extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); /* * Rune emulation functions. ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#5 (text+ko) ==== @@ -22,12 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.4 2004/04/08 09:59:02 tjr Exp $ -.Dd April 8, 2004 +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ +.Dd July 21, 2004 .Dt MBSRTOWCS 3 .Os .Sh NAME -.Nm mbsrtowcs +.Nm mbsrtowcs , +.Nm mbsnrtowcs .Nd "convert a character string to a wide-character string (restartable)" .Sh LIBRARY .Lb libc @@ -38,6 +39,11 @@ .Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t len" .Fa "mbstate_t * restrict ps" .Fc +.Ft size_t +.Fo mbsnrtowcs +.Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t nms" +.Fa "size_t len" "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn mbsrtowcs @@ -82,10 +88,21 @@ .Vt mbstate_t object, which is initialized to the initial conversion state at program startup. +.Pp +The +.Fn mbsnrtowcs +function behaves identically to +.Fn mbsrtowcs , +except that conversion stops after reading at most +.Fa nms +bytes from the buffer pointed to by +.Fa src . .Sh RETURN VALUES The .Fn mbsrtowcs -function returns the number of wide characters stored in +and +.Fn mbsnrtowcs +functions return the number of wide characters stored in the array pointed to by .Fa dst if successful, otherwise it returns @@ -93,7 +110,9 @@ .Sh ERRORS The .Fn mbsrtowcs -function will fail if: +and +.Fn mbsnrtowcs +functions will fail if: .Bl -tag -width Er .It Bq Er EILSEQ An invalid multibyte character sequence was encountered. @@ -110,3 +129,7 @@ .Fn mbsrtowcs function conforms to .St -isoC-99 . +.Pp +The +.Fn mbsnrtowcs +function is an extension to the standard. ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.5 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -41,46 +41,5 @@ if (ps == NULL) ps = &mbs; - return (__mbsrtowcs(dst, src, len, ps)); -} - -size_t -__mbsrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src, - size_t len, mbstate_t * __restrict ps) -{ - const char *s; - size_t nchr; - wchar_t wc; - int nb; - - s = *src; - nchr = 0; - - if (dst == NULL) { - for (;;) { - if ((nb = (int)__mbrtowc(&wc, s, MB_CUR_MAX, ps)) < 0) - /* Invalid sequence - mbrtowc() sets errno. */ - return ((size_t)-1); - else if (nb == 0) - return (nchr); - s += nb; - nchr++; - } - /*NOTREACHED*/ - } - - while (len-- > 0) { - if ((nb = (int)__mbrtowc(dst, s, MB_CUR_MAX, ps)) < 0) { - *src = s; - return ((size_t)-1); - } else if (nb == 0) { - *src = NULL; - return (nchr); - } - s += nb; - nchr++; - dst++; - } - *src = s; - return (nchr); + return (__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps)); } ==== //depot/projects/kse/lib/libc/locale/mbstowcs.c#6 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.10 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $"); +#include #include #include #include "mblocal.h" @@ -38,5 +39,5 @@ mbstate_t mbs; mbs = initial; - return (__mbsrtowcs(pwcs, &s, n, &mbs)); + return (__mbsnrtowcs(pwcs, &s, SIZE_T_MAX, n, &mbs)); } ==== //depot/projects/kse/lib/libc/locale/none.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.11 2004/05/25 10:45:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -55,11 +55,12 @@ size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); int _none_mbsinit(const mbstate_t *); -size_t _none_mbsrtowcs(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +size_t _none_mbsnrtowcs(wchar_t * __restrict dst, + const char ** __restrict src, size_t nms, size_t len, + mbstate_t * __restrict ps __unused); size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -size_t _none_wcsrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); int _none_init(_RuneLocale *rl) @@ -67,9 +68,9 @@ __mbrtowc = _none_mbrtowc; __mbsinit = _none_mbsinit; - __mbsrtowcs = _none_mbsrtowcs; + __mbsnrtowcs = _none_mbsnrtowcs; __wcrtomb = _none_wcrtomb; - __wcsrtombs = _none_wcsrtombs; + __wcsnrtombs = _none_wcsnrtombs; _CurrentRuneLocale = rl; __mb_cur_max = 1; return(0); @@ -119,18 +120,20 @@ } size_t -_none_mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, - size_t len, mbstate_t * __restrict ps __unused) +_none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src, + size_t nms, size_t len, mbstate_t * __restrict ps __unused) { const char *s; size_t nchr; - if (dst == NULL) - return (strlen(*src)); + if (dst == NULL) { + s = memchr(*src, '\0', nms); + return (s != NULL ? s - *src : nms); + } s = *src; nchr = 0; - while (len-- > 0) { + while (len-- > 0 && nms-- > 0) { if ((*dst++ = (unsigned char)*s++) == L'\0') { *src = NULL; return (nchr); @@ -142,14 +145,14 @@ } size_t -_none_wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, - size_t len, mbstate_t * __restrict ps __unused) +_none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src, + size_t nwc, size_t len, mbstate_t * __restrict ps __unused) { const wchar_t *s; size_t nchr; if (dst == NULL) { - for (s = *src; *s != L'\0'; s++) { + for (s = *src; nwc > 0 && *s != L'\0'; s++, nwc--) { if (*s < 0 || *s > UCHAR_MAX) { errno = EILSEQ; return ((size_t)-1); @@ -160,7 +163,7 @@ s = *src; nchr = 0; - while (len-- > 0) { + while (len-- > 0 && nwc-- > 0) { if (*s < 0 || *s > UCHAR_MAX) { errno = EILSEQ; return ((size_t)-1); ==== //depot/projects/kse/lib/libc/locale/setrunelocale.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ #define OBSOLETE_IN_6 #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.39 2004/06/23 07:01:43 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.40 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -100,10 +100,11 @@ static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict); static int (*Cached__mbsinit)(const mbstate_t *); - static size_t (*Cached__mbsrtowcs)(wchar_t * __restrict, - const char ** __restrict, size_t, mbstate_t * __restrict); - static size_t (*Cached__wcsrtombs)(char * __restrict, - const wchar_t ** __restrict, size_t, mbstate_t * __restrict); + static size_t (*Cached__mbsnrtowcs)(wchar_t * __restrict, + const char ** __restrict, size_t, size_t, mbstate_t * __restrict); + static size_t (*Cached__wcsnrtombs)(char * __restrict, + const wchar_t ** __restrict, size_t, size_t, + mbstate_t * __restrict); /* * The "C" and "POSIX" locale are always here. @@ -113,9 +114,9 @@ __mb_cur_max = 1; __mbrtowc = _none_mbrtowc; __mbsinit = _none_mbsinit; - __mbsrtowcs = _none_mbsrtowcs; + __mbsnrtowcs = _none_mbsnrtowcs; __wcrtomb = _none_wcrtomb; - __wcsrtombs = _none_wcsrtombs; + __wcsnrtombs = _none_wcsnrtombs; return (0); } @@ -128,9 +129,9 @@ __mb_cur_max = Cached__mb_cur_max; __mbrtowc = Cached__mbrtowc; __mbsinit = Cached__mbsinit; - __mbsrtowcs = Cached__mbsrtowcs; + __mbsnrtowcs = Cached__mbsnrtowcs; __wcrtomb = Cached__wcrtomb; - __wcsrtombs = Cached__wcsrtombs; + __wcsnrtombs = Cached__wcsnrtombs; return (0); } @@ -156,9 +157,9 @@ __mbrtowc = NULL; __mbsinit = NULL; - __mbsrtowcs = __mbsrtowcs_std; + __mbsnrtowcs = __mbsnrtowcs_std; __wcrtomb = NULL; - __wcsrtombs = __wcsrtombs_std; + __wcsnrtombs = __wcsnrtombs_std; rl->__sputrune = __emulated_sputrune; rl->__sgetrune = __emulated_sgetrune; if (strcmp(rl->__encoding, "NONE") == 0) @@ -192,9 +193,9 @@ Cached__mb_cur_max = __mb_cur_max; Cached__mbrtowc = __mbrtowc; Cached__mbsinit = __mbsinit; - Cached__mbsrtowcs = __mbsrtowcs; + Cached__mbsnrtowcs = __mbsnrtowcs; Cached__wcrtomb = __wcrtomb; - Cached__wcsrtombs = __wcsrtombs; + Cached__wcsnrtombs = __wcsnrtombs; (void)strcpy(ctype_encoding, encoding); } else free(rl); ==== //depot/projects/kse/lib/libc/locale/table.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.23 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.24 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -255,9 +255,9 @@ size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict) = _none_mbrtowc; int (*__mbsinit)(const mbstate_t *) = _none_mbsinit; -size_t (*__mbsrtowcs)(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict) = _none_mbsrtowcs; +size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs; size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) = _none_wcrtomb; -size_t (*__wcsrtombs)(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict) = _none_wcsrtombs; +size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs; ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.3#5 (text+ko) ==== @@ -22,13 +22,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.4 2004/04/08 09:59:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ .\" -.Dd April 8, 2004 +.Dd July 21, 2004 .Dt WCSRTOMBS 3 .Os .Sh NAME -.Nm wcsrtombs +.Nm wcsrtombs , +.Nm wcsnrtombs .Nd "convert a wide-character string to a character string (restartable)" .Sh LIBRARY .Lb libc @@ -39,6 +40,11 @@ .Fa "char * restrict dst" "const wchar_t ** restrict src" .Fa "size_t len" "mbstate_t * restrict ps" .Fc +.Ft size_t +.Fo wcsnrtombs +.Fa "char * restrict dst" "const wchar_t ** restrict src" "size_t nwc" +.Fa "size_t len" "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn wcsrtombs @@ -82,10 +88,21 @@ .Vt mbstate_t object, which is initialized to the initial conversion state at program startup. +.Pp +The +.Fn wcsnrtombs +function behaves identically to +.Fn wcsrtombs , +except that conversion stops after reading at most +.Fa nwc +characters from the buffer pointed to by +.Fa src . .Sh RETURN VALUES The .Fn wcsrtombs -function returns the number of bytes stored in +and +.Fn wcsnrtombs +functions return the number of bytes stored in the array pointed to by .Fa dst (not including any terminating null), if successful, otherwise it returns @@ -93,7 +110,9 @@ .Sh ERRORS The .Fn wcsrtombs -function will fail if: +and +.Fn wcsnrtombs +functions will fail if: .Bl -tag -width Er .It Bq Er EILSEQ An invalid wide character was encountered. @@ -109,3 +128,7 @@ .Fn wcsrtombs function conforms to .St -isoC-99 . +.Pp +The +.Fn wcsnrtombs +function is an extension to the standard. ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.5 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -41,71 +41,5 @@ if (ps == NULL) ps = &mbs; - return (__wcsrtombs(dst, src, len, ps)); -} - -size_t -__wcsrtombs_std(char * __restrict dst, const wchar_t ** __restrict src, - size_t len, mbstate_t * __restrict ps) -{ - mbstate_t mbsbak; - char buf[MB_LEN_MAX]; - const wchar_t *s; - size_t nbytes; - int nb; - - s = *src; - nbytes = 0; - - if (dst == NULL) { - for (;;) { - if ((nb = (int)__wcrtomb(buf, *s, ps)) < 0) - /* Invalid character - wcrtomb() sets errno. */ - return ((size_t)-1); - else if (*s == L'\0') - return (nbytes + nb - 1); - s++; - nbytes += nb; - } - /*NOTREACHED*/ - } - - while (len > 0) { - if (len > (size_t)MB_CUR_MAX) { - /* Enough space to translate in-place. */ - if ((nb = (int)__wcrtomb(dst, *s, ps)) < 0) { - *src = s; - return ((size_t)-1); - } - } else { - /* - * May not be enough space; use temp. buffer. - * - * We need to save a copy of the conversion state - * here so we can restore it if the multibyte - * character is too long for the buffer. - */ - mbsbak = *ps; - if ((nb = (int)__wcrtomb(buf, *s, ps)) < 0) { - *src = s; - return ((size_t)-1); - } - if (nb > (int)len) { - /* MB sequence for character won't fit. */ - *ps = mbsbak; - break; - } - memcpy(dst, buf, nb); - } - if (*s == L'\0') { - *src = NULL; - return (nbytes + nb - 1); - } - s++; - dst += nb; - len -= nb; - nbytes += nb; - } - *src = s; - return (nbytes); + return (__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps)); } ==== //depot/projects/kse/lib/libc/locale/wcstombs.c#6 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.9 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tjr Exp $"); +#include #include #include #include "mblocal.h" @@ -38,5 +39,5 @@ mbstate_t mbs; mbs = initial; - return (__wcsrtombs(s, &pwcs, n, &mbs)); + return (__wcsnrtombs(s, &pwcs, SIZE_T_MAX, n, &mbs)); } ==== //depot/projects/kse/lib/libc/net/gethostbydns.c#5 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.45 2004/03/05 08:10:17 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.46 2004/07/21 17:26:40 ume Exp $"); #include #include @@ -683,12 +683,6 @@ return NS_NOTFOUND; } n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, sizeof buf->buf); - if (n < 0 && af == AF_INET6) { - *qp = '\0'; - strlcat(qbuf, "ip6.int", sizeof(qbuf)); - n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, - sizeof buf->buf); - } if (n < 0) { free(buf); dprintf("res_query failed (%d)\n", n); ==== //depot/projects/kse/lib/libc/net/name6.c#8 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.38 2004/06/02 06:49:36 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.39 2004/07/21 17:26:40 ume Exp $"); #include "namespace.h" #include @@ -2082,7 +2082,7 @@ querybuf *buf; char qbuf[MAXDNAME+1]; char *hlist[2]; - char *tld6[] = { "ip6.arpa", "ip6.int", NULL }; + char *tld6[] = { "ip6.arpa", NULL }; char *tld4[] = { "in-addr.arpa", NULL }; char **tld; ==== //depot/projects/kse/lib/libc/powerpc/_fpmath.h#3 (text+ko) ==== @@ -23,28 +23,26 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.4 2004/01/18 07:57:02 das Exp $ + * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.5 2004/07/19 23:56:06 gallatin Exp $ */ union IEEEl2bits { long double e; struct { unsigned int sign :1; - unsigned int exp :15; - unsigned long long manh :48; - unsigned long long manl :64; + unsigned int exp :11; + unsigned int manh :20; + unsigned int manl :32; } bits; }; #define mask_nbit_l(u) ((void)0) #define LDBL_IMPLICIT_NBIT -#define LDBL_MANH_SIZE 48 -#define LDBL_MANL_SIZE 64 +#define LDBL_MANH_SIZE 20 +#define LDBL_MANL_SIZE 32 #define LDBL_TO_ARRAY32(u, a) do { \ (a)[0] = (uint32_t)(u).bits.manl; \ - (a)[1] = (uint32_t)((u).bits.manl >> 32); \ - (a)[2] = (uint32_t)(u).bits.manh; \ - (a)[3] = (uint32_t)((u).bits.manh >> 32); \ + (a)[1] = (uint32_t)(u).bits.manh; \ } while(0) ==== //depot/projects/kse/lib/libc/powerpc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.5 2004/07/18 21:23:39 das Exp $ +# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.6 2004/07/19 12:08:03 grehan Exp $ SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \ infinity.c ldexp.c makecontext.c modf.c _setjmp.S \ - setjmp.S sigsetjmp.S syncicache.c + setjmp.S sigsetjmp.S signalcontext.c syncicache.c ==== //depot/projects/kse/lib/libc/powerpc/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.1 2004/03/02 06:22:24 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.2 2004/07/19 12:05:07 grehan Exp $"); #include @@ -113,7 +113,7 @@ * Use caller-saved regs 14/15 to hold params that _ctx_start * will use to invoke the user-supplied func */ - mc->mc_lr = (uint32_t) _ctx_start; + mc->mc_srr0 = (uint32_t) _ctx_start; mc->mc_gpr[1] = (uint32_t) sp; /* new stack pointer */ mc->mc_gpr[14] = (uint32_t) start; /* r14 <- start */ mc->mc_gpr[15] = (uint32_t) ucp; /* r15 <- ucp */ ==== //depot/projects/kse/lib/libc/powerpc/stdlib/gdtoa.mk#2 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/lib/libc/powerpc/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $ +# $FreeBSD: src/lib/libc/powerpc/stdlib/gdtoa.mk,v 1.2 2004/07/19 23:56:07 gallatin Exp $ -# Long double is quad precision -GDTOASRCS+=strtopQ.c -MDSRCS+=machdep_ldisQ.c +# Long double is 64-bits +MDSRCS+=machdep_ldisd.c ==== //depot/projects/kse/lib/libc/regex/grot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.2 2000/07/10 06:10:47 green Exp $ +# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.4 2004/07/19 08:48:17 tjr Exp $ # You probably want to take -DREDEBUG out of CFLAGS, and put something like # -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of # internal assertion checking). Take -Dconst= out for an ANSI compiler. @@ -24,7 +24,7 @@ HMISSING = SRCMISSING = split.c OBJMISSING = split.o -H = cclass.h cname.h regex2.h utils.h $(HMISSING) +H = cname.h regex2.h utils.h $(HMISSING) REGSRC = regcomp.c regerror.c regexec.c regfree.c engine.c SRC = $(REGSRC) debug.c main.c $(SRCMISSING) @@ -39,7 +39,7 @@ .SUFFIXES: .ih .h .c.ih: - ./mkh $(MKHFLAGS) -p $< >$@ + sh mkh $(MKHFLAGS) -p $< >$@ default: r @@ -48,14 +48,16 @@ o: $(OBJPRODN) -REGEXHSRC = regex2.h reg*.c +REGEXHSRC = ../regex2.h ../reg*.c h: $(REGEXHSRC) - ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 22 17:48:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A4216A4D1; Thu, 22 Jul 2004 17:48: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 6C78C16A4CE for ; Thu, 22 Jul 2004 17:48:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 686F143D39 for ; Thu, 22 Jul 2004 17:48:48 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MHmmp7009511 for ; Thu, 22 Jul 2004 17:48:48 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MHmmBt009508 for perforce@freebsd.org; Thu, 22 Jul 2004 17:48:48 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 17:48:48 GMT Message-Id: <200407221748.i6MHmmBt009508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57936 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: Thu, 22 Jul 2004 17:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=57936 Change 57936 by dfr@dfr_home on 2004/07/22 17:48:03 Fix integrate botch. Affected files ... .. //depot/projects/kse/lib/libc/gen/swapcontext.c#8 integrate Differences ... ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#8 (text+ko) ==== @@ -31,10 +31,6 @@ #include #include -#include -#include -#include - #include #include @@ -45,10 +41,7 @@ { int ret; - if ((oucp == NULL) || - (oucp->uc_mcontext.mc_len != sizeof(mcontext_t)) || - (ucp == NULL) || - (ucp->uc_mcontext.mc_len != sizeof(mcontext_t))) { + if ((oucp == NULL) || (ucp == NULL)) { errno = EINVAL; return (-1); } From owner-p4-projects@FreeBSD.ORG Thu Jul 22 17:52:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83B5116A4D0; Thu, 22 Jul 2004 17:52:54 +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 5F27B16A4CE for ; Thu, 22 Jul 2004 17:52:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AD1643D45 for ; Thu, 22 Jul 2004 17:52:54 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MHqsaF009684 for ; Thu, 22 Jul 2004 17:52:54 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MHqsiK009681 for perforce@freebsd.org; Thu, 22 Jul 2004 17:52:54 GMT (envelope-from dfr@freebsd.org) Date: Thu, 22 Jul 2004 17:52:54 GMT Message-Id: <200407221752.i6MHqsiK009681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 57938 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: Thu, 22 Jul 2004 17:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=57938 Change 57938 by dfr@dfr_home on 2004/07/22 17:52:25 Fix IFC botch. Affected files ... .. //depot/projects/kse/sys/i386/include/asmacros.h#6 integrate .. //depot/projects/kse/sys/sys/kse.h#24 integrate Differences ... ==== //depot/projects/kse/sys/i386/include/asmacros.h#6 (text+ko) ==== @@ -44,7 +44,7 @@ * to a possibly-modified form that will be invisible to C programs. */ #define CNAME(csym) csym -#define HIDENAME(asmsym) __CONCAT(.,asmsym) +#define HIDENAME(asmsym) .asmsym #define ALIGN_DATA .p2align 2 /* 4 byte alignment, zero filled */ #ifdef GPROF ==== //depot/projects/kse/sys/sys/kse.h#24 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jul 22 18:02:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE78D16A4D0; Thu, 22 Jul 2004 18:02:02 +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 A7FE416A4CE; Thu, 22 Jul 2004 18:02:02 +0000 (GMT) Received: from pimout3-ext.prodigy.net (pimout3-ext.prodigy.net [207.115.63.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id 560E343D3F; Thu, 22 Jul 2004 18:02:02 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (adsl-68-121-219-69.dsl.snfc21.pacbell.net [68.121.219.69])i6MI20lM112204; Thu, 22 Jul 2004 14:02:01 -0400 Message-ID: <41000118.6050701@elischer.org> Date: Thu, 22 Jul 2004 11:02:00 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4b) Gecko/20030524 X-Accept-Language: en, hu MIME-Version: 1.0 To: Doug Rabson References: <200407221752.i6MHqsiK009681@repoman.freebsd.org> In-Reply-To: <200407221752.i6MHqsiK009681@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 57938 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: Thu, 22 Jul 2004 18:02:03 -0000 Doug Rabson wrote: >http://perforce.freebsd.org/chv.cgi?CH=57938 > >Change 57938 by dfr@dfr_home on 2004/07/22 17:52:25 > > Fix IFC botch. > >Affected files ... > >.. //depot/projects/kse/sys/i386/include/asmacros.h#6 integrate >.. //depot/projects/kse/sys/sys/kse.h#24 integrate > >Differences ... > >==== //depot/projects/kse/sys/i386/include/asmacros.h#6 (text+ko) ==== > >@@ -44,7 +44,7 @@ > * to a possibly-modified form that will be invisible to C programs. > */ > #define CNAME(csym) csym >-#define HIDENAME(asmsym) __CONCAT(.,asmsym) >+#define HIDENAME(asmsym) .asmsym > > #define ALIGN_DATA .p2align 2 /* 4 byte alignment, zero filled */ > #ifdef GPROF > >==== //depot/projects/kse/sys/sys/kse.h#24 (text+ko) ==== > > also, here's the perl script I use to get the diffs for the kse branch. note it uses the label that the other script sets.. #!/usr/bin/perl # new usage: ./p4patch # Usage: p4 diff2 -du base_view your_view use POSIX (strftime); $src_base = '//depot/vendor/freebsd/src'; $dst_base = '//depot/projects/kse'; $dst_label = '@kse_base'; $cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; open(P, "$cmd |") || die $!; $time = localtime(); $time = strftime "%a %b %e %H:%M:%S %Y", localtime; $time = strftime "%Y/%m/%d %T", localtime; while (

) { ($f1, $f2, $r) = m|^==== (.+) - (.+) ==== ?(.*)| or print, next; next if $r eq 'identical'; ($src, $srcrev) = ($f1 =~ m|$src_base/([^#]*)#(\d+)|); ($dst, $dstrev) = ($f2 =~ m|$dst_base/([^#]*)#(\d+)|); print "Index: $dst\n"; print '=' x 75 . "\n"; if ($r eq '') { $file = "/tmp/_p4patch.$$"; `p4 print -q $f2 > $file`; print `diff -Nc /dev/null $file | sed "s#$file#$dst#"`; `rm -f /tmp/_p4patch.$$`; next; } print "--- $src\t$time\t#$srcrev\n"; print "+++ $dst\t$time\n"; From owner-p4-projects@FreeBSD.ORG Thu Jul 22 23:59:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1260A16A4D0; Thu, 22 Jul 2004 23:59:31 +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 DB35E16A4CE for ; Thu, 22 Jul 2004 23:59:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D16C743D1D for ; Thu, 22 Jul 2004 23:59:30 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MNxUUj019989 for ; Thu, 22 Jul 2004 23:59:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MNxU2U019986 for perforce@freebsd.org; Thu, 22 Jul 2004 23:59:30 GMT (envelope-from peter@freebsd.org) Date: Thu, 22 Jul 2004 23:59:30 GMT Message-Id: <200407222359.i6MNxU2U019986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57957 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: Thu, 22 Jul 2004 23:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=57957 Change 57957 by peter@peter_melody on 2004/07/22 23:58:34 IFC @57955 Affected files ... .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#9 integrate .. //depot/projects/hammer/include/wchar.h#16 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#21 integrate .. //depot/projects/hammer/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbsnrtowcs.c#1 branch .. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/mbstowcs.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/none.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#15 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/wcsnrtombs.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcsrtombs.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcsrtombs.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.c#7 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#9 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#12 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetws.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fputws.c#3 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#20 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.help#3 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/diag.c#5 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/main.c#2 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/private.h#2 integrate .. //depot/projects/hammer/sbin/init/init.8#11 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#25 integrate .. //depot/projects/hammer/share/dict/freebsd#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#23 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#1 branch .. //depot/projects/hammer/share/man/man4/pccbb.4#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#17 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#48 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#11 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/hammer/sys/arm/include/pcb.h#3 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#3 integrate .. //depot/projects/hammer/sys/conf/files.i386#38 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#10 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#14 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#6 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#29 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#40 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#47 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#47 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#20 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#47 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#19 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_vlan.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#34 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#13 integrate .. //depot/projects/hammer/sys/powerpc/include/frame.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/swtch.S#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#7 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#15 integrate .. //depot/projects/hammer/sys/sys/kdb.h#2 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#27 integrate .. //depot/projects/hammer/sys/sys/pipe.h#8 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#27 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#41 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#40 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#17 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#32 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/Makefile#5 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsnrtombs.c#1 branch .. //depot/projects/hammer/tools/regression/pipe/bigpipetest.c#2 integrate .. //depot/projects/hammer/tools/regression/pipe/pipe-reverse.c#1 branch .. //depot/projects/hammer/tools/regression/pipe/pipe-wraparound.c#1 branch .. //depot/projects/hammer/usr.bin/fstat/fstat.c#10 integrate .. //depot/projects/hammer/usr.bin/hexdump/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/hexdump/display.c#4 integrate .. //depot/projects/hammer/usr.bin/hexdump/odsyntax.c#3 integrate .. //depot/projects/hammer/usr.bin/hexdump/parse.c#3 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#13 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#11 integrate .. //depot/projects/hammer/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/hammer/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/arlib/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/ntp/config.h#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.8#4 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 integrate Differences ... ==== //depot/projects/hammer/contrib/ntp/util/ntp-keygen.c#2 (text+ko) ==== @@ -159,7 +159,9 @@ extern char *optarg; /* command line argument */ int debug = 0; /* debug, not de bug */ int rval; /* return status */ +#ifdef OPENSSL u_int modulus = PLEN; /* prime modulus size (bits) */ +#endif int nkeys = 0; /* MV keys */ time_t epoch; /* Unix epoch (seconds) since 1970 */ char *hostname; /* host name (subject name) */ @@ -221,7 +223,9 @@ EVP_PKEY *pkey_iff = NULL; /* IFF parameters */ EVP_PKEY *pkey_gq = NULL; /* GQ parameters */ EVP_PKEY *pkey_mv = NULL; /* MV parameters */ +#endif int md5key = 0; /* generate MD5 keys */ +#ifdef OPENSSL int hostkey = 0; /* generate RSA keys */ int iffkey = 0; /* generate IFF parameters */ int gqpar = 0; /* generate GQ parameters */ @@ -231,7 +235,6 @@ char *sign = NULL; /* sign key */ EVP_PKEY *pkey = NULL; /* temp key */ const EVP_MD *ectx; /* EVP digest */ - char hostbuf[MAXHOSTNAME + 1]; char pathbuf[MAXFILENAME + 1]; const char *scheme = NULL; /* digest/signature scheme */ char *exten = NULL; /* private extension */ @@ -240,6 +243,7 @@ FILE *fstr = NULL; /* file handle */ int iffsw = 0; /* IFF key switch */ #endif /* OPENSSL */ + char hostbuf[MAXHOSTNAME + 1]; u_int temp; #ifdef SYS_WINNT @@ -267,8 +271,10 @@ */ gethostname(hostbuf, MAXHOSTNAME); hostname = hostbuf; +#ifdef OPENSSL trustname = hostbuf; passwd1 = hostbuf; +#endif #ifndef SYS_WINNT gettimeofday(&tv, 0); #else @@ -277,15 +283,22 @@ epoch = tv.tv_sec; rval = 0; while ((temp = getopt(argc, argv, - "c:deGgHIi:Mm:nPp:q:S:s:TV:v:")) != -1) { +#ifdef OPENSSL + "c:deGgHIi:Mm:nPp:q:S:s:TV:v:" +#else + "dM" +#endif + )) != -1) { switch(temp) { +#ifdef OPENSSL /* * -c select public certificate type */ case 'c': scheme = optarg; continue; +#endif /* * -d debug @@ -294,47 +307,59 @@ debug++; continue; +#ifdef OPENSSL /* * -e write identity keys */ case 'e': iffsw++; continue; +#endif +#ifdef OPENSSL /* * -G generate GQ parameters and keys */ case 'G': gqpar++; continue; +#endif +#ifdef OPENSSL /* * -g update GQ keys */ case 'g': gqkey++; continue; +#endif +#ifdef OPENSSL /* * -H generate host key (RSA) */ case 'H': hostkey++; continue; +#endif +#ifdef OPENSSL /* * -I generate IFF parameters */ case 'I': iffkey++; continue; +#endif +#ifdef OPENSSL /* * -i set issuer name */ case 'i': trustname = optarg; continue; +#endif /* * -M generate MD5 keys @@ -343,7 +368,7 @@ md5key++; continue; - +#ifdef OPENSSL /* * -m select modulus (256-2048) */ @@ -352,49 +377,63 @@ fprintf(stderr, "invalid option -m %s\n", optarg); continue; - +#endif + +#ifdef OPENSSL /* * -P generate PC private certificate */ case 'P': exten = EXT_KEY_PRIVATE; continue; +#endif +#ifdef OPENSSL /* * -p output private key password */ case 'p': passwd2 = optarg; continue; +#endif +#ifdef OPENSSL /* * -q input private key password */ case 'q': passwd1 = optarg; continue; +#endif +#ifdef OPENSSL /* * -S generate sign key (RSA or DSA) */ case 'S': sign = optarg; continue; +#endif +#ifdef OPENSSL /* * -s set subject name */ case 's': hostname = optarg; continue; - +#endif + +#ifdef OPENSSL /* * -T trusted certificate (TC scheme) */ case 'T': exten = EXT_KEY_TRUST; continue; +#endif +#ifdef OPENSSL /* * -V generate MV parameters */ @@ -404,7 +443,9 @@ fprintf(stderr, "invalid option -V %s\n", optarg); continue; +#endif +#ifdef OPENSSL /* * -v update MV keys */ @@ -414,6 +455,7 @@ fprintf(stderr, "invalid option -v %s\n", optarg); continue; +#endif /* * None of the above. @@ -446,6 +488,7 @@ fprintf(stderr, "Random seed file %s %u bytes\n", pathbuf, temp); RAND_add(&epoch, sizeof(epoch), 4.0); +#endif /* * Generate new parameters and keys as requested. These replace @@ -453,6 +496,7 @@ */ if (md5key) gen_md5("MD5"); +#ifdef OPENSSL if (hostkey) pkey_host = genkey("RSA", "host"); if (sign != NULL) @@ -714,7 +758,7 @@ } md5key[j] = (u_char)temp; } - md5key[16] = '\0'; + md5key[15] = '\0'; fprintf(str, "%2d MD5 %16s # MD5 key\n", i, md5key); } @@ -1245,7 +1289,7 @@ char *id /* file name id */ ) { - EVP_PKEY *pkey; /* private key */ + EVP_PKEY *pkey, *pkey1; /* private key */ DSA *dsa; /* DSA parameters */ DSA *sdsa; /* DSA parameters */ BN_CTX *ctx; /* BN working space */ @@ -1284,7 +1328,7 @@ modulus / n); ctx = BN_CTX_new(); u = BN_new(); v = BN_new(); w = BN_new(); b = BN_new(); b1 = BN_new(); - dsa = malloc(sizeof(DSA)); + dsa = DSA_new(); dsa->p = BN_new(); dsa->q = BN_new(); dsa->g = BN_new(); @@ -1589,7 +1633,7 @@ * the designated recipient(s) who pay a suitably outrageous fee * for its use. */ - sdsa = malloc(sizeof(DSA)); + sdsa = DSA_new(); sdsa->p = BN_dup(dsa->p); sdsa->q = BN_dup(BN_value_one()); sdsa->g = BN_dup(BN_value_one()); @@ -1622,15 +1666,16 @@ */ sprintf(ident, "MVkey%d", j); str = fheader(ident, trustname); - pkey = EVP_PKEY_new(); - EVP_PKEY_assign_DSA(pkey, sdsa); - PEM_write_PrivateKey(str, pkey, passwd2 ? + pkey1 = EVP_PKEY_new(); + EVP_PKEY_set1_DSA(pkey1, sdsa); + PEM_write_PrivateKey(str, pkey1, passwd2 ? EVP_des_cbc() : NULL, NULL, 0, NULL, passwd2); fclose(str); fprintf(stderr, "ntpkey_%s_%s.%lu\n", ident, trustname, epoch + JAN_1970); if (debug) DSA_print_fp(stdout, sdsa, 0); + EVP_PKEY_free(pkey1); } /* @@ -1643,7 +1688,7 @@ BN_free(u); BN_free(v); BN_free(w); BN_CTX_free(ctx); BN_free(b); BN_free(b1); BN_free(biga); BN_free(bige); BN_free(ss); BN_free(gbar); BN_free(ghat); - DSA_free(dsa); DSA_free(sdsa); + DSA_free(sdsa); /* * Free the world. @@ -1883,7 +1928,6 @@ break; } } -#endif /* OPENSSL */ /* @@ -1907,6 +1951,7 @@ rval = -1; return (NULL); } +#endif /* OPENSSL */ /* ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.66 2004/05/20 10:29:26 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.67 2004/07/21 10:14:10 roberto Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -38,6 +38,8 @@ # s uname=bind gname=bind mode=0750 # .. .. + ntp uname=root mode=700 + .. pam.d .. periodic ==== //depot/projects/hammer/include/wchar.h#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.43 2004/07/21 10:54:57 tjr Exp $ */ /*- @@ -209,6 +209,10 @@ #if __BSD_VISIBLE wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); +size_t mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, + size_t, mbstate_t * __restrict); +size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, + size_t, mbstate_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#21 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.56 2004/07/08 06:43:37 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.57 2004/07/21 10:54:57 tjr Exp $ # locale sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale @@ -8,11 +8,13 @@ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mblen.c \ mbrlen.c \ - mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ + mbrtowc.c mbrune.c mbsinit.c mbsnrtowcs.c \ + mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nextwctype.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c srune.c \ table.c \ - tolower.c toupper.c utf2.c utf8.c wcrtomb.c wcsrtombs.c wcsftime.c \ + tolower.c toupper.c utf2.c utf8.c wcrtomb.c wcsnrtombs.c \ + wcsrtombs.c wcsftime.c \ wcstof.c wcstod.c \ wcstoimax.c wcstol.c wcstold.c wcstoll.c \ wcstombs.c \ @@ -47,9 +49,11 @@ iswalnum.3 iswupper.3 iswalnum.3 iswxdigit.3 MLINKS+=isxdigit.3 ishexnumber.3 MLINKS+=mbrune.3 mbmb.3 mbrune.3 mbrrune.3 +MLINKS+=mbsrtowcs.3 mbsnrtowcs.3 MLINKS+=rune.3 fgetrune.3 rune.3 fputrune.3 rune.3 fungetrune.3 \ rune.3 setinvalidrune.3 rune.3 setrunelocale.3 rune.3 sgetrune.3 \ rune.3 sputrune.3 +MLINKS+=wcsrtombs.3 wcsnrtombs.3 MLINKS+=wcstod.3 wcstof.3 wcstod.3 wcstold.3 MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 ==== //depot/projects/hammer/lib/libc/locale/mblocal.h#3 (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/libc/locale/mblocal.h,v 1.2 2004/05/13 11:20:27 tjr Exp $ + * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.3 2004/07/21 10:54:57 tjr Exp $ */ #ifndef _MBLOCAL_H_ @@ -37,11 +37,11 @@ extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); extern int (*__mbsinit)(const mbstate_t *); -extern size_t (*__mbsrtowcs)(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict); -extern size_t (*__wcsrtombs)(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); /* * Conversion functions for "NONE"/C/POSIX encoding. @@ -49,17 +49,17 @@ extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); extern int _none_mbsinit(const mbstate_t *); -extern size_t _none_mbsrtowcs(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t _none_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); extern size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -extern size_t _none_wcsrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); -extern size_t __mbsrtowcs_std(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); -extern size_t __wcsrtombs_std(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict); +extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); /* * Rune emulation functions. ==== //depot/projects/hammer/lib/libc/locale/mbsrtowcs.3#4 (text+ko) ==== @@ -22,12 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.4 2004/04/08 09:59:02 tjr Exp $ -.Dd April 8, 2004 +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ +.Dd July 21, 2004 .Dt MBSRTOWCS 3 .Os .Sh NAME -.Nm mbsrtowcs +.Nm mbsrtowcs , +.Nm mbsnrtowcs .Nd "convert a character string to a wide-character string (restartable)" .Sh LIBRARY .Lb libc @@ -38,6 +39,11 @@ .Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t len" .Fa "mbstate_t * restrict ps" .Fc +.Ft size_t +.Fo mbsnrtowcs +.Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t nms" +.Fa "size_t len" "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn mbsrtowcs @@ -82,10 +88,21 @@ .Vt mbstate_t object, which is initialized to the initial conversion state at program startup. +.Pp +The +.Fn mbsnrtowcs +function behaves identically to +.Fn mbsrtowcs , +except that conversion stops after reading at most +.Fa nms +bytes from the buffer pointed to by +.Fa src . .Sh RETURN VALUES The .Fn mbsrtowcs -function returns the number of wide characters stored in +and +.Fn mbsnrtowcs +functions return the number of wide characters stored in the array pointed to by .Fa dst if successful, otherwise it returns @@ -93,7 +110,9 @@ .Sh ERRORS The .Fn mbsrtowcs -function will fail if: +and +.Fn mbsnrtowcs +functions will fail if: .Bl -tag -width Er .It Bq Er EILSEQ An invalid multibyte character sequence was encountered. @@ -110,3 +129,7 @@ .Fn mbsrtowcs function conforms to .St -isoC-99 . +.Pp +The +.Fn mbsnrtowcs +function is an extension to the standard. ==== //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.5 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -41,46 +41,5 @@ if (ps == NULL) ps = &mbs; - return (__mbsrtowcs(dst, src, len, ps)); -} - -size_t -__mbsrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src, - size_t len, mbstate_t * __restrict ps) -{ - const char *s; - size_t nchr; - wchar_t wc; - int nb; - - s = *src; - nchr = 0; - - if (dst == NULL) { - for (;;) { - if ((nb = (int)__mbrtowc(&wc, s, MB_CUR_MAX, ps)) < 0) - /* Invalid sequence - mbrtowc() sets errno. */ - return ((size_t)-1); - else if (nb == 0) - return (nchr); - s += nb; - nchr++; - } - /*NOTREACHED*/ - } - - while (len-- > 0) { - if ((nb = (int)__mbrtowc(dst, s, MB_CUR_MAX, ps)) < 0) { - *src = s; - return ((size_t)-1); - } else if (nb == 0) { - *src = NULL; - return (nchr); - } - s += nb; - nchr++; - dst++; - } - *src = s; - return (nchr); + return (__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps)); } ==== //depot/projects/hammer/lib/libc/locale/mbstowcs.c#8 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.10 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $"); +#include #include #include #include "mblocal.h" @@ -38,5 +39,5 @@ mbstate_t mbs; mbs = initial; - return (__mbsrtowcs(pwcs, &s, n, &mbs)); + return (__mbsnrtowcs(pwcs, &s, SIZE_T_MAX, n, &mbs)); } ==== //depot/projects/hammer/lib/libc/locale/none.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.11 2004/05/25 10:45:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -55,11 +55,12 @@ size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); int _none_mbsinit(const mbstate_t *); -size_t _none_mbsrtowcs(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict); +size_t _none_mbsnrtowcs(wchar_t * __restrict dst, + const char ** __restrict src, size_t nms, size_t len, + mbstate_t * __restrict ps __unused); size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -size_t _none_wcsrtombs(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict); +size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict); int _none_init(_RuneLocale *rl) @@ -67,9 +68,9 @@ __mbrtowc = _none_mbrtowc; __mbsinit = _none_mbsinit; - __mbsrtowcs = _none_mbsrtowcs; + __mbsnrtowcs = _none_mbsnrtowcs; __wcrtomb = _none_wcrtomb; - __wcsrtombs = _none_wcsrtombs; + __wcsnrtombs = _none_wcsnrtombs; _CurrentRuneLocale = rl; __mb_cur_max = 1; return(0); @@ -119,18 +120,20 @@ } size_t -_none_mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, - size_t len, mbstate_t * __restrict ps __unused) +_none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src, + size_t nms, size_t len, mbstate_t * __restrict ps __unused) { const char *s; size_t nchr; - if (dst == NULL) - return (strlen(*src)); + if (dst == NULL) { + s = memchr(*src, '\0', nms); + return (s != NULL ? s - *src : nms); + } s = *src; nchr = 0; - while (len-- > 0) { + while (len-- > 0 && nms-- > 0) { if ((*dst++ = (unsigned char)*s++) == L'\0') { *src = NULL; return (nchr); @@ -142,14 +145,14 @@ } size_t -_none_wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, - size_t len, mbstate_t * __restrict ps __unused) +_none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src, + size_t nwc, size_t len, mbstate_t * __restrict ps __unused) { const wchar_t *s; size_t nchr; if (dst == NULL) { - for (s = *src; *s != L'\0'; s++) { + for (s = *src; nwc > 0 && *s != L'\0'; s++, nwc--) { if (*s < 0 || *s > UCHAR_MAX) { errno = EILSEQ; return ((size_t)-1); @@ -160,7 +163,7 @@ s = *src; nchr = 0; - while (len-- > 0) { + while (len-- > 0 && nwc-- > 0) { if (*s < 0 || *s > UCHAR_MAX) { errno = EILSEQ; return ((size_t)-1); ==== //depot/projects/hammer/lib/libc/locale/setrunelocale.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ #define OBSOLETE_IN_6 #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.39 2004/06/23 07:01:43 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.40 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -100,10 +100,11 @@ static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict); static int (*Cached__mbsinit)(const mbstate_t *); - static size_t (*Cached__mbsrtowcs)(wchar_t * __restrict, - const char ** __restrict, size_t, mbstate_t * __restrict); - static size_t (*Cached__wcsrtombs)(char * __restrict, - const wchar_t ** __restrict, size_t, mbstate_t * __restrict); + static size_t (*Cached__mbsnrtowcs)(wchar_t * __restrict, + const char ** __restrict, size_t, size_t, mbstate_t * __restrict); + static size_t (*Cached__wcsnrtombs)(char * __restrict, + const wchar_t ** __restrict, size_t, size_t, + mbstate_t * __restrict); /* * The "C" and "POSIX" locale are always here. @@ -113,9 +114,9 @@ __mb_cur_max = 1; __mbrtowc = _none_mbrtowc; __mbsinit = _none_mbsinit; - __mbsrtowcs = _none_mbsrtowcs; + __mbsnrtowcs = _none_mbsnrtowcs; __wcrtomb = _none_wcrtomb; - __wcsrtombs = _none_wcsrtombs; + __wcsnrtombs = _none_wcsnrtombs; return (0); } @@ -128,9 +129,9 @@ __mb_cur_max = Cached__mb_cur_max; __mbrtowc = Cached__mbrtowc; __mbsinit = Cached__mbsinit; - __mbsrtowcs = Cached__mbsrtowcs; + __mbsnrtowcs = Cached__mbsnrtowcs; __wcrtomb = Cached__wcrtomb; - __wcsrtombs = Cached__wcsrtombs; + __wcsnrtombs = Cached__wcsnrtombs; return (0); } @@ -156,9 +157,9 @@ __mbrtowc = NULL; __mbsinit = NULL; - __mbsrtowcs = __mbsrtowcs_std; + __mbsnrtowcs = __mbsnrtowcs_std; __wcrtomb = NULL; - __wcsrtombs = __wcsrtombs_std; + __wcsnrtombs = __wcsnrtombs_std; rl->__sputrune = __emulated_sputrune; rl->__sgetrune = __emulated_sgetrune; if (strcmp(rl->__encoding, "NONE") == 0) @@ -192,9 +193,9 @@ Cached__mb_cur_max = __mb_cur_max; Cached__mbrtowc = __mbrtowc; Cached__mbsinit = __mbsinit; - Cached__mbsrtowcs = __mbsrtowcs; + Cached__mbsnrtowcs = __mbsnrtowcs; Cached__wcrtomb = __wcrtomb; - Cached__wcsrtombs = __wcsrtombs; + Cached__wcsnrtombs = __wcsnrtombs; (void)strcpy(ctype_encoding, encoding); } else free(rl); ==== //depot/projects/hammer/lib/libc/locale/table.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.23 2004/05/13 11:20:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.24 2004/07/21 10:54:57 tjr Exp $"); #include #include @@ -255,9 +255,9 @@ size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict) = _none_mbrtowc; int (*__mbsinit)(const mbstate_t *) = _none_mbsinit; -size_t (*__mbsrtowcs)(wchar_t * __restrict, const char ** __restrict, - size_t, mbstate_t * __restrict) = _none_mbsrtowcs; +size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict, + size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs; size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) = _none_wcrtomb; -size_t (*__wcsrtombs)(char * __restrict, const wchar_t ** __restrict, - size_t, mbstate_t * __restrict) = _none_wcsrtombs; +size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict, + size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs; ==== //depot/projects/hammer/lib/libc/locale/wcsrtombs.3#4 (text+ko) ==== @@ -22,13 +22,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.4 2004/04/08 09:59:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ .\" -.Dd April 8, 2004 +.Dd July 21, 2004 .Dt WCSRTOMBS 3 .Os .Sh NAME -.Nm wcsrtombs +.Nm wcsrtombs , +.Nm wcsnrtombs .Nd "convert a wide-character string to a character string (restartable)" .Sh LIBRARY .Lb libc @@ -39,6 +40,11 @@ .Fa "char * restrict dst" "const wchar_t ** restrict src" .Fa "size_t len" "mbstate_t * restrict ps" .Fc +.Ft size_t +.Fo wcsnrtombs +.Fa "char * restrict dst" "const wchar_t ** restrict src" "size_t nwc" +.Fa "size_t len" "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn wcsrtombs @@ -82,10 +88,21 @@ .Vt mbstate_t object, which is initialized to the initial conversion state at program startup. +.Pp +The +.Fn wcsnrtombs +function behaves identically to +.Fn wcsrtombs , +except that conversion stops after reading at most +.Fa nwc +characters from the buffer pointed to by +.Fa src . .Sh RETURN VALUES The .Fn wcsrtombs -function returns the number of bytes stored in +and +.Fn wcsnrtombs +functions return the number of bytes stored in the array pointed to by .Fa dst (not including any terminating null), if successful, otherwise it returns @@ -93,7 +110,9 @@ .Sh ERRORS The .Fn wcsrtombs -function will fail if: +and +.Fn wcsnrtombs >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 23 01:53:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 387B016A4D1; Fri, 23 Jul 2004 01:53:49 +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 E1B2316A4CF for ; Fri, 23 Jul 2004 01:53:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D862A43D2F for ; Fri, 23 Jul 2004 01:53:48 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6N1rmbn023386 for ; Fri, 23 Jul 2004 01:53:48 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6N1rmGS023383 for perforce@freebsd.org; Fri, 23 Jul 2004 01:53:48 GMT (envelope-from wsalamon@computer.org) Date: Fri, 23 Jul 2004 01:53:48 GMT Message-Id: <200407230153.i6N1rmGS023383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57959 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: Fri, 23 Jul 2004 01:53:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=57959 Change 57959 by wsalamon@wsalamon_epi on 2004/07/23 01:52:58 Clean up includes mostly, fix some compilation errors. Create Makefile to build libbsm.a. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/libbsm.h#2 edit .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -## Probably only works with GNU make - -ifndef CFLAGS CFLAGS = -g -Wall -pipe -fno-common -endif GCC=gcc -LIBCFLAGS = $(CFLAGS) -I. -dynamic -LIB_NAME=libbsm.dylib +AR=ar +LIBCFLAGS = $(CFLAGS) -I/usr/include -I. +LIB_NAME=libbsm.a LIBCURVERS=1.0 LIBCOMPATVERS=1.0 @@ -25,9 +22,13 @@ $(GCC) $(LIBCFLAGS) -c bsm_mask.c $(GCC) $(LIBCFLAGS) -c bsm_token.c $(GCC) $(LIBCFLAGS) -c bsm_user.c - $(GCC) $(LIBCFLAGS) -c bsm_notify.c $(GCC) $(LIBCFLAGS) -c lib_wrappers.c - $(GCC) -dynamiclib $(CFLAGS) -install_name /usr/lib/$(LIB_NAME) -compatibility_version $(LIBCOMPATVERS) -current_version $(LIBCURVERS) *.o -o $(LIB_NAME) +## +## bsm_notify is not compiled for now; needs ported to FreeBSD if we decide +## to use it. +## +## $(GCC) $(LIBCFLAGS) -c bsm_notify.c + $(AR) -r $(LIB_NAME) *.o install: $(LIB_NAME) install -d /usr/lib ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#2 (text+ko) ==== @@ -26,13 +26,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include #include #include +#include +#include +#include +#include -#include +#include /* array of used descriptors */ static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; @@ -213,7 +215,7 @@ } /* Call the kernel interface to audit */ - retval = audit(rec->data, rec->len); + retval = syscall(SYS_audit, rec->data, rec->len); } /* CLEANUP */ ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_class file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#2 (text+ko) ==== @@ -30,8 +30,9 @@ #include #include #include +#include -#include +#include /* * Parse the contents of the audit_control file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_event file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -#include +#include char *delim = ","; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -#include +#include #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) \ do {\ ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* MT-Safe */ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* uint32_t */ #include /* syslog() */ #include /* syslog() */ -#include "libbsm.h" +#include /* if 1, assumes a kernel that sends the right notification */ #define AUDIT_NOTIFICATION_ENABLED 1 ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#2 (text+ko) ==== @@ -29,10 +29,12 @@ #include #include #include +#include +#include +#include #include -#include -#include +#include #define GET_TOKEN_AREA(t, dptr, length) \ do {\ @@ -838,14 +840,12 @@ * address type/length 4 bytes * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) */ -token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, - struct sockaddr *la, struct sockaddr *ra) +token_t *au_to_socket_ex_32(struct socket *so) { return NULL; } -token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, - struct sockaddr *la, struct sockaddr *ra) +token_t *au_to_socket_ex_128(struct socket *so) { return NULL; } @@ -1052,7 +1052,7 @@ auditinfo_t auinfo; - if(getaudit(&auinfo) != 0) { + if(syscall(SYS_getaudit, &auinfo) != 0) { return NULL; } ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_user file into au_user_ent structures ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#2 (text+ko) ==== @@ -29,14 +29,15 @@ /* * XXX lib_wrappers.c is a provisional name */ -#include /* [f]stat(), sysctl(), gete[ug]id(), getpid() */ +#include +#include /* syslog() */ +#include +#include /* syslog() */ +#include /* STDIN_FILENO, gete[ug]id(), getpid() */ +#include #include /* [f]stat() */ #include /* sysctl() */ -#include /* STDIN_FILENO, gete[ug]id(), getpid() */ -#include /* syslog() */ -#include /* syslog() */ -#include -#include "libbsm.h" +#include /* [f]stat(), sysctl(), gete[ug]id(), getpid() */ /* * XXX Write up in a separate white paper. @@ -319,36 +320,3 @@ /* END OF au_write() WRAPPERS */ - -void -audit_token_to_au32( - audit_token_t atoken, - uid_t *auidp, - uid_t *euidp, - gid_t *egidp, - uid_t *ruidp, - gid_t *rgidp, - pid_t *pidp, - au_asid_t *asidp, - au_tid_t *tidp) -{ - if (auidp != NULL) - *auidp = (uid_t)atoken.val[0]; - if (euidp != NULL) - *euidp = (uid_t)atoken.val[1]; - if (egidp != NULL) - *egidp = (gid_t)atoken.val[2]; - if (ruidp != NULL) - *ruidp = (uid_t)atoken.val[3]; - if (rgidp != NULL) - *rgidp = (gid_t)atoken.val[4]; - if (pidp != NULL) - *pidp = (pid_t)atoken.val[5]; - if (asidp != NULL) - *asidp = (au_asid_t)atoken.val[6]; - if (tidp != NULL) { - audit_set_terminal_host(&tidp->machine); - tidp->port = (dev_t)atoken.val[7]; - } -} - ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/libbsm.h#2 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include /* audit_token_t */ #define AU_PRS_SUCCESS 1 #define AU_PRS_FAILURE 2 @@ -838,12 +837,6 @@ void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm); __END_DECLS -/* - * Apple-internal "wrapping" and utility definitions and prototypes. - */ - -#include - #ifdef __APPLE_API_PRIVATE #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" #endif @@ -1144,55 +1137,6 @@ /* END au_write() WRAPPERS */ - -/* - * audit_token_to_au32() - * - * @summary - Extract information from an audit_token_t, used to identify - * Mach tasks and senders of Mach messages as subjects to the audit system. - * audit_tokent_to_au32() is the only method that should be used to parse - * an audit_token_t, since its internal representation may change over - * time. A pointer parameter may be NULL if that information is not - * needed. - * - * @param atoken - the audit token containing the desired information - * - * @param auidp - Pointer to a uid_t; on return will be set to the task or - * sender's audit user ID - * - * @param euidp - Pointer to a uid_t; on return will be set to the task or - * sender's effective user ID - * - * @param egidp - Pointer to a gid_t; on return will be set to the task or - * sender's effective group ID - * - * @param ruidp - Pointer to a uid_t; on return will be set to the task or - * sender's real user ID - * - * @param rgidp - Pointer to a gid_t; on return will be set to the task or - * sender's real group ID - * - * @param pidp - Pointer to a pid_t; on return will be set to the task or - * sender's process ID - * - * @param asidp - Pointer to an au_asid_t; on return will be set to the - * task or sender's audit session ID - * - * @param tidp - Pointer to an au_tid_t; on return will be set to the task - * or sender's terminal ID - */ -void audit_token_to_au32( - audit_token_t atoken, - uid_t *auidp, - uid_t *euidp, - gid_t *egidp, - uid_t *ruidp, - gid_t *rgidp, - pid_t *pidp, - au_asid_t *asidp, - au_tid_t *tidp); - - __END_DECLS ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#3 (text+ko) ==== @@ -24,9 +24,9 @@ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H +#include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Jul 23 01:58:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D7B116A4D0; Fri, 23 Jul 2004 01:58:56 +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 26B8F16A4CE for ; Fri, 23 Jul 2004 01:58:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F4E543D4C for ; Fri, 23 Jul 2004 01:58:56 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6N1wuo5023521 for ; Fri, 23 Jul 2004 01:58:56 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6N1wtSo023518 for perforce@freebsd.org; Fri, 23 Jul 2004 01:58:55 GMT (envelope-from peter@freebsd.org) Date: Fri, 23 Jul 2004 01:58:55 GMT Message-Id: <200407230158.i6N1wtSo023518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57961 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: Fri, 23 Jul 2004 01:58:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=57961 Change 57961 by peter@peter_melody on 2004/07/23 01:58:10 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#96 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#37 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#14 (text+ko) ==== @@ -526,7 +526,7 @@ if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) || dmat->boundary > 0 || dmat->alignment > 1) - && map->pagesneeded == 0) { + && map != &nobounce_dmamap && map->pagesneeded == 0) { vm_offset_t vendaddr; /* ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#96 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#37 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1165) +# (XXX from i386:NOTES,v 1.1166) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.14 2004/05/17 22:13:14 peter Exp $ # From owner-p4-projects@FreeBSD.ORG Fri Jul 23 02:41:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7578716A4D0; Fri, 23 Jul 2004 02:41:49 +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 511CA16A4CE for ; Fri, 23 Jul 2004 02:41:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49F6543D48 for ; Fri, 23 Jul 2004 02:41:49 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6N2fnPT024686 for ; Fri, 23 Jul 2004 02:41:49 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6N2fn0c024683 for perforce@freebsd.org; Fri, 23 Jul 2004 02:41:49 GMT (envelope-from wsalamon@computer.org) Date: Fri, 23 Jul 2004 02:41:49 GMT Message-Id: <200407230241.i6N2fn0c024683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57965 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: Fri, 23 Jul 2004 02:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=57965 Change 57965 by wsalamon@wsalamon_epi on 2004/07/23 02:41:13 Change to produce a shared library. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/Makefile#3 (text+ko) ==== @@ -1,9 +1,12 @@ -CFLAGS = -g -Wall -pipe -fno-common +## +## Makefile for the BSM library. +## +CFLAGS = -g -Wall -fPIC GCC=gcc AR=ar -LIBCFLAGS = $(CFLAGS) -I/usr/include -I. -LIB_NAME=libbsm.a +LIBCFLAGS = -g -Wall -shared -I/usr/include -I. +LIB_NAME=libbsm.so LIBCURVERS=1.0 LIBCOMPATVERS=1.0 @@ -13,22 +16,22 @@ all: $(LIB_NAME) $(LIB_NAME): - $(GCC) $(LIBCFLAGS) -c bsm_audit.c - $(GCC) $(LIBCFLAGS) -c bsm_io.c - $(GCC) $(LIBCFLAGS) -c bsm_class.c - $(GCC) $(LIBCFLAGS) -c bsm_control.c - $(GCC) $(LIBCFLAGS) -c bsm_event.c - $(GCC) $(LIBCFLAGS) -c bsm_flags.c - $(GCC) $(LIBCFLAGS) -c bsm_mask.c - $(GCC) $(LIBCFLAGS) -c bsm_token.c - $(GCC) $(LIBCFLAGS) -c bsm_user.c - $(GCC) $(LIBCFLAGS) -c lib_wrappers.c + $(GCC) $(CFLAGS) -c bsm_audit.c + $(GCC) $(CFLAGS) -c bsm_io.c + $(GCC) $(CFLAGS) -c bsm_class.c + $(GCC) $(CFLAGS) -c bsm_control.c + $(GCC) $(CFLAGS) -c bsm_event.c + $(GCC) $(CFLAGS) -c bsm_flags.c + $(GCC) $(CFLAGS) -c bsm_mask.c + $(GCC) $(CFLAGS) -c bsm_token.c + $(GCC) $(CFLAGS) -c bsm_user.c + $(GCC) $(CFLAGS) -c lib_wrappers.c ## ## bsm_notify is not compiled for now; needs ported to FreeBSD if we decide ## to use it. ## -## $(GCC) $(LIBCFLAGS) -c bsm_notify.c - $(AR) -r $(LIB_NAME) *.o +## $(GCC) $(CFLAGS) -c bsm_notify.c + $(GCC) $(LIBCFLAGS) -o $(LIB_NAME) *.o install: $(LIB_NAME) install -d /usr/lib From owner-p4-projects@FreeBSD.ORG Fri Jul 23 19:01:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E09B316A4D0; Fri, 23 Jul 2004 19:01:15 +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 BA28116A4CE for ; Fri, 23 Jul 2004 19:01:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3CA743D31 for ; Fri, 23 Jul 2004 19:01:15 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6NJ1F7H053401 for ; Fri, 23 Jul 2004 19:01:15 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6NJ1Fld053396 for perforce@freebsd.org; Fri, 23 Jul 2004 19:01:15 GMT (envelope-from dfr@freebsd.org) Date: Fri, 23 Jul 2004 19:01:15 GMT Message-Id: <200407231901.i6NJ1Fld053396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 58003 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: Fri, 23 Jul 2004 19:01:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=58003 Change 58003 by dfr@dfr_home on 2004/07/23 19:00:34 Add copyright notices. Affected files ... .. //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#2 edit .. //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#2 edit .. //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#2 edit Differences ... ==== //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#2 (text+ko) ==== @@ -1,3 +1,31 @@ +/*- + * Copyright (C) 2004 NVIDIA Corporation. + * 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 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 AUTHOR 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$ + */ + .file "elftls.S" .globl __gl_tls_offsets ==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#2 (text+ko) ==== @@ -1,3 +1,31 @@ +/*- + * Copyright (C) 2004 NVIDIA Corporation. + * 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 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 AUTHOR 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$ + */ + #include #define __G_TLS_OFFSETS_SIZE 8 ==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#2 (text+ko) ==== @@ -1,3 +1,31 @@ +/*- + * Copyright (C) 2004 NVIDIA Corporation. + * 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 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 AUTHOR 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$ + */ + #include #include From owner-p4-projects@FreeBSD.ORG Sat Jul 24 08:59:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EBC616A4D0; Sat, 24 Jul 2004 08:59:34 +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 1F13C16A4CE for ; Sat, 24 Jul 2004 08:59:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A65E43D3F for ; Sat, 24 Jul 2004 08:59:34 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6O8xX05084484 for ; Sat, 24 Jul 2004 08:59:33 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6O8xXrZ084481 for perforce@freebsd.org; Sat, 24 Jul 2004 08:59:33 GMT (envelope-from julian@freebsd.org) Date: Sat, 24 Jul 2004 08:59:33 GMT Message-Id: <200407240859.i6O8xXrZ084481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 58030 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: Sat, 24 Jul 2004 08:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=58030 Change 58030 by julian@julian_ref on 2004/07/24 08:58:33 change a function name to match others. Affected files ... .. //depot/projects/nsched/sys/kern/kern_thread.c#30 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#29 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#17 edit .. //depot/projects/nsched/sys/sys/sched.h#10 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_thread.c#30 (text+ko) ==== @@ -187,7 +187,7 @@ /* NOTREACHED */ } #endif - sched_init_thread(td); /* ready for use (again) */ + sched_newthread(td); /* ready for use (again) */ } /* @@ -242,7 +242,7 @@ cpu_thread_setup(td); td->td_sleepqueue = sleepq_alloc(); td->td_turnstile = turnstile_alloc(); - sched_init_thread(td); + sched_newthread(td); } ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#29 (text+ko) ==== @@ -1295,7 +1295,7 @@ */ /* Assumes td->td_sched is already set up */ void -sched_init_thread(struct thread *td) +sched_newthread(struct thread *td) { } ==== //depot/projects/nsched/sys/kern/sched_ule.c#17 (text+ko) ==== @@ -2262,7 +2262,7 @@ */ /* Assumes td->td_sched is already set up */ void -sched_init_thread(struct thread *td) +sched_newthread(struct thread *td) { td->td_last_kse = NULL; td->td_kse = NULL; ==== //depot/projects/nsched/sys/sys/sched.h#10 (text+ko) ==== @@ -117,6 +117,6 @@ void sched_GC(void); void sched_set_concurrancy(struct ksegrp *kg, int concurrancy); void sched_init_ksegrp(struct ksegrp *kg); -void sched_init_thread(struct thread *td); +void sched_newthread(struct thread *td); void sched_clean_ksegrp(struct ksegrp *kg, struct thread *td); #endif /* !_SYS_SCHED_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jul 24 09:24:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 124B716A4D0; Sat, 24 Jul 2004 09:24:04 +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 DF23A16A4CE for ; Sat, 24 Jul 2004 09:24:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAC7743D3F for ; Sat, 24 Jul 2004 09:24:03 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6O9O3xK085130 for ; Sat, 24 Jul 2004 09:24:03 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6O9O3Xf085127 for perforce@freebsd.org; Sat, 24 Jul 2004 09:24:03 GMT (envelope-from julian@freebsd.org) Date: Sat, 24 Jul 2004 09:24:03 GMT Message-Id: <200407240924.i6O9O3Xf085127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 58031 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: Sat, 24 Jul 2004 09:24:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=58031 Change 58031 by julian@julian_ref on 2004/07/24 09:23:10 Simplify spare allocation a bit. We don't need that second argumant. Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#20 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#20 (text+ko) ==== @@ -66,7 +66,7 @@ TAILQ_HEAD_INITIALIZER(zombie_upcalls); static int thread_update_usr_ticks(struct thread *td, int user); -static void thread_alloc_spare(struct thread *td, struct thread *spare); +static void thread_alloc_spare(struct thread *td); struct kse_upcall * upcall_alloc(void) @@ -576,7 +576,7 @@ /* For the first call this may not have been set */ if (td->td_standin == NULL) - thread_alloc_spare(td, NULL); + thread_alloc_spare(td); PROC_LOCK(p); if (newkg->kg_numupcalls >= ncpus) { @@ -894,17 +894,12 @@ * for thread_schedule_upcall(). */ void -thread_alloc_spare(struct thread *td, struct thread *spare) +thread_alloc_spare(struct thread *td) { - if (td->td_standin) return; - if (spare == NULL) { - spare = thread_alloc(); - } - sched_init_thread(spare); - td->td_standin = spare; - bzero(&spare->td_startzero, + td->td_standin = thread_alloc(); + bzero(&td->td_spare->td_startzero, (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); spare->td_proc = td->td_proc; spare->td_ucred = crhold(td->td_ucred); @@ -1061,7 +1056,7 @@ td->td_mailbox = NULL; } else { if (td->td_standin == NULL) - thread_alloc_spare(td, NULL); + thread_alloc_spare(td); flags = fuword32(&tmbx->tm_flags); /* * On some architectures, TP register points to thread @@ -1288,7 +1283,7 @@ * for when we re-enter the kernel. */ if (td->td_standin == NULL) - thread_alloc_spare(td, NULL); + thread_alloc_spare(td); } ku->ku_mflags = 0; From owner-p4-projects@FreeBSD.ORG Sat Jul 24 09:30:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E080F16A4D0; Sat, 24 Jul 2004 09:30:11 +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 BB91B16A4CE for ; Sat, 24 Jul 2004 09:30:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7F3E43D39 for ; Sat, 24 Jul 2004 09:30:11 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6O9UB35085254 for ; Sat, 24 Jul 2004 09:30:11 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6O9UBvt085251 for perforce@freebsd.org; Sat, 24 Jul 2004 09:30:11 GMT (envelope-from julian@freebsd.org) Date: Sat, 24 Jul 2004 09:30:11 GMT Message-Id: <200407240930.i6O9UBvt085251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 58032 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: Sat, 24 Jul 2004 09:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=58032 Change 58032 by julian@julian_ref on 2004/07/24 09:29:49 make a local cached value. Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#21 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#21 (text+ko) ==== @@ -896,10 +896,12 @@ void thread_alloc_spare(struct thread *td) { + struct thread *spare; + if (td->td_standin) return; - td->td_standin = thread_alloc(); - bzero(&td->td_spare->td_startzero, + td->td_standin = spare = thread_alloc(); + bzero(&spare->td_startzero, (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); spare->td_proc = td->td_proc; spare->td_ucred = crhold(td->td_ucred); From owner-p4-projects@FreeBSD.ORG Sat Jul 24 17:29:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8A2216A4D0; Sat, 24 Jul 2004 17:29:56 +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 97C4216A4CE for ; Sat, 24 Jul 2004 17:29:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9297943D48 for ; Sat, 24 Jul 2004 17:29:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OHTugd099018 for ; Sat, 24 Jul 2004 17:29:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6OHTuT6099015 for perforce@freebsd.org; Sat, 24 Jul 2004 17:29:56 GMT (envelope-from marcel@freebsd.org) Date: Sat, 24 Jul 2004 17:29:56 GMT Message-Id: <200407241729.i6OHTuT6099015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 58051 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: Sat, 24 Jul 2004 17:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=58051 Change 58051 by marcel@marcel_nfs on 2004/07/24 17:29:34 Basic support on i386. The machine specific file is really trivial, so it's easy to add new machines. What's lacking in general is: o Loading of kernel modules, o Printing of the panic string, o Setting of the source search directories. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#2 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#2 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#2 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#2 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#1 add Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= kgdb -SRCS= kthr.c main.c +SRCS= kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c +WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (text+ko) ==== @@ -30,18 +30,20 @@ extern kvm_t *kvm; extern int verbose; -struct pcb; - struct kthr { struct kthr *next; uintptr_t kaddr; - uintptr_t td_kstack; - struct pcb *td_pcb; - int td_tid; + uintptr_t kstack; + uintptr_t pcb; + int tid; }; extern struct kthr *curkthr; +void kgdb_target(void); +void kgdb_trgt_fetch_registers(int); +void kgdb_trgt_store_registers(int); + struct kthr *kgdb_thr_first(void); struct kthr *kgdb_thr_init(void); struct kthr *kgdb_thr_lookup(int); ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#2 (text+ko) ==== @@ -37,16 +37,28 @@ #include #include -#include - #include "kgdb.h" -struct pcb *dumppcb; -int dumptid; +static uintptr_t dumppcb; +static int dumptid; static struct kthr *first; struct kthr *curkthr; +static uintptr_t +lookup(const char *sym) +{ + struct nlist nl[2]; + + nl[0].n_name = (char *)(uintptr_t)sym; + nl[1].n_name = NULL; + if (kvm_nlist(kvm, nl) != 0) { + warnx("kvm_nlist(%s): %s", sym, kvm_geterr(kvm)); + return (0); + } + return (nl[0].n_value); +} + struct kthr * kgdb_thr_first(void) { @@ -56,46 +68,42 @@ struct kthr * kgdb_thr_init(void) { - struct nlist nl[3]; struct proc p; struct thread td; - struct kthr *thr; - uintptr_t paddr, tdaddr; + struct kthr *kt; + uintptr_t addr, paddr; + + addr = lookup("_allproc"); + if (addr == 0) + return (NULL); + kvm_read(kvm, addr, &paddr, sizeof(paddr)); - nl[0].n_name = (char *)(uintptr_t)"_allproc"; - nl[1].n_name = NULL; - if (kvm_nlist(kvm, nl) != 0) { - warnx(kvm_geterr(kvm)); + dumppcb = lookup("_dumppcb"); + if (dumppcb == 0) return (NULL); - } - kvm_read(kvm, nl[0].n_value, &paddr, sizeof(paddr)); - nl[0].n_name = (char *)(uintptr_t)"_dumppcb"; - nl[1].n_name = (char *)(uintptr_t)"_dumptid"; - nl[2].n_name = NULL; - if (kvm_nlist(kvm, nl) != 0) { - warnx(kvm_geterr(kvm)); - dumppcb = NULL; + addr = lookup("_dumptid"); + if (addr != 0) + kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); + else dumptid = -1; - } else { - dumppcb = (struct pcb *)(nl[0].n_value); - kvm_read(kvm, nl[1].n_value, &dumptid, sizeof(dumptid)); - } while (paddr != 0) { - kvm_read(kvm, paddr, &p, sizeof(p)); - tdaddr = (uintptr_t)TAILQ_FIRST(&p.p_threads); - while (tdaddr != 0) { - kvm_read(kvm, tdaddr, &td, sizeof(td)); - thr = malloc(sizeof(*thr)); - thr->next = first; - thr->kaddr = tdaddr; - thr->td_pcb = (td.td_tid == dumptid) ? dumppcb : - td.td_pcb; - thr->td_kstack = td.td_kstack; - thr->td_tid = td.td_tid; - first = thr; - tdaddr = (uintptr_t)TAILQ_NEXT(&td, td_plist); + if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) + warnx("kvm_read: %s", kvm_geterr(kvm)); + addr = (uintptr_t)TAILQ_FIRST(&p.p_threads); + while (addr != 0) { + if (kvm_read(kvm, addr, &td, sizeof(td)) != sizeof(td)) + warnx("kvm_read: %s", kvm_geterr(kvm)); + kt = malloc(sizeof(*kt)); + kt->next = first; + kt->kaddr = addr; + kt->pcb = (td.td_tid == dumptid) ? dumppcb : + (uintptr_t)td.td_pcb; + kt->kstack = td.td_kstack; + kt->tid = td.td_tid; + first = kt; + addr = (uintptr_t)TAILQ_NEXT(&td, td_plist); } paddr = (uintptr_t)LIST_NEXT(&p, p_list); } @@ -108,26 +116,26 @@ struct kthr * kgdb_thr_lookup(int tid) { - struct kthr *thr; + struct kthr *kt; - thr = first; - while (thr != NULL && thr->td_tid != tid) - thr = thr->next; - return (thr); + kt = first; + while (kt != NULL && kt->tid != tid) + kt = kt->next; + return (kt); } struct kthr * -kgdb_thr_next(struct kthr *thr) +kgdb_thr_next(struct kthr *kt) { - return (thr->next); + return (kt->next); } struct kthr * -kgdb_thr_select(struct kthr *thr) +kgdb_thr_select(struct kthr *kt) { struct kthr *pcur; pcur = curkthr; - curkthr = thr; + curkthr = kt; return (pcur); } ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#2 (text+ko) ==== @@ -48,10 +48,14 @@ /* libgdb stuff. */ #include +#include +#include +#include +#include #include +#include #include -extern void (*pre_init_ui_hook)(void); extern void (*init_ui_hook)(char *); extern void symbol_file_add_main (char *args, int from_tty); @@ -67,6 +71,8 @@ static char *kernel; static char *vmcore; +static void (*kgdb_new_objfile_chain)(struct objfile * objfile); + static void usage(void) { @@ -150,13 +156,52 @@ } static void +kgdb_new_objfile(struct objfile *objfile) +{ +#if 0 + printf("XXX: %s(%p)\n", __func__, objfile); + if (objfile != NULL) { + goto out; + } + +out: +#endif + if (kgdb_new_objfile_chain != NULL) + kgdb_new_objfile_chain(objfile); +} + +static void +kgdb_interp_command_loop(void *data) +{ + static int once = 0; + + if (!once) { + symbol_file_add_main (kernel, 0); + print_stack_frame(get_current_frame(), -1, 0); + once = 1; + } + command_loop(); +} + +static void kgdb_init(char *argv0 __unused) { + static struct interp_procs procs = { + NULL, + NULL, + NULL, + NULL, + NULL, + kgdb_interp_command_loop + }; + struct interp *kgdb; + kgdb = interp_new("kgdb", NULL, cli_out_new(gdb_stdout), &procs); + interp_add(kgdb); + set_prompt("(kgdb) "); - - /* Push our target onto the stack. */ - - symbol_file_add_main (kernel, 0); + kgdb_target(); + kgdb_new_objfile_chain = target_new_objfile_hook; + target_new_objfile_hook = kgdb_new_objfile; } int @@ -166,14 +211,6 @@ char *s; int ch; - memset (&args, 0, sizeof args); - args.argc = 1; - args.argv = argv; - args.use_windows = 0; - args.interpreter_p = "console"; - - init_ui_hook = kgdb_init; - dumpnr = -1; strlcpy(crashdir, "/var/crash", sizeof(crashdir)); @@ -203,8 +240,6 @@ usage(); } } - argc -= optind; - argv += optind; if (verbose > 1) warnx("using %s as the crash directory", crashdir); @@ -212,17 +247,15 @@ if (dumpnr >= 0) use_dump(dumpnr); - if (argc > 0) { + if (argc > optind) { if (kernel != NULL) free(kernel); - kernel = strdup(*argv++); - argc--; + kernel = strdup(argv[optind++]); } - while (argc > 0) { + while (argc > optind) { if (vmcore != NULL) errx(1, "multiple core files specified"); - vmcore = strdup(*argv++); - argc--; + vmcore = strdup(argv[optind++]); } if (kernel == NULL) @@ -243,5 +276,13 @@ kgdb_thr_init(); + memset (&args, 0, sizeof args); + args.argc = 1; + args.argv = argv; + args.use_windows = 0; + args.interpreter_p = "kgdb"; + + init_ui_hook = kgdb_init; + return (gdb_main(&args)); } From owner-p4-projects@FreeBSD.ORG Sat Jul 24 17:48:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF81016A4D0; Sat, 24 Jul 2004 17:48:19 +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 9507116A4CE for ; Sat, 24 Jul 2004 17:48:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5289A43D53 for ; Sat, 24 Jul 2004 17:48:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OHmJuP099645 for ; Sat, 24 Jul 2004 17:48:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6OHmIhR099642 for perforce@freebsd.org; Sat, 24 Jul 2004 17:48:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jul 2004 17:48:18 GMT Message-Id: <200407241748.i6OHmIhR099642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 58052 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: Sat, 24 Jul 2004 17:48:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=58052 Change 58052 by rwatson@rwatson_tislabs on 2004/07/24 17:47:43 Integrate netperf_socket from FreeBSD CVS HEAD: - Some debugger rearrangement. - More pmap locking. - Various hacking on preemption. - A number of less functional and EISA drivers trimmed from GENERIC. - pf lock order reversal correction. - A parade of ACPI tweaks. - curthread assertions in devfs/suser. - More sleep-related assertions in mbuf allocation. - BPF use of 0/NULL cleanup. - if_clone lock fix. - if_vlan memory leak fix. - nf_node_revive() for persistent notes. - TCP SACK fix. - Don't sync on panic by default. - Suser exemption to mac_bsdextended. Loop back from rwatson_netperf via CVS: - Giant pushed down into fo_close(), fo_stat(). Less giant for sockets and pipes now. - Tweaks to KTR. - Pipe allocation optimizations. - M_DONTWAIT in raw_ip.c to prevent sleep with mutex held. - MPSAFE callout for NFS server with debug.mpsafenet. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#12 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#30 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#23 integrate .. //depot/projects/netperf_socket/sys/conf/options#22 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#5 integrate .. //depot/projects/netperf_socket/sys/ddb/ddb.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#23 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lock.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/bpf.c#9 integrate .. //depot/projects/netperf_socket/sys/net/if_clone.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#11 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#17 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/db_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/float.h#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/locore.S#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap_subr.S#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/kdb.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#15 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#20 integrate .. //depot/projects/netperf_socket/sys/sys/pipe.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#10 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#9 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#13 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#12 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.19 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.20 2004/07/21 05:07:08 marcel Exp $"); #include #include @@ -324,20 +324,6 @@ } void -db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, - char *modif) -{ - struct thread *td; - - td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; - if (td == NULL) { - db_printf("Thread %d not found\n", (int)addr); - return; - } - db_trace_thread(td, count); -} - -void db_trace_self(void) { register_t pc, sp; ==== //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.81 2004/07/19 16:37:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.82 2004/07/20 06:32:32 alc Exp $"); #include #include @@ -436,7 +436,7 @@ critical_enter(); ih->ih_handler(ih->ih_argument); /* XXX */ - td->td_pflags &= ~TDP_OWEPREEMPT; + curthread->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); return; } ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#14 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.162 2004/07/19 18:12:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.163 2004/07/21 03:38:46 alc Exp $"); #include #include @@ -1359,6 +1359,8 @@ pv_entry_t pv; int rtval; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pmap == pv->pv_pmap && va == pv->pv_va) @@ -1416,6 +1418,7 @@ pt_entry_t oldpte; vm_page_t m; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = *ptq; *ptq = 0; if (oldpte & PG_W) @@ -1760,7 +1763,9 @@ if (opa) { int err; vm_page_lock_queues(); + PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); ==== //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.61 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.62 2004/07/21 05:07:08 marcel Exp $"); #include #include @@ -463,20 +463,6 @@ } void -db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, - char *modif) -{ - struct thread *td; - - td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; - if (td == NULL) { - db_printf("Thread %ld not found\n", addr); - return; - } - db_trace_thread(td, count); -} - -void db_trace_self(void) { struct amd64_frame *frame; ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#21 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.485 2004/07/15 18:00:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.486 2004/07/20 02:40:56 alc Exp $"); /* * Manages physical address maps. @@ -160,8 +160,6 @@ struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); -static struct pmaplist allpmaps; -static struct mtx allpmaps_lock; vm_paddr_t avail_start; /* PA of first available physical page */ vm_paddr_t avail_end; /* PA of last available physical page */ @@ -491,11 +489,6 @@ kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); - LIST_INIT(&allpmaps); - mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); - mtx_lock_spin(&allpmaps_lock); - LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); - mtx_unlock_spin(&allpmaps_lock); nkpt = NKPT; /* @@ -1082,9 +1075,6 @@ pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); - mtx_lock_spin(&allpmaps_lock); - LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); - mtx_unlock_spin(&allpmaps_lock); } /* @@ -1112,10 +1102,6 @@ if ((pml4pg->flags & PG_ZERO) == 0) pagezero(pmap->pm_pml4); - mtx_lock_spin(&allpmaps_lock); - LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); - mtx_unlock_spin(&allpmaps_lock); - /* Wire in kernel global address entries. */ pmap->pm_pml4[KPML4I] = KPDPphys | PG_RW | PG_V | PG_U; pmap->pm_pml4[DMPML4I] = DMPDPphys | PG_RW | PG_V | PG_U; @@ -1332,10 +1318,6 @@ ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); - mtx_lock_spin(&allpmaps_lock); - LIST_REMOVE(pmap, pm_list); - mtx_unlock_spin(&allpmaps_lock); - m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME); pmap->pm_pml4[KPML4I] = 0; /* KVA */ ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.415 2004/07/18 15:59:03 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.416 2004/07/22 22:29:45 imp Exp $ machine amd64 cpu HAMMER @@ -92,7 +92,6 @@ options ATA_STATIC_ID # Static device numbering # SCSI Controllers -device ahb # EISA AHA1742 family device ahc # AHA2940 and onboard AIC7xxx devices device ahd # AHA39320/29320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) @@ -104,7 +103,6 @@ device adv # Advansys SCSI adapters device adw # Advansys wide SCSI adapters -device aha # Adaptec 154x SCSI adapters device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters @@ -207,22 +205,16 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards -# XXX kvtop brokenness -#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. # XXX kvtop brokenness, pointer/int warnings #device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet -# ISA devices that use the old ISA shims -#device le - # Wireless NIC cards device wlan # 802.11 support device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. # Pseudo devices. device random # Entropy device ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC.hints#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.14 2004/03/19 03:28:38 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -17,15 +17,6 @@ hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" -hint.pcic.0.at="isa" -# hint.pcic.0.irq="10" # Default to polling -hint.pcic.0.port="0x3e0" -hint.pcic.0.maddr="0xd0000" -hint.pcic.1.at="isa" -hint.pcic.1.irq="11" -hint.pcic.1.port="0x3e2" -hint.pcic.1.maddr="0xd4000" -hint.pcic.1.disabled="1" hint.sio.0.at="isa" hint.sio.0.port="0x3F8" hint.sio.0.flags="0x10" ==== //depot/projects/netperf_socket/sys/amd64/include/pmap.h#12 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.121 2004/07/14 07:13:35 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.122 2004/07/20 02:40:56 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -226,7 +226,6 @@ u_int pm_active; /* active on cpus */ /* spare u_int here due to padding */ struct pmap_statistics pm_stats; /* pmap statistics */ - LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ }; typedef struct pmap *pmap_t; ==== //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.2 2004/07/21 22:04:05 cognet Exp $"); /* * MacPPC bus dma support routines @@ -433,7 +433,7 @@ if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else - pmap = NULL; + pmap = pmap_kernel(); lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -457,7 +457,7 @@ } else { pte = *ptep; KASSERT((pte & L2_TYPE_MASK) != L2_TYPE_INV, - "INV type"); + ("INV type")); if (__predict_false((pte & L2_TYPE_MASK) == L2_TYPE_L)) { curaddr = (pte & L2_L_FRAME) | ==== //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.2 2004/07/20 22:39:24 cognet Exp $"); #include @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include #include @@ -2079,10 +2081,8 @@ cpuctrl |= CPU_CONTROL_BEND_ENABLE; #endif -#if 0 if (vector_page == ARM_VECTORS_HIGH) cpuctrl |= CPU_CONTROL_VECRELOC; -#endif /* Clear out the cache */ cpu_idcache_wbinv_all(); @@ -2147,10 +2147,8 @@ cpuctrl |= CPU_CONTROL_BEND_ENABLE; #endif -#if 0 if (vector_page == ARM_VECTORS_HIGH) cpuctrl |= CPU_CONTROL_VECRELOC; -#endif /* Clear out the cache */ cpu_idcache_wbinv_all(); ==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.3 2004/07/19 12:26:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.4 2004/07/21 05:07:09 marcel Exp $"); #include #include @@ -86,7 +86,7 @@ #define FR_RSP (-2) #define FR_RFP (-3) -void +static void db_stack_trace_cmd(addr, have_addr, count, modif) db_expr_t addr; int have_addr; @@ -242,6 +242,7 @@ { return (0); } + int db_trace_thread(struct thread *thr, int count) { ==== //depot/projects/netperf_socket/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.2 2004/07/12 21:19:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.4 2004/07/20 23:00:02 cognet Exp $"); #include #include @@ -86,7 +86,6 @@ uint32_t cpu_reset_address = 0; int cold = 1; -int astpending = 0; vm_offset_t vector_page; static void * @@ -298,12 +297,21 @@ int ptrace_single_step(struct thread *td) { + /* XXX */ + return (0); +} + +int +ptrace_clear_single_step(struct thread *td) +{ + /* XXX */ return (0); } int ptrace_set_pc(struct thread *td, unsigned long addr) { + td->td_frame->tf_pc = addr; return (0); } ==== //depot/projects/netperf_socket/sys/arm/arm/pmap.c#5 (text+ko) ==== @@ -144,7 +144,7 @@ */ /* Include header files */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.6 2004/07/13 22:40:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.8 2004/07/22 23:04:41 alc Exp $"); #include #include #include @@ -2219,7 +2219,8 @@ for (loop = 0; loop < needed; loop++, l1++) { /* Allocate a L1 page table */ - va = (vm_offset_t)contigmalloc(L1_TABLE_SIZE, NULL, 0, 0x0, 0xffffffff, L1_TABLE_SIZE, 0); + va = (vm_offset_t)contigmalloc(L1_TABLE_SIZE, M_VMPMAP, 0, 0x0, + 0xffffffff, L1_TABLE_SIZE, 0); if (va == 0) panic("Cannot allocate L1 KVM"); @@ -4371,7 +4372,7 @@ GIANT_REQUIRED; - va = kmem_alloc_pageable(kernel_map, size); + va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); ==== //depot/projects/netperf_socket/sys/arm/arm/support.S#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.3 2004/05/14 23:42:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.4 2004/07/20 22:38:46 cognet Exp $"); #include "assym.s" @@ -65,11 +65,6 @@ bic r14, r14, #(I32_bit) ; \ msr cpsr_all, r14 -ENTRY(disable_intr) - IRQdisableALL -ENTRY(enable_intr) - IRQenableALL - /* * memset: Sets a block of memory to the specified value * ==== //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.2 2004/07/12 21:20:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.3 2004/07/20 22:38:46 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -50,13 +50,11 @@ #include #include /* For in[bwl] and out[bwl] */ -void disable_intr(void); -void enable_intr(void); - static __inline void breakpoint(void) { } + static __inline register_t intr_disable(void) { ==== //depot/projects/netperf_socket/sys/arm/include/pcb.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/pcb.h,v 1.2 2004/07/12 21:19:22 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pcb.h,v 1.3 2004/07/21 22:04:32 cognet Exp $ */ #ifndef _MACHINE_PCB_H_ @@ -94,7 +94,7 @@ void makectx(struct trapframe *tf, struct pcb *pcb); #ifdef _KERNEL -extern struct pcb *curpcb; + void savectx(struct pcb *); #endif /* _KERNEL */ ==== //depot/projects/netperf_socket/sys/arm/include/pmap.h#3 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.2 2004/07/12 21:22:40 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.3 2004/07/21 22:02:48 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -119,6 +119,7 @@ #endif +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) /* * Pmap sutff */ ==== //depot/projects/netperf_socket/sys/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.2 2004/05/19 15:41:25 bde Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.3 2004/07/20 22:38:46 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,11 +61,11 @@ #define MCOUNT_DECL(s) u_long s; #ifdef SMP extern int mcount_lock; -#define MCOUNT_ENTER(s) { s = read_eflags(); disable_intr(); \ +#define MCOUNT_ENTER(s) { s = intr_disable(); \ while (!atomic_cmpset_acq_int(&mcount_lock, 0, 1)) \ /* nothing */ ; } #define MCOUNT_EXIT(s) { atomic_store_rel_int(&mcount_lock, 0); \ - write_eflags(s); } + intr_restore(s); } #else #define MCOUNT_ENTER(s) { s = read_eflags(); disable_intr(); } #define MCOUNT_EXIT(s) (write_eflags(s)) ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.7 2003/07/17 00:32:08 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.8 2004/07/20 07:01:02 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) @@ -47,7 +47,7 @@ . = ALIGN(4096); .dynamic : { *(.dynamic) } . = ALIGN(4096); - .rela : { + .rela.dyn : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/start.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/start.S,v 1.6 2002/12/10 04:14:01 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/start.S,v 1.7 2004/07/20 07:11:14 marcel Exp $ */ .text @@ -70,6 +70,7 @@ #define R_IA64_FPTR64MSB 0x46 /* word64 MSB @fptr(S + A) */ #define R_IA64_FPTR64LSB 0x47 /* word64 LSB @fptr(S + A) */ #define R_IA64_REL64MSB 0x6e /* word64 MSB BD + A */ +#define R_IA64_REL32LSB 0x6d /* word32 LSB BD + A */ #define R_IA64_REL64LSB 0x6f /* word64 LSB BD + A */ #define R_IA64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ @@ -99,21 +100,19 @@ END(_start) // PLABEL for PE32+ - .global _start_plabel .section .plabel, "a" .align 16 -_start_plabel: - .quad _start - .quad __gp + .global _start_plabel +_start_plabel: + data16 @iplt(_start) .previous // A PE32+ relocation entry for the plabel - .section .reloc, "a" - .long _start_plabel - .long 12 - .short (10 << 12) + 0 - .short (10 << 12) + 8 + data4 _start_plabel + data4 12 + data2 (10 << 12) + 0 + data2 (10 << 12) + 8 .previous // in0: image base @@ -218,6 +217,9 @@ cmp.eq p6,p0=R_IA64_NONE,r23 (p6) br.cond.dpnt.few 2b ;; + cmp.eq p6,p0=R_IA64_REL32LSB,r23 +(p6) br.cond.dptk.few 3f + ;; cmp.eq p6,p0=R_IA64_REL64LSB,r23 (p6) br.cond.dptk.few 4f ;; @@ -252,6 +254,13 @@ st8 [r15]=gp // fdesc:GP br.cond.sptk.few 2b + // REL32LSB +3: + add r29=in0,r17 + ;; + st4 [r15]=r29 + br.cond.sptk.few 2b + // REL64LSB 4: add r29=in0,r17 // BD + A ==== //depot/projects/netperf_socket/sys/boot/efi/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.21 2004/02/13 04:45:41 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.22 2004/07/20 07:01:02 marcel Exp $ PROG= loader.sym INTERNALPROG= @@ -41,12 +41,12 @@ loader.efi: loader.sym ${OBJCOPY} -j .text \ - -j .hash \ -j .data \ -j .sdata \ -j .dynamic \ - -j .rela \ + -j .rela.dyn \ -j .reloc \ + -j .hash \ -j .dynsym \ -j .dynstr \ --target=efi-app-${MACHINE_ARCH} \ ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.39 2004/07/10 20:55:15 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.40 2004/07/20 20:28:57 wpaul Exp $"); #include #include @@ -44,7 +44,9 @@ #include #include +#if __FreeBSD_version > 502113 #include +#endif #include #include #include @@ -1634,7 +1636,11 @@ ntoskrnl_debugger(void) { +#if __FreeBSD_version < 502113 + Debugger("ntoskrnl_debugger(): breakpoint"); +#else kdb_enter("ntoskrnl_debugger(): breakpoint"); +#endif } static void ==== //depot/projects/netperf_socket/sys/conf/NOTES#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1248 2004/07/18 15:59:02 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1250 2004/07/23 17:44:07 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -192,6 +192,7 @@ # bugs during development. Enabling this option will reduce # performance and increase the frequency of kernel panics by # design. If you aren't sure that you need it then you don't. +# DON'T TURN THIS ON. # MUTEX_DEBUG enables various extra assertions in the mutex code. # SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table # used to hold active sleep queues. @@ -447,6 +448,7 @@ options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO +options NETGRAPH_DEVICE options NETGRAPH_ECHO options NETGRAPH_EIFACE options NETGRAPH_ETHER ==== //depot/projects/netperf_socket/sys/conf/files.i386#23 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.499 2004/07/15 16:43:52 njl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.500 2004/07/21 14:47:53 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -182,6 +182,7 @@ i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_asus.c optional acpi_asus acpi i386/acpica/acpi_machdep.c optional acpi +i386/acpica/acpi_panasonic.c optional acpi_panasonic acpi i386/acpica/acpi_toshiba.c optional acpi_toshiba acpi i386/acpica/acpi_wakeup.c optional acpi acpi_wakecode.h optional acpi \ ==== //depot/projects/netperf_socket/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.466 2004/07/18 18:21:39 kan Exp $ +# $FreeBSD: src/sys/conf/options,v 1.467 2004/07/20 12:42:54 glebius Exp $ # # On the handling of kernel options # @@ -386,6 +386,7 @@ NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h +NETGRAPH_DEVICE opt_netgraph.h NETGRAPH_ECHO opt_netgraph.h NETGRAPH_EIFACE opt_netgraph.h NETGRAPH_ETHER opt_netgraph.h ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.15 2004/07/18 14:25:48 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.16 2004/07/23 03:31:42 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* @@ -5573,15 +5573,22 @@ #ifdef __FreeBSD__ /* - * XXX - * FreeBSD supports cksum offload for the following drivers. - * em(4), gx(4), lge(4), nge(4), ti(4), xl(4) - * If we can make full use of it we would outperform ipfw/ipfilter in - * very heavy traffic. - * I have not tested 'cause I don't have NICs that supports cksum offload. - * (There might be problems. Typical phenomena would be - * 1. No route message for UDP packet. - * 2. No connection acceptance from external hosts regardless of rule set.) + * FreeBSD supports cksum offloads for the following drivers. + * em(4), fxp(4), gx(4), ixgb(4), lge(4), ndis(4), nge(4), re(4), + * ti(4), txp(4), xl(4) + * + * CSUM_DATA_VALID | CSUM_PSEUDO_HDR : + * network driver performed cksum including pseudo header, need to verify + * csum_data + * CSUM_DATA_VALID : + * network driver performed cksum, needs to additional pseudo header + * cksum computation with partial csum_data(i.e. lack of H/W support for + * pseudo header, for instance hme(4), sk(4) and possibly gem(4)) + * + * After validating the cksum of packet, set both flag CSUM_DATA_VALID and + * CSUM_PSEUDO_HDR in order to avoid recomputation of the cksum in upper + * TCP/UDP layer. + * Also, set csum_data to 0xffff to force cksum validation. */ int pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t af) @@ -5649,12 +5656,6 @@ if (m->m_len < sizeof(struct ip)) return (1); sum = in4_cksum(m, p, off, len); - if (sum == 0) { - m->m_pkthdr.csum_flags |= >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 24 19:03:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C03716A4D0; Sat, 24 Jul 2004 19:03:56 +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 D66F816A4CE for ; Sat, 24 Jul 2004 19:03:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC3EB43D45 for ; Sat, 24 Jul 2004 19:03:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OJ3tNG002154 for ; Sat, 24 Jul 2004 19:03:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6OJ3tCZ002151 for perforce@freebsd.org; Sat, 24 Jul 2004 19:03:55 GMT (envelope-from marcel@freebsd.org) Date: Sat, 24 Jul 2004 19:03:55 GMT Message-Id: <200407241903.i6OJ3tCZ002151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 58058 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: Sat, 24 Jul 2004 19:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=58058 Change 58058 by marcel@marcel_nfs on 2004/07/24 19:03:08 Hook kgdb into the build Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#9 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.8 2004/06/25 06:48:53 marcel Exp $ -SUBDIR= doc libgdb gdb gdbtui +SUBDIR= doc libgdb gdb gdbtui kgdb .include From owner-p4-projects@FreeBSD.ORG Sat Jul 24 19:32:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C58616A4CE; Sat, 24 Jul 2004 19:32:31 +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 EA4E216A4CE for ; Sat, 24 Jul 2004 19:32:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D132743D31 for ; Sat, 24 Jul 2004 19:32:30 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OJWUdc003060 for ; Sat, 24 Jul 2004 19:32:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6OJWUhO003057 for perforce@freebsd.org; Sat, 24 Jul 2004 19:32:30 GMT (envelope-from marcel@freebsd.org) Date: Sat, 24 Jul 2004 19:32:30 GMT Message-Id: <200407241932.i6OJWUhO003057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 58060 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: Sat, 24 Jul 2004 19:32:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=58060 Change 58060 by marcel@marcel_nfs on 2004/07/24 19:31:41 Add support for ia64. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 24 19:44:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC34316A4D0; Sat, 24 Jul 2004 19:44:46 +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 97D3E16A4CE for ; Sat, 24 Jul 2004 19:44:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D96843D5C for ; Sat, 24 Jul 2004 19:44:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OJikDQ003532 for ; Sat, 24 Jul 2004 19:44:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6OJikue003529 for perforce@freebsd.org; Sat, 24 Jul 2004 19:44:46 GMT (envelope-from marcel@freebsd.org) Date: Sat, 24 Jul 2004 19:44:46 GMT Message-Id: <200407241944.i6OJikue003529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 58062 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: Sat, 24 Jul 2004 19:44:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=58062 Change 58062 by marcel@marcel_nfs on 2004/07/24 19:44:27 Add support for amd64. Not checked yet. I need to dump a kernel core file first... Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#1 add Differences ...