Date: Wed, 16 Apr 2008 07:08:57 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140102 for review Message-ID: <200804160708.m3G78v7B084895@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140102 Change 140102 by jb@jb_freebsd1 on 2008/04/16 07:07:57 IF7 Affected files ... .. //depot/projects/dtrace7/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/dtrace7/src/bin/cp/cp.1#2 integrate .. //depot/projects/dtrace7/src/bin/cp/cp.c#2 integrate .. //depot/projects/dtrace7/src/bin/cp/utils.c#2 integrate .. //depot/projects/dtrace7/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/dtrace7/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/dtrace7/src/contrib/top/display.c#2 integrate .. //depot/projects/dtrace7/src/contrib/top/layout.h#2 integrate .. //depot/projects/dtrace7/src/contrib/top/machine.h#2 integrate .. //depot/projects/dtrace7/src/contrib/top/top.c#3 integrate .. //depot/projects/dtrace7/src/contrib/top/top.h#2 integrate .. //depot/projects/dtrace7/src/etc/Makefile#3 integrate .. //depot/projects/dtrace7/src/etc/ddb.conf#1 branch .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/dtrace7/src/etc/freebsd-update.conf#3 integrate .. //depot/projects/dtrace7/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ddb#1 branch .. //depot/projects/dtrace7/src/etc/rc.d/mountlate#3 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ppp#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/dtrace7/src/etc/rc.d/root#3 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/dtrace7/src/lib/libc/gen/lockf.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/dtrace7/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/dtrace7/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/dtrace7/src/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/dtrace7/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/dtrace7/src/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/dtrace7/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/dtrace7/src/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/dtrace7/src/sbin/Makefile#2 integrate .. //depot/projects/dtrace7/src/sbin/atacontrol/atacontrol.8#3 integrate .. //depot/projects/dtrace7/src/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/dtrace7/src/sbin/ddb/Makefile#1 branch .. //depot/projects/dtrace7/src/sbin/ddb/ddb.8#1 branch .. //depot/projects/dtrace7/src/sbin/ddb/ddb.c#1 branch .. //depot/projects/dtrace7/src/sbin/ddb/ddb.h#1 branch .. //depot/projects/dtrace7/src/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/dtrace7/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/dtrace7/src/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/dtrace7/src/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/dtrace7/src/sbin/mount/mount.c#2 integrate .. //depot/projects/dtrace7/src/sbin/route/route.c#4 integrate .. //depot/projects/dtrace7/src/sbin/savecore/savecore.8#2 integrate .. //depot/projects/dtrace7/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#6 integrate .. //depot/projects/dtrace7/src/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/cmx.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/ed.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/sf.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/textdump.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/ubsa.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/uslcom.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/vr.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/dtrace7/src/share/man/man9/Makefile#4 integrate .. //depot/projects/dtrace7/src/share/man/man9/stack.9#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/dtrace7/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/dtrace7/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/dtrace7/src/sys/conf/NOTES#4 integrate .. //depot/projects/dtrace7/src/sys/conf/files#7 integrate .. //depot/projects/dtrace7/src/sys/conf/files.amd64#5 integrate .. //depot/projects/dtrace7/src/sys/conf/files.arm#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.i386#5 integrate .. //depot/projects/dtrace7/src/sys/conf/files.ia64#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.pc98#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/dtrace7/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/dtrace7/src/sys/conf/options#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/dev/wpi/LICENSE#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_main.c#3 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_script.c#1 branch .. //depot/projects/dtrace7/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/dtrace7/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/dtrace7/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/dtrace7/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/kern/init_main.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/dtrace7/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#7 integrate .. //depot/projects/dtrace7/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/if.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_gif.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/dtrace7/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm.h#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/sm_inter.h#1 branch .. //depot/projects/dtrace7/src/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/dtrace7/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/dtrace7/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/dtrace7/src/sys/pci/if_sf.c#3 delete .. //depot/projects/dtrace7/src/sys/pci/if_sfreg.h#2 delete .. //depot/projects/dtrace7/src/sys/pci/if_vr.c#3 delete .. //depot/projects/dtrace7/src/sys/pci/if_vrreg.h#2 delete .. //depot/projects/dtrace7/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/dtrace7/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/auth.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/auth_none.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/auth_unix.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/clnt.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/inet_ntop.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/inet_pton.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/netconfig.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/nettype.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/pmap_prot.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc_callmsg.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc_com.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc_generic.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc_msg.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpc_prot.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpcb_clnt.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpcb_clnt.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpcb_prot.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/rpcb_prot.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_auth.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_auth.h#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_auth_unix.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_dg.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_generic.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/svc_vc.c#1 branch .. //depot/projects/dtrace7/src/sys/rpc/types.h#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/xdr.h#1 branch .. //depot/projects/dtrace7/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/dtrace7/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/ata.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/fcntl.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/kdb.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/linker.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/lockf.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/param.h#6 integrate .. //depot/projects/dtrace7/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/proc.h#6 integrate .. //depot/projects/dtrace7/src/sys/sys/resource.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/stack.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/syscall.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/umtx.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/user.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/vnode.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/vm/redzone.c#2 integrate .. //depot/projects/dtrace7/src/sys/xdr/xdr.c#1 branch .. //depot/projects/dtrace7/src/sys/xdr/xdr_array.c#1 branch .. //depot/projects/dtrace7/src/sys/xdr/xdr_mbuf.c#1 branch .. //depot/projects/dtrace7/src/sys/xdr/xdr_mem.c#1 branch .. //depot/projects/dtrace7/src/sys/xdr/xdr_reference.c#1 branch .. //depot/projects/dtrace7/src/sys/xdr/xdr_sizeof.c#1 branch .. //depot/projects/dtrace7/src/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/dtrace7/src/tools/regression/file/flock/Makefile#1 branch .. //depot/projects/dtrace7/src/tools/regression/file/flock/flock.c#1 branch .. //depot/projects/dtrace7/src/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/dtrace7/src/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/Makefile#3 integrate .. //depot/projects/dtrace7/src/usr.bin/chat/chat.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/make/for.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/netstat/route.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/procstat/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/top/machine.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/dtrace7/src/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/clear_locks/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/clear_locks/clear_locks.8#1 branch .. //depot/projects/dtrace7/src/usr.sbin/clear_locks/clear_locks.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/extern.h#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/gzip.h#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/main.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/pgp.h#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/stand.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/stand.h#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/pkg_version.1#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/ypserv/ypserv.8#2 integrate Differences ... ==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.11 2008/03/29 13:53:07 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.12 2008/04/08 09:07:43 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080407: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080126: oldcard.4 removal OLD_FILES+=usr/share/man/man4/card.4.gz OLD_FILES+=usr/share/man/man4/oldcard.4.gz ==== //depot/projects/dtrace7/src/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.39.2.1 2008/04/09 16:17:49 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/dtrace7/src/bin/cp/cp.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57.2.1 2008/04/09 16:17:49 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/dtrace7/src/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52.2.1 2008/04/09 16:17:50 jhb Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/dtrace7/src/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.9 2007/07/03 12:30:02 mlaier Exp $"); +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.9.2.1 2008/04/12 18:26:48 mlaier Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -153,6 +153,10 @@ return; } +#ifdef __FreeBSD__ + if (a->local_flags & PFALTQ_FLAG_IF_REMOVED) + printf("INACTIVE "); +#endif printf("altq on %s ", a->ifname); switch (a->scheduler) { @@ -187,6 +191,10 @@ { unsigned i; +#ifdef __FreeBSD__ + if (a->local_flags & PFALTQ_FLAG_IF_REMOVED) + printf("INACTIVE "); +#endif printf("queue "); for (i = 0; i < level; ++i) printf(" "); @@ -1145,7 +1153,11 @@ sizeof(ifr.ifr_name)) errx(1, "getifmtu: strlcpy"); if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1) +#ifdef __FreeBSD__ + ifr.ifr_mtu = 1500; +#else err(1, "SIOCGIFMTU"); +#endif if (shutdown(s, SHUT_RDWR) == -1) err(1, "shutdown"); if (close(s)) ==== //depot/projects/dtrace7/src/contrib/pf/pfctl/pfctl_qstats.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $"); +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6.10.1 2008/04/12 18:26:48 mlaier Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -118,6 +118,10 @@ for (node = root; node != NULL; node = node->next) { if (iface != NULL && strcmp(node->altq.ifname, iface)) continue; +#ifdef __FreeBSD__ + if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED) + continue; +#endif pfctl_print_altq_node(dev, node, 0, opts); } } @@ -157,7 +161,12 @@ warn("DIOCGETALTQ"); return (-1); } +#ifdef __FreeBSD__ + if (pa.altq.qid > 0 && + !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) { +#else if (pa.altq.qid > 0) { +#endif pq.nr = nr; pq.ticket = pa.ticket; pq.buf = &qstats.data; @@ -175,6 +184,19 @@ pfctl_insert_altq_node(root, pa.altq, qstats); } } +#ifdef __FreeBSD__ + else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) { + memset(&qstats.data, 0, sizeof(qstats.data)); + if ((node = pfctl_find_altq_node(*root, pa.altq.qname, + pa.altq.ifname)) != NULL) { + memcpy(&node->qstats.data, &qstats.data, + sizeof(qstats.data)); + update_avg(node); + } else { + pfctl_insert_altq_node(root, pa.altq, qstats); + } + } +#endif } return (mnr); } @@ -280,6 +302,10 @@ { if (a->altq.qid == 0) return; +#ifdef __FreeBSD__ + if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED) + return; +#endif switch (a->altq.scheduler) { case ALTQT_CBQ: ==== //depot/projects/dtrace7/src/contrib/top/display.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $ + * $FreeBSD: src/contrib/top/display.c,v 1.9.10.1 2008/04/09 19:08:43 peter Exp $ */ /* @@ -78,8 +78,10 @@ static int *lmemory; static int *lswap; +static int num_cpus; static int *cpustate_columns; static int cpustate_total_length; +static int cpustates_column; static enum { OFF, ON, ERASE } header_status = ON; @@ -87,6 +89,29 @@ static void summary_format(); static void line_update(); +int x_lastpid = 10; +int y_lastpid = 0; +int x_loadave = 33; +int x_loadave_nompid = 15; +int y_loadave = 0; +int x_procstate = 0; +int y_procstate = 1; +int x_brkdn = 15; +int y_brkdn = 1; +int x_mem = 5; +int y_mem = 3; +int x_swap = 6; +int y_swap = 4; +int y_message = 5; +int x_header = 0; +int y_header = 6; +int x_idlecursor = 0; +int y_idlecursor = 5; +int y_procs = 7; + +int y_cpustates = 2; +int Header_lines = 7; + int display_resize() { @@ -138,6 +163,12 @@ /* call resize to do the dirty work */ lines = display_resize(); + num_cpus = statics->ncpus; + cpustates_column = 5; /* CPU: */ + if (num_cpus != 1) + cpustates_column += 2; /* CPU 0: */ + for (i = num_cpus; i > 9; i /= 10) + cpustates_column++; /* only do the rest if we need to */ if (lines > -1) @@ -153,7 +184,7 @@ num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int)); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; @@ -365,14 +396,13 @@ } } +#ifdef no_more /* * *_cpustates(states, names) - print the cpu state percentages * * Assumptions: cursor is on the PREVIOUS line */ -static int cpustates_column; - /* cpustates_tag() calculates the correct tag to use to label the line */ char *cpustates_tag() @@ -398,6 +428,7 @@ cpustates_column = strlen(use); return(use); } +#endif i_cpustates(states) @@ -406,11 +437,18 @@ { register int i = 0; register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* print tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; /* now walk thru the names and print the line */ @@ -423,14 +461,15 @@ /* if percentage is >= 1000, print it as 100% */ printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"), - i++ == 0 ? "" : ", ", + (i++ % num_cpustates) == 0 ? "" : ", ", ((float)value)/10., thisname); } } +} /* copy over values into "last" array */ - memcpy(lcpustates, states, num_cpustates * sizeof(int)); + memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus); } u_cpustates(states) @@ -439,14 +478,18 @@ { register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; register int *colp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; - Move_to(cpustates_column, y_cpustates); - lastline = y_cpustates; - lp = lcpustates; + Move_to(cpustates_column, y_cpustates + cpu); + lastline = y_cpustates + cpu; + lp = lcpustates + (cpu * num_cpustates); colp = cpustate_columns; /* we could be much more optimal about this */ @@ -458,8 +501,8 @@ if (*lp != *states) { /* yes, move and change */ - Move_to(cpustates_column + *colp, y_cpustates); - lastline = y_cpustates; + Move_to(cpustates_column + *colp, y_cpustates + cpu); + lastline = y_cpustates + cpu; /* retrieve value and remember it */ value = *states; @@ -479,30 +522,39 @@ colp++; } } +} z_cpustates() { register int i = 0; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* show tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; while ((thisname = *names++) != NULL) { if (*thisname != '\0') { - printf("%s %% %s", i++ == 0 ? "" : ", ", thisname); + printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname); } } +} /* fill the "last" array with all -1s, to insure correct updating */ lp = lcpustates; - i = num_cpustates; + i = num_cpustates * num_cpus; while (--i >= 0) { *lp++ = -1; ==== //depot/projects/dtrace7/src/contrib/top/layout.h#2 (text+ko) ==== @@ -4,26 +4,28 @@ * This file defines the locations on tne screen for various parts of the * display. These definitions are used by the routines in "display.c" for * cursor addressing. + * + * $FreeBSD: src/contrib/top/layout.h,v 1.2.50.1 2008/04/09 19:08:43 peter Exp $ */ -#define x_lastpid 10 -#define y_lastpid 0 -#define x_loadave 33 -#define x_loadave_nompid 15 -#define y_loadave 0 -#define x_procstate 0 -#define y_procstate 1 -#define x_brkdn 15 -#define y_brkdn 1 -#define x_mem 5 -#define y_mem 3 -#define x_swap 6 -#define y_swap 4 -#define y_message 5 -#define x_header 0 -#define y_header 6 -#define x_idlecursor 0 -#define y_idlecursor 5 -#define y_procs 7 +extern int x_lastpid; /* 10 */ +extern int y_lastpid; /* 0 */ +extern int x_loadave; /* 33 */ +extern int x_loadave_nompid; /* 15 */ +extern int y_loadave; /* 0 */ +extern int x_procstate; /* 0 */ +extern int y_procstate; /* 1 */ +extern int x_brkdn; /* 15 */ +extern int y_brkdn; /* 1 */ +extern int x_mem; /* 5 */ +extern int y_mem; /* 3 */ +extern int x_swap; /* 6 */ +extern int y_swap; /* 4 */ +extern int y_message; /* 5 */ +extern int x_header; /* 0 */ +extern int y_header; /* 6 */ +extern int x_idlecursor; /* 0 */ +extern int y_idlecursor; /* 5 */ +extern int y_procs; /* 7 */ -#define y_cpustates 2 +extern int y_cpustates; /* 2 */ ==== //depot/projects/dtrace7/src/contrib/top/machine.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.9.2.2 2008/04/11 11:45:27 ru Exp $ */ /* @@ -20,6 +20,7 @@ #ifdef ORDER char **order_names; #endif + int ncpus; }; /* @@ -43,6 +44,7 @@ int *memory; int *swap; struct timeval boottime; + int ncpus; }; /* cpu_states is an array of percentages * 10. For example, ==== //depot/projects/dtrace7/src/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804160708.m3G78v7B084895>