PERFORCE change 111369 for review
Matt Jacob
mjacob at FreeBSD.org
Sat Dec 9 21:38:58 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=111369
Change 111369 by mjacob at mjexp on 2006/12/10 05:38:12
IFC
Affected files ...
.. //depot/projects/mjexp/ObsoleteFiles.inc#5 integrate
.. //depot/projects/mjexp/UPDATING#3 integrate
.. //depot/projects/mjexp/bin/hostname/hostname.1#2 integrate
.. //depot/projects/mjexp/bin/hostname/hostname.c#2 integrate
.. //depot/projects/mjexp/contrib/libbegemot/rpoll.c#2 integrate
.. //depot/projects/mjexp/contrib/libbegemot/rpoll.h#2 integrate
.. //depot/projects/mjexp/contrib/libbegemot/rpoll.man#2 integrate
.. //depot/projects/mjexp/contrib/pf/pfctl/pfctl_altq.c#2 integrate
.. //depot/projects/mjexp/contrib/top/sigconv.awk#2 integrate
.. //depot/projects/mjexp/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/mjexp/etc/pccard_ether#2 integrate
.. //depot/projects/mjexp/etc/rc.d/auto_linklocal#3 integrate
.. //depot/projects/mjexp/etc/rc.initdiskless#2 integrate
.. //depot/projects/mjexp/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/mjexp/games/fortune/datfiles/freebsd-tips#3 integrate
.. //depot/projects/mjexp/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_platform.h#3 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/config_freebsd.h#1 branch
.. //depot/projects/mjexp/lib/libc/gen/confstr.3#2 integrate
.. //depot/projects/mjexp/lib/libc/gen/err.3#2 integrate
.. //depot/projects/mjexp/lib/libc/net/nscachedcli.c#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/chmod.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/chown.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/close.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/link.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/mkdir.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/mkfifo.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/rename.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/rmdir.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/symlink.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/truncate.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/unlink.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/utimes.2#2 integrate
.. //depot/projects/mjexp/lib/libelf/elf_errmsg.c#2 integrate
.. //depot/projects/mjexp/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_barrier.c#2 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_cancel.c#3 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_cond.c#3 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_private.h#4 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_sig.c#3 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.c#3 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.h#3 integrate
.. //depot/projects/mjexp/release/Makefile#4 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#2 integrate
.. //depot/projects/mjexp/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/mjexp/sbin/fdisk/fdisk.8#2 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/mjexp/sbin/mount/mount_fs.c#2 integrate
.. //depot/projects/mjexp/sbin/mount_unionfs/Makefile#2 integrate
.. //depot/projects/mjexp/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/mjexp/sbin/mount_unionfs/mount_unionfs.c#2 integrate
.. //depot/projects/mjexp/sbin/restore/main.c#2 integrate
.. //depot/projects/mjexp/sbin/restore/restore.8#3 integrate
.. //depot/projects/mjexp/sbin/restore/restore.c#2 integrate
.. //depot/projects/mjexp/sbin/restore/restore.h#2 integrate
.. //depot/projects/mjexp/sbin/restore/tape.c#2 integrate
.. //depot/projects/mjexp/share/man/man4/Makefile#4 integrate
.. //depot/projects/mjexp/share/man/man4/altq.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ata.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ath.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/bce.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/man4.arm/Makefile#1 branch
.. //depot/projects/mjexp/share/man/man4/man4.arm/npe.4#1 branch
.. //depot/projects/mjexp/share/man/man4/man4.i386/acpi_ibm.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/pcm.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/polling.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/snd_atiixp.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/snd_es137x.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/snd_hda.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/snd_via8233.4#2 integrate
.. //depot/projects/mjexp/share/man/man9/LOCK_PROFILING.9#2 integrate
.. //depot/projects/mjexp/share/man/man9/mbuf.9#2 integrate
.. //depot/projects/mjexp/share/man/man9/uio.9#2 integrate
.. //depot/projects/mjexp/share/misc/pci_vendors#2 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/mjexp/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/mjexp/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/mjexp/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/mjexp/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/mjexp/sys/arm/arm/genassym.c#3 integrate
.. //depot/projects/mjexp/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_pio.c#2 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/mjexp/sys/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/mjexp/sys/arm/include/cpuconf.h#3 integrate
.. //depot/projects/mjexp/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_space.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate
.. //depot/projects/mjexp/sys/boot/common/loader.8#3 integrate
.. //depot/projects/mjexp/sys/boot/i386/btx/btx/btx.S#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_periph.c#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt.h#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/mjexp/sys/compat/linsysfs/linsysfs.c#2 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/mjexp/sys/conf/NOTES#5 integrate
.. //depot/projects/mjexp/sys/conf/files#6 integrate
.. //depot/projects/mjexp/sys/conf/files.arm#3 integrate
.. //depot/projects/mjexp/sys/conf/options#4 integrate
.. //depot/projects/mjexp/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bce.c#6 integrate
.. //depot/projects/mjexp/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/mjexp/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/mjexp/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/mjexp/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ep/if_ep.c#2 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwdev.c#2 integrate
.. //depot/projects/mjexp/sys/dev/flash/at45d.c#1 branch
.. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/mjexp/sys/dev/fxp/if_fxpvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/iicbus/iicbb.c#3 integrate
.. //depot/projects/mjexp/sys/dev/iicbus/iicbus_if.m#2 integrate
.. //depot/projects/mjexp/sys/dev/iicbus/iiconf.c#2 integrate
.. //depot/projects/mjexp/sys/dev/iicbus/iiconf.h#3 integrate
.. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#4 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_target.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/mjexp/sys/dev/ispfw/ispfw.c#2 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/mjexp/sys/dev/le/am7990.c#2 integrate
.. //depot/projects/mjexp/sys/dev/le/am79900.c#2 integrate
.. //depot/projects/mjexp/sys/dev/le/lance.c#2 integrate
.. //depot/projects/mjexp/sys/dev/le/lancevar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/bmtphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/ciphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/inphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/lxtphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/mii_physubr.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/miivar.h#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/nsgphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/nsphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/qsphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/rlphy.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/mjexp/sys/dev/nve/if_nvereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_aue.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_auereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/mjexp/sys/fs/procfs/procfs_status.c#3 integrate
.. //depot/projects/mjexp/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/mjexp/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/mjexp/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/mjexp/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/mjexp/sys/i386/i386/genassym.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/mjexp/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/mjexp/sys/kern/init_main.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_idle.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_resource.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_synch.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/mjexp/sys/kern/ksched.c#2 integrate
.. //depot/projects/mjexp/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/mjexp/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/mjexp/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/mjexp/sys/kern/subr_lock.c#3 integrate
.. //depot/projects/mjexp/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/mjexp/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/mjexp/sys/kern/subr_trap.c#5 integrate
.. //depot/projects/mjexp/sys/kern/tty.c#4 integrate
.. //depot/projects/mjexp/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/mjexp/sys/modules/Makefile#3 integrate
.. //depot/projects/mjexp/sys/net/bridgestp.c#3 integrate
.. //depot/projects/mjexp/sys/net/bridgestp.h#3 integrate
.. //depot/projects/mjexp/sys/net/ethernet.h#3 integrate
.. //depot/projects/mjexp/sys/net/if.c#4 integrate
.. //depot/projects/mjexp/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/mjexp/sys/net/if_bridge.c#4 integrate
.. //depot/projects/mjexp/sys/net/if_bridgevar.h#3 integrate
.. //depot/projects/mjexp/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/mjexp/sys/net/if_llc.h#2 integrate
.. //depot/projects/mjexp/sys/net/if_ppp.c#4 integrate
.. //depot/projects/mjexp/sys/net/if_pppvar.h#3 integrate
.. //depot/projects/mjexp/sys/net/ppp_tty.c#3 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_nat.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/igmp.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/ip_carp.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/libalias/alias.h#2 integrate
.. //depot/projects/mjexp/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfsdiskless.h#2 integrate
.. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/mjexp/sys/pci/if_rl.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/mjexp/sys/pci/if_xl.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/mjexp/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/genassym.c#4 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/mjexp/sys/sun4v/include/pcb.h#2 integrate
.. //depot/projects/mjexp/sys/sun4v/include/tsb.h#3 integrate
.. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/exception.S#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#4 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/vnex.c#3 integrate
.. //depot/projects/mjexp/sys/sys/param.h#5 integrate
.. //depot/projects/mjexp/sys/sys/pcpu.h#3 integrate
.. //depot/projects/mjexp/sys/sys/proc.h#5 integrate
.. //depot/projects/mjexp/sys/sys/rtprio.h#3 integrate
.. //depot/projects/mjexp/sys/sys/runq.h#2 integrate
.. //depot/projects/mjexp/sys/sys/sched.h#4 integrate
.. //depot/projects/mjexp/sys/sys/uio.h#2 integrate
.. //depot/projects/mjexp/sys/sys/umtx.h#4 integrate
.. //depot/projects/mjexp/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.c#4 integrate
.. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#3 integrate
.. //depot/projects/mjexp/tools/regression/pthread/cv_cancel1/Makefile#1 branch
.. //depot/projects/mjexp/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.sh#3 integrate
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wX.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wXl.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wc.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wdl.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wdn.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.we.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wf.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wg.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wgd.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wo.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp1.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp2.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp3.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp4.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp5.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wp6.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wu.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wwe.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wx.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/jot/regress.wxn.out#1 branch
.. //depot/projects/mjexp/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate
.. //depot/projects/mjexp/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/mjexp/usr.bin/getconf/getconf.c#2 integrate
.. //depot/projects/mjexp/usr.bin/id/id.c#2 integrate
.. //depot/projects/mjexp/usr.bin/jot/jot.c#3 integrate
.. //depot/projects/mjexp/usr.bin/setchannel/Makefile#1 branch
.. //depot/projects/mjexp/usr.bin/setchannel/setchannel.1#1 branch
.. //depot/projects/mjexp/usr.bin/setchannel/setchannel.c#1 branch
.. //depot/projects/mjexp/usr.bin/top/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/top/sigdesc.h#2 delete
.. //depot/projects/mjexp/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/adduser/rmuser.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/asf/asf.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate
.. //depot/projects/mjexp/usr.sbin/eeprom/eeprom.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/menus.c#2 integrate
Differences ...
==== //depot/projects/mjexp/ObsoleteFiles.inc#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.65 2006/11/26 15:04:30 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar 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,24 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20061201: remove symlink to *.so.4 libalias modules
+OLD_FILES+=usr/lib/libalias_cuseeme.so
+OLD_FILES+=usr/lib/libalias_dummy.so
+OLD_FILES+=usr/lib/libalias_ftp.so
+OLD_FILES+=usr/lib/libalias_irc.so
+OLD_FILES+=usr/lib/libalias_nbt.so
+OLD_FILES+=usr/lib/libalias_pptp.so
+OLD_FILES+=usr/lib/libalias_skinny.so
+OLD_FILES+=usr/lib/libalias_smedia.so
+# 20061201: remove old *.so.4 liablias modules
+OLD_FILES+=lib/libalias_cuseeme.so.4
+OLD_FILES+=lib/libalias_dummy.so.4
+OLD_FILES+=lib/libalias_ftp.so.4
+OLD_FILES+=lib/libalias_irc.so.4
+OLD_FILES+=lib/libalias_nbt.so.4
+OLD_FILES+=lib/libalias_pptp.so.4
+OLD_FILES+=lib/libalias_skinny.so.4
+OLD_FILES+=lib/libalias_smedia.so.4
# 20061125: remove old man page
OLD_FILES+=usr/share/man/man9/devsw.9.gz
# 20061122: remove obsolete mount programs
@@ -717,6 +735,31 @@
OLD_FILES+=usr/sbin/stlstty
OLD_FILES+=usr/sbin/ispppcontrol
OLD_FILES+=usr/sbin/rndcontrol
+# 20011001: UUCP migration to ports
+OLD_FILES+=usr/bin/uucp
+OLD_FILES+=usr/bin/uulog
+OLD_FILES+=usr/bin/uuname
+OLD_FILES+=usr/bin/uupick
+OLD_FILES+=usr/bin/uusched
+OLD_FILES+=usr/bin/uustat
+OLD_FILES+=usr/bin/uuto
+OLD_FILES+=usr/bin/uux
+OLD_FILES+=usr/libexec/uucp/uucico
+OLD_FILES+=usr/libexec/uucp/uuxqt
+OLD_FILES+=usr/libexec/uucpd
+OLD_FILES+=usr/share/man/man1/uuconv.1.gz
+OLD_FILES+=usr/share/man/man1/uucp.1.gz
+OLD_FILES+=usr/share/man/man1/uulog.1.gz
+OLD_FILES+=usr/share/man/man1/uuname.1.gz
+OLD_FILES+=usr/share/man/man1/uupick.1.gz
+OLD_FILES+=usr/share/man/man1/uustat.1.gz
+OLD_FILES+=usr/share/man/man1/uuto.1.gz
+OLD_FILES+=usr/share/man/man1/uux.1.gz
+OLD_FILES+=usr/share/man/man8/uuchk.8.gz
+OLD_FILES+=usr/share/man/man8/uucico.8.gz
+OLD_FILES+=usr/share/man/man8/uucpd.8.gz
+OLD_FILES+=usr/share/man/man8/uusched.8.gz
+OLD_FILES+=usr/share/man/man8/uuxqt.8.gz
# 20010523 mount_portal -> mount_portalfs
OLD_FILES+=sbin/mount_portal
OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
@@ -3527,6 +3570,8 @@
OLD_DIRS+=usr/include/ntfs
OLD_DIRS+=usr/include/nwfs
OLD_DIRS+=usr/include/ufs/mfs
+# 20011001: UUCP migration to ports
+OLD_DIRS+=usr/libexec/uucp
.include "tools/build/mk/OptionalObsoleteFiles.inc"
==== //depot/projects/mjexp/UPDATING#3 (text+ko) ====
@@ -21,6 +21,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20061205:
+ The removal of several facets of the experimental Threading
+ system from the kernel means that the proc and thread structures
+ have changed quite a bit. I suggest all kernel modules that might
+ reference these structures be recompiled.. Especially the
+ linux module.
+
20061126:
Sound infrastructure has been updated with various fixes and
improvements. Most of the changes are pretty much transparent,
@@ -675,4 +682,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.466 2006/11/26 12:24:04 ariff Exp $
+$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $
==== //depot/projects/mjexp/bin/hostname/hostname.1#2 (text+ko) ====
@@ -27,9 +27,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hostname.1 8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $
.\"
-.Dd April 18, 2005
+.Dd December 7, 2006
.Dt HOSTNAME 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd set or print name of current host system
.Sh SYNOPSIS
.Nm
-.Op Fl s
+.Op Fl fs
.Op Ar name-of-host
.Sh DESCRIPTION
The
@@ -45,7 +45,7 @@
utility prints the name of the current host.
The super-user can
set the hostname by supplying an argument; this is usually done in the
-network initialization script
+initialization script
.Pa /etc/rc.d/hostname ,
normally run at boot
time.
@@ -56,6 +56,9 @@
.Pp
Options:
.Bl -tag -width flag
+.It Fl f
+Include domain information in the printed name.
+This is the default behavior.
.It Fl s
Trim off any domain information from the printed
name.
==== //depot/projects/mjexp/bin/hostname/hostname.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $");
#include <sys/param.h>
@@ -58,8 +58,15 @@
char *p, hostname[MAXHOSTNAMELEN];
sflag = 0;
- while ((ch = getopt(argc, argv, "s")) != -1)
+ while ((ch = getopt(argc, argv, "fs")) != -1)
switch (ch) {
+ case 'f':
+ /*
+ * On Linux, "hostname -f" prints FQDN.
+ * BSD "hostname" always prints FQDN by
+ * default, so we accept but ignore -f.
+ */
+ break;
case 's':
sflag = 1;
break;
@@ -93,6 +100,6 @@
usage(void)
{
- (void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n");
+ (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n");
exit(1);
}
==== //depot/projects/mjexp/contrib/libbegemot/rpoll.c#2 (text+ko) ====
@@ -101,16 +101,16 @@
# endif
-typedef signed long long tval_t;
+typedef int64_t tval_t;
-static inline tval_t GETMSECS(void);
+static inline tval_t GETUSECS(void);
static inline tval_t
-GETMSECS(void) {
+GETUSECS(void) {
struct timeval tval;
(void)gettimeofday(&tval, NULL);
- return (tval_t)tval.tv_sec*1000+tval.tv_usec/1000;
+ return (tval_t)tval.tv_sec * 1000000 + tval.tv_usec;
}
/*
@@ -170,11 +170,11 @@
* Now for timers
*/
typedef struct {
- u_int msecs; /* millisecond value of the timer */
+ uint64_t usecs; /* microsecond value of the timer */
int repeat; /* one shot or repeat? */
void *arg; /* client arg */
timer_f func; /* handler, 0 means disfunct */
- tval_t when; /* next time to trigger in msecs! */
+ tval_t when; /* next time to trigger in usecs! */
} PollTim_t;
/* how many records should our table grow at once? */
@@ -296,8 +296,8 @@
poll_unblocksig();
if(rpoll_trace)
- fprintf(stderr, "poll_register(%d, %#lx, %#lx, %#x)->%d",
- fd, (u_long)func, (u_long)arg, mask, p - regs);
+ fprintf(stderr, "poll_register(%d, %p, %p, %#x)->%tu",
+ fd, (void *)func, (void *)arg, mask, p - regs);
return p - regs;
}
@@ -373,6 +373,13 @@
int
poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg)
{
+ return (poll_start_utimer((unsigned long long)msecs * 1000,
+ repeat, func, arg));
+}
+
+int
+poll_start_utimer(unsigned long long usecs, int repeat, timer_f func, void *arg)
+{
PollTim_t *p;
/* find unused entry */
@@ -392,19 +399,19 @@
}
/* create entry */
- p->msecs = msecs;
+ p->usecs = usecs;
p->repeat = repeat;
p->arg = arg;
p->func = func;
- p->when = GETMSECS() + msecs;
+ p->when = GETUSECS() + usecs;
tims_used++;
resort = 1;
if(rpoll_trace)
- fprintf(stderr, "poll_start_timer(%u, %d, %#lx, %#lx)->%u",
- msecs, repeat, (u_long)func, (u_long)arg, p - tims);
+ fprintf(stderr, "poll_start_utimer(%llu, %d, %p, %p)->%tu",
+ usecs, repeat, (void *)func, (void *)arg, p - tims);
return p - tims;
}
@@ -497,7 +504,7 @@
u_int i, idx;
int ret;
tval_t now;
- int tout;
+ tval_t tout;
static u_int last_index;
# ifdef USE_SELECT
@@ -519,12 +526,13 @@
/* in wait mode - compute the timeout */
if(wait) {
if(tfd_used) {
- now = GETMSECS();
+ now = GETUSECS();
# ifdef DEBUG
{
- fprintf(stderr, "now=%"QUADFMT"u", now);
+ fprintf(stderr, "now=%llu", now);
for(i = 0; i < tims_used; i++)
- fprintf(stderr, "timers[%2d] = %"QUADFMT"d", i, tfd[i]->when - now);
+ fprintf(stderr, "timers[%2d] = %lld",
+ i, tfd[i]->when - now);
}
# endif
if((tout = tims[tfd[0]].when - now) < 0)
@@ -539,7 +547,7 @@
# endif
# ifdef USE_POLL
- ret = poll(pfd, regs_used, tout);
+ ret = poll(pfd, regs_used, tout == INFTIM ? INFTIM : (tout / 1000));
# endif
# ifdef USE_SELECT
@@ -547,13 +555,13 @@
nwset = wset;
nxset = xset;
if(tout != INFTIM) {
- tv.tv_sec = tout / 1000;
- tv.tv_usec = (tout % 1000) * 1000;
+ tv.tv_sec = tout / 1000000;
+ tv.tv_usec = tout % 1000000;
}
ret = select(maxfd+1,
SELECT_CAST(&nrset),
SELECT_CAST(&nwset),
- SELECT_CAST(&nxset), (tout==INFTIM) ? 0 : &tv);
+ SELECT_CAST(&nxset), (tout==INFTIM) ? NULL : &tv);
# endif
if(ret == -1) {
@@ -574,20 +582,26 @@
# ifdef USE_POLL
if(regs[idx].pfd) {
- if(regs[idx].pfd->revents & poll_in)
+ if ((regs[idx].mask & POLL_IN) &&
+ (regs[idx].pfd->revents & poll_in))
mask |= POLL_IN;
- if(regs[idx].pfd->revents & poll_out)
+ if ((regs[idx].mask & POLL_OUT) &&
+ (regs[idx].pfd->revents & poll_out))
mask |= POLL_OUT;
- if(regs[idx].pfd->revents & poll_except)
+ if((regs[idx].mask & POLL_EXCEPT) &&
+ (regs[idx].pfd->revents & poll_except))
mask |= POLL_EXCEPT;
}
# endif
# ifdef USE_SELECT
- if(FD_ISSET(regs[idx].fd, &nrset))
+ if ((regs[idx].mask & POLL_IN) &&
+ FD_ISSET(regs[idx].fd, &nrset))
mask |= POLL_IN;
- if(FD_ISSET(regs[idx].fd, &nwset))
+ if ((regs[idx].mask & POLL_OUT) &&
+ FD_ISSET(regs[idx].fd, &nwset))
mask |= POLL_OUT;
- if(FD_ISSET(regs[idx].fd, &nxset))
+ if ((regs[idx].mask & POLL_EXCEPT) &&
+ FD_ISSET(regs[idx].fd, &nxset))
mask |= POLL_EXCEPT;
# endif
assert(idx < regs_alloc);
@@ -595,8 +609,8 @@
if(mask) {
if(rpoll_trace)
fprintf(stderr, "poll_dispatch() -- "
- "file %d/%d",
- regs[idx].fd, idx);
+ "file %d/%d %x",
+ regs[idx].fd, idx, mask);
(*regs[idx].func)(regs[idx].fd, mask, regs[idx].arg);
}
}
@@ -607,7 +621,7 @@
/* dispatch timeouts */
if(tfd_used) {
- now = GETMSECS();
+ now = GETUSECS();
for(i = 0; i < tfd_used; i++) {
if(tfd[i] < 0)
continue;
@@ -619,7 +633,7 @@
if(tfd[i] < 0)
continue;
if(tims[tfd[i]].repeat)
- tims[tfd[i]].when = now + tims[tfd[i]].msecs;
+ tims[tfd[i]].when = now + tims[tfd[i]].usecs;
else {
tims[tfd[i]].func = NULL;
tims_used--;
@@ -644,8 +658,8 @@
{
gettimeofday(&now, NULL);
- return (double)(10 * now.tv_sec + now.tv_usec / 100000 - 10 * start.tv_sec - start.tv_usec / 100000)
- / 10;
+ return (double)(10 * now.tv_sec + now.tv_usec / 100000 -
+ 10 * start.tv_sec - start.tv_usec / 100000) / 10;
}
void
@@ -675,6 +689,14 @@
{
printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg);
}
+void
+tfunc2(int tid, void *arg)
+{
+ static u_int count = 0;
+
+ if (++count % 10000 == 0)
+ printf("%4.1f -- %d\n", elaps(), tid);
+}
void first(int tid, void *arg);
void second(int tid, void *arg);
@@ -683,7 +705,7 @@
second(int tid, void *arg)
{
printf("%4.1f -- %d: %s\n", elaps(), tid, (char *)arg);
- poll_start_timer(5500, 0, first, "first");
+ poll_start_utimer(5500000, 0, first, "first");
poll_stop_timer(t1);
t0 = poll_start_timer(1000, 1, tfunc0, "1 second");
}
@@ -699,12 +721,16 @@
int
main(int argc, char *argv[])
{
- argc = argc;
argv = argv;
gettimeofday(&start, NULL);
poll_register(0, infunc, NULL, POLL_IN);
- t0 = poll_start_timer(1000, 1, tfunc0, "1 second");
- poll_start_timer(2500, 0, first, "first");
+
+ if (argc < 2) {
+ t0 = poll_start_timer(1000, 1, tfunc0, "1 second");
+ poll_start_timer(2500, 0, first, "first");
+ } else {
+ t0 = poll_start_utimer(300, 1, tfunc2, NULL);
+ }
while(1)
poll_dispatch(1);
==== //depot/projects/mjexp/contrib/libbegemot/rpoll.h#2 (text+ko) ====
@@ -43,6 +43,8 @@
void poll_unregister(int);
void poll_dispatch(int wait);
int poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg);
+int poll_start_utimer(unsigned long long usecs, int repeat, timer_f func,
+ void *arg);
void poll_stop_timer(int);
# if defined(POLL_IN)
==== //depot/projects/mjexp/contrib/libbegemot/rpoll.man#2 (text+ko) ====
@@ -1,8 +1,8 @@
'\"
-'\" Copyright (c)1996-2002 by Hartmut Brandt
+'\" Copyright (c)1996-2006 by Hartmut Brandt
'\" All rights reserved.
'\"
-'\" Author: Hartmut Brandt
+'\" Author: harti at freebsd.org <Hartmut Brandt>
'\"
'\" Redistribution of this software and documentation and use in source and
'\" binary forms, with or without modification, are permitted provided that
@@ -28,28 +28,32 @@
'\"
'\" $Begemot: libbegemot/rpoll.man,v 1.4 2004/09/21 15:59:00 brandt Exp $
'\"
-.TH rpoll 3 "21 Oct 1996" "BEGEMOT" "BEGEMOT Library"
+.TH rpoll 3 "8 Dec 2006" "BEGEMOT" "BEGEMOT Library"
.SH NAME
rpoll - callback functions for file descriptors and timers
.SH SYNOPSIS
.LP
.B "# include <rpoll.h>"
.LP
-.BR "typedef void (*poll_f)(int " "fd" ", int " "mask" ", void *" "arg);"
+.BR "typedef void (*poll_f)(int " "fd" ", int " "mask" ", void *" "arg" ");"
.br
-.BR "typedef void (*timer_f)(int " "tid" ", void *" "arg);"
+.BR "typedef void (*timer_f)(int " "tid" ", void *" "arg" ");"
.LP
.BR "int poll_register(int " "fd" ", poll_f "
.RB "func" ", void *" "arg" ", int " "mask" ");"
.LP
.BR "void poll_unregister(int " "handle" ");"
.LP
-.BR "int poll_start_timer(u_int " "msecs" ", int " "repeat" ", timer_f " "func,"
+.BR "int poll_start_timer(u_int " "msecs" ", int " "repeat" ", timer_f " "func" ","
.if n .ti +.5i
-.BR "void *" "arg);"
+.BR "void *" "arg" ");"
.LP
.BR "void poll_stop_timer(int " "handle" ");"
.LP
+.BR "int poll_start_utimer(unsigned long long " "usecs" ", int " "repeat" ",
+.if n .ti +.5i
+.BR "timer_f " "func" ", void *" "arg" ");"
+.LP
.BR "void poll_dispatch(int " "wait" ");"
.SH DESCRIPTION
Many programs need to read from several file descriptors at the same time.
@@ -113,9 +117,24 @@
.BR poll_register .
.LP
A timer is created with
-.BR poll_start_timer .
+.BR poll_start_timer
+or
+.BR poll_start_utimer .
.I msecs
-is the number of milliseconds, after which the timer event will be generated.
+is the number of milliseconds in
+.BR poll_start_timer
+while
+.I usecs
+is the number of microseconds in
+.BR poll_start_utimer ,
+after which the timer event will be generated.
+If the functions use the
+.BR poll (2)
+system call, then
+.I usecs
+is rounded to milliseconds and
+.BR poll_start_timer
+is called.
.I repeat
selects one-short behavior (if 0) or a repeatable timer (if not 0). A one-short timer
will automatically unregistered after expiry.
@@ -123,7 +142,9 @@
is the user function which will be called with a timer id and the user supplied
.IR arg .
.B poll_start_timer
-returnes a timer id, which may be used to cancel the timer with
+and
+.B poll_start_utimer
+return a timer id, which may be used to cancel the timer with
.BR poll_stop_timer .
A one-short timer should be canceled only if it has not yet fired.
.LP
@@ -151,10 +172,12 @@
.SH "SEE ALSO"
.BR poll (2), select (3C)
.SH "RETURN VALUES"
-.B poll_register
+.B poll_register ,
+.B poll_start_timer
and
-.B poll_start_timer
-return a handle which may be used to unregister the file descriptor or cancel the timer.
+.B poll_start_utimer
+return a handle which may be used to unregister the file descriptor or
+cancel the timer.
.LP
Both functions and
.B poll_dispatch
==== //depot/projects/mjexp/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ====
@@ -1,4 +1,5 @@
/* $OpenBSD: pfctl_altq.c,v 1.86 2005/02/28 14:04:51 henning Exp $ */
+/* add: $OpenBSD: pfctl_altq.c,v 1.91 2006/11/28 00:08:50 henning Exp $ */
/*
* Copyright (c) 2002
@@ -19,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.7 2005/05/03 16:55:20 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.8 2006/11/30 18:55:36 mlaier Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -709,8 +710,8 @@
}
if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) ||
- (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) ||
- (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0)) {
+ (opts->lssc_m1 < opts->lssc_m2 && opts->lssc_m1 != 0) ||
+ (opts->ulsc_m1 < opts->ulsc_m2 && opts->ulsc_m1 != 0)) {
warnx("m1 must be zero for convex curve: %s", pa->qname);
return (-1);
}
==== //depot/projects/mjexp/contrib/top/sigconv.awk#2 (text+ko) ====
@@ -1,3 +1,5 @@
+# $FreeBSD: src/contrib/top/sigconv.awk,v 1.2 2006/12/01 07:01:18 keramida Exp $
+
BEGIN {
nsig = 0;
j = 0;
@@ -10,7 +12,7 @@
print "struct sigdesc sigdesc[] = {"
}
-/^#define[ \t][ \t]*SIG[A-Z]/ {
+/^#define[ \t][ \t]*SIG[A-Z]+[0-9]*[ \t]/ {
j = sprintf("%d", $3);
str = $2;
@@ -18,10 +20,10 @@
if (nsig < j)
nsig = j;
- siglist[j] = sprintf("\"%s\",\t%2d,", \
+ siglist[j] = sprintf("{ \"%s\",\t%2d },", \
substr(str, 4), j);
}
-/^#[ \t]*define[ \t][ \t]*SIG[A-Z]/ {
+/^#[ \t]*define[ \t][ \t]*SIG[A-Z]+[0-9]*[ \t]/ {
j = sprintf("%d", $4);
str = $3;
@@ -29,10 +31,10 @@
if (nsig < j)
nsig = j;
- siglist[j] = sprintf("\"%s\",\t%2d,", \
+ siglist[j] = sprintf("{ \"%s\",\t%2d },", \
substr(str, 4), j);
}
-/^#[ \t]*define[ \t][ \t]*_SIG[A-Z]/ {
+/^#[ \t]*define[ \t][ \t]*_SIG[A-Z]+[0-9]*[ \t]/ {
j = sprintf("%d", $4);
str = $3;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list