Date: Mon, 17 Sep 2007 22:37:08 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 126540 for review Message-ID: <200709172237.l8HMb8HS019044@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=126540 Change 126540 by peter@peter_daintree on 2007/09/17 22:36:51 IFC @126539 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#34 integrate .. //depot/projects/hammer/bin/ps/print.c#16 integrate .. //depot/projects/hammer/bin/ps/ps.c#20 integrate .. //depot/projects/hammer/contrib/less/main.c#8 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#78 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#54 integrate .. //depot/projects/hammer/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/hammer/etc/rc.d/lockd#3 integrate .. //depot/projects/hammer/etc/services#15 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#32 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#29 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#12 integrate .. //depot/projects/hammer/lib/libc/sys/ntp_adjtime.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/ntp_gettime.2#5 delete .. //depot/projects/hammer/lib/libelf/elf_update.3#2 integrate .. //depot/projects/hammer/lib/libelf/elf_update.c#2 integrate .. //depot/projects/hammer/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#35 integrate .. //depot/projects/hammer/lib/libutil/Makefile#16 integrate .. //depot/projects/hammer/lib/libutil/expand_number.3#1 branch .. //depot/projects/hammer/lib/libutil/expand_number.c#1 branch .. //depot/projects/hammer/lib/libutil/humanize_number.3#7 integrate .. //depot/projects/hammer/lib/libutil/libutil.h#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#18 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#46 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#7 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.8#9 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geli.8#9 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#57 integrate .. //depot/projects/hammer/sbin/quotacheck/preen.c#5 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#12 integrate .. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#11 integrate .. //depot/projects/hammer/share/examples/cvsup/doc-supfile#4 integrate .. //depot/projects/hammer/share/examples/cvsup/gnats-supfile#4 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#13 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#7 integrate .. //depot/projects/hammer/share/examples/cvsup/standard-supfile#5 integrate .. //depot/projects/hammer/share/examples/cvsup/www-supfile#4 integrate .. //depot/projects/hammer/share/man/man4/Makefile#96 integrate .. //depot/projects/hammer/share/man/man4/ata.4#30 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#15 integrate .. //depot/projects/hammer/share/man/man4/ral.4#11 integrate .. //depot/projects/hammer/share/man/man4/rum.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/hammer/share/man/man4/ural.4#12 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#10 integrate .. //depot/projects/hammer/share/man/man4/wlan_amrr.4#2 integrate .. //depot/projects/hammer/share/man/man4/zyd.4#1 branch .. //depot/projects/hammer/share/man/man5/Makefile#23 integrate .. //depot/projects/hammer/share/man/man5/ar.5#1 branch .. //depot/projects/hammer/share/man/man5/elf.5#12 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#81 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#11 integrate .. //depot/projects/hammer/share/man/man9/Makefile#70 integrate .. //depot/projects/hammer/share/man/man9/suser.9#13 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#77 integrate .. //depot/projects/hammer/sys/amd64/amd64/uma_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#64 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#27 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#11 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321.c#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#51 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#42 integrate .. //depot/projects/hammer/sys/conf/NOTES#126 integrate .. //depot/projects/hammer/sys/conf/options#114 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#78 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#38 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#36 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#79 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#48 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#11 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#55 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#21 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/em/if_em.c#69 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#33 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#20 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#23 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#25 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#10 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#9 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/hammer/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#85 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#55 integrate .. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#8 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#16 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#18 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.h#8 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_crypto.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#34 integrate .. //depot/projects/hammer/sys/i386/isa/isa.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#23 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#12 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#23 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#24 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#23 integrate .. //depot/projects/hammer/sys/ia64/ia64/uma_machdep.c#4 integrate .. //depot/projects/hammer/sys/kern/init_main.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#62 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#61 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#97 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#25 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#50 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#81 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#25 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#31 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#39 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#40 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#65 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#81 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#115 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#73 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/zyd/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#51 integrate .. //depot/projects/hammer/sys/net/bpf_filter.c#7 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#35 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#66 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#7 integrate .. //depot/projects/hammer/sys/net/rtsock.c#34 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#39 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#34 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#41 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#30 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#20 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#86 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/hammer/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_peeloff.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#79 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#74 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#28 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.h#14 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#49 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#47 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_var.h#7 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#31 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#13 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#24 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/uma_machdep.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#14 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#42 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#26 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#31 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#40 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#24 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#42 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#11 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_common.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/intr_machdep.h#7 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#34 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#10 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#28 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbusreg.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#13 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/callout.h#8 integrate .. //depot/projects/hammer/sys/sys/lock_profile.h#6 integrate .. //depot/projects/hammer/sys/sys/mount.h#51 integrate .. //depot/projects/hammer/sys/sys/proc.h#107 integrate .. //depot/projects/hammer/sys/sys/user.h#22 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#47 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#45 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_ZONEINFO#1 branch .. //depot/projects/hammer/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_eli/init.t#3 integrate .. //depot/projects/hammer/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_eli/onetime-a.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_eli/onetime.t#3 integrate .. //depot/projects/hammer/tools/regression/priv/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/priv/main.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/main.h#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_acct.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_adjtime.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_audit_control.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_audit_getaudit.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_audit_setaudit.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_audit_submit.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_clock_settime.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_cred.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_io.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_kenv_set.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_kenv_unset.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_msgbuf.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_netinet_raw.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_proc_setlogin.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_proc_setrlimit.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_sched_rtprio.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_sched_setpriority.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_settimeofday.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_sysctl_write.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_admin.c#2 delete .. //depot/projects/hammer/tools/regression/priv/priv_vfs_chflags.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_vfs_chmod.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_vfs_chown.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_chroot.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_fhopen.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_fhstat.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_generation.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_getfh.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_read_write.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_setgid.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vfs_utimes.c#1 branch .. //depot/projects/hammer/tools/regression/priv/priv_vm_madv_protect.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vm_mlock.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/priv_vm_munlock.c#2 integrate .. //depot/projects/hammer/tools/regression/priv/test_utimes.c#2 delete .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#9 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.computer#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#13 integrate .. //depot/projects/hammer/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/pigs.c#7 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#34 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#19 integrate .. //depot/projects/hammer/usr.bin/top/top.local.1#3 integrate .. //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#6 integrate .. //depot/projects/hammer/usr.sbin/periodic/periodic.8#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.8#5 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.109 2007/08/07 23:48:30 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -797,6 +797,10 @@ OLD_FILES+=usr/share/man/man1/omshell.1.gz OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz # 200504XX: ipf tools moved from /usr to / +OLD_FILES+=rescue/ipfs +OLD_FILES+=rescue/ipfstat +OLD_FILES+=rescue/ipmon +OLD_FILES+=rescue/ipnat OLD_FILES+=usr/sbin/ipftest OLD_FILES+=usr/sbin/ipresend OLD_FILES+=usr/sbin/ipsend @@ -828,6 +832,7 @@ OLD_FILES+=usr/libexec/getNAME # 200411XX: gvinum replaces vinum OLD_FILES+=bin/vinum +OLD_FILES+=rescue/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz # 200411XX: libxpg4 removal @@ -3296,7 +3301,6 @@ OLD_FILES+=usr/share/man/man4/uaudio.4.gz OLD_FILES+=usr/share/man/man4/utf2.4.gz OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz -OLD_FILES+=usr/share/man/man5/ar.5.gz OLD_FILES+=usr/share/man/man5/disklabel.5.gz OLD_FILES+=usr/share/man/man5/dm.conf.5.gz OLD_FILES+=usr/share/man/man5/ranlib.5.gz ==== //depot/projects/hammer/bin/ps/print.c#16 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -197,14 +197,13 @@ void state(KINFO *k, VARENT *ve) { - int flag, sflag, tdflags; + int flag, tdflags; char *cp; VAR *v; char buf[16]; v = ve->var; flag = k->ki_p->ki_flag; - sflag = k->ki_p->ki_sflag; tdflags = k->ki_p->ki_tdflags; /* XXXKSE */ cp = buf; @@ -242,7 +241,7 @@ *cp = '?'; } cp++; - if (!(sflag & PS_INMEM)) + if (!(flag & P_INMEM)) *cp++ = 'W'; if (k->ki_p->ki_nice < NZERO) *cp++ = '<'; @@ -591,7 +590,7 @@ #define fxtofl(fixpt) ((double)(fixpt) / fscale) /* XXX - I don't like this */ - if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0) + if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); if (rawcpu) return (100.0 * fxtofl(k->ki_p->ki_pctcpu)); @@ -619,7 +618,7 @@ if (failure) return (0.0); - if ((k->ki_p->ki_sflag & PS_INMEM) == 0) + if ((k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); /* XXX want pmap ptpages, segtab, etc. (per architecture) */ /* XXX don't have info about shared */ ==== //depot/projects/hammer/bin/ps/ps.c#20 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -994,13 +994,13 @@ return (s); } -#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM)) +#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) static void saveuser(KINFO *ki) { - if (ki->ki_p->ki_sflag & PS_INMEM) { + if (ki->ki_p->ki_flag & P_INMEM) { /* * The u-area might be swapped out, and we can't get * at it because we have a crashdump and no swap. ==== //depot/projects/hammer/contrib/less/main.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.11 2007/08/13 16:15:26 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.12 2007/09/04 13:54:09 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -244,7 +244,7 @@ quit(QUIT_OK); } - if (missing_cap && !know_dumb) + if (missing_cap && !know_dumb && !less_is_more) error("WARNING: terminal is not fully functional", NULL_PARG); init_mark(); open_getchr(); ==== //depot/projects/hammer/etc/defaults/rc.conf#78 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -154,6 +154,8 @@ pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_program="/sbin/pflogd" # where the pflogd program lives pflog_flags="" # additional flags for pflogd +ftpproxy_enable="NO" # Set to YES to enable ftp-proxy(8) for pf +ftpproxy_flags="" # additional flags for ftp-proxy(8) pfsync_enable="NO" # Expose pf state to other hosts for syncing pfsync_syncdev="" # Interface for pfsync to work through pfsync_syncpeer="" # IP address of pfsync peer host ==== //depot/projects/hammer/etc/rc.d/Makefile#54 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.82 2007/08/17 07:58:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $ .include <bsd.own.mk> @@ -11,7 +11,7 @@ devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ - fsck ftpd \ + fsck ftp-proxy ftpd \ gbde geli geli2 \ hcsecd \ hostapd hostid hostname \ ==== //depot/projects/hammer/etc/rc.d/lockd#3 (text+ko) ==== @@ -2,11 +2,11 @@ # # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ # # PROVIDE: lockd -# REQUIRE: nfsserver nfsclient nfsd rpcbind +# REQUIRE: nfsserver nfsclient nfsd rpcbind statd # BEFORE: DAEMON # KEYWORD: nojail ==== //depot/projects/hammer/etc/services#15 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.110 2007/05/20 03:57:47 grog Exp $ +# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2186,6 +2186,8 @@ sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp +iscsi-target 3260/tcp # iSCSI port +iscsi-target 3260/udp # iSCSI port ccmail 3264/tcp #cc:mail/lotus ccmail 3264/udp #cc:mail/lotus dec-notes 3333/tcp #DEC Notes @@ -2326,6 +2328,10 @@ montage-lm 6147/udp #Montage License Manager ricardo-lm 6148/tcp #Ricardo North America License Manager ricardo-lm 6148/udp #Ricardo North America License Manager +sge_qmaster 6444/tcp #Grid Engine Qmaster Service +sge_qmaster 6444/udp #Grid Engine Qmaster Service +sge_execd 6445/tcp #Grid Engine Execution Service +sge_execd 6445/upd #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp ircd 6667/tcp #Internet Relay Chat (unoffical) ==== //depot/projects/hammer/lib/libc/net/getaddrinfo.c#32 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.85 2006/07/23 15:31:03 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.86 2007/09/05 18:08:14 jinmei Exp $"); #include "namespace.h" #include <sys/types.h> @@ -575,11 +575,28 @@ * If the returned entry is for an active connection, * and the given name is not numeric, reorder the * list, so that the application would try the list - * in the most efficient order. + * in the most efficient order. Since the head entry + * of the original list may contain ai_canonname and + * that entry may be moved elsewhere in the new list, + * we keep the pointer and will restore it in the new + * head entry. (Note that RFC3493 requires the head + * entry store it when requested by the caller). */ if (hints == NULL || !(hints->ai_flags & AI_PASSIVE)) { - if (!numeric) + if (!numeric) { + char *canonname; + + canonname = + sentinel.ai_next->ai_canonname; + sentinel.ai_next->ai_canonname = NULL; (void)reorder(&sentinel); + if (sentinel.ai_next->ai_canonname == + NULL) { + sentinel.ai_next->ai_canonname + = canonname; + } else if (canonname != NULL) + free(canonname); + } } *res = sentinel.ai_next; return SUCCESS; ==== //depot/projects/hammer/lib/libc/stdlib/getenv.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.10 2007/07/20 23:30:13 scf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.11 2007/09/15 21:48:54 scf Exp $"); static const char CorruptEnvFindMsg[] = @@ -491,8 +491,8 @@ envVars[envNdx].active = true; newEnvActive++; - /* No need to rebuild environ if the variable was reused. */ - if (reuse) + /* No need to rebuild environ if an active variable was reused. */ + if (reuse && newEnvActive == envActive) return (0); else return (__rebuild_environ(newEnvActive)); ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#29 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.126 2007/07/04 23:22:59 peter Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -78,7 +78,7 @@ mlockall.2 mmap.2 modfind.2 modnext.2 modstat.2 mount.2 mprotect.2 \ mq_close.2 mq_getattr.2 mq_notify.2 mq_open.2 mq_receive.2 mq_send.2 \ mq_setattr.2 \ - msync.2 munmap.2 nanosleep.2 ntp_adjtime.2 ntp_gettime.2 \ + msync.2 munmap.2 nanosleep.2 ntp_adjtime.2 \ nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \ @@ -143,6 +143,7 @@ MLINKS+=mount.2 nmount.2 mount.2 unmount.2 MLINKS+=mq_send.2 mq_timedsend.2 MLINKS+=mq_receive.2 mq_timedreceive.2 +MLINKS+=ntp_adjtime.2 ntp_gettime.2 MLINKS+=pathconf.2 fpathconf.2 MLINKS+=read.2 pread.2 read.2 readv.2 read.2 preadv.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 ==== //depot/projects/hammer/lib/libc/sys/kqueue.2#12 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.45 2006/11/20 22:20:04 jhb Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ .\" -.Dd August 25, 2006 +.Dd September 6, 2007 .Dt KQUEUE 2 .Os .Sh NAME @@ -542,11 +542,6 @@ system and this manual page were written by .An Jonathan Lemon Aq jlemon@FreeBSD.org . .Sh BUGS -It is currently not possible to watch a -.Xr vnode 9 -that resides on anything but -a UFS file system. -.Pp The .Dv EVFILT_NETDEV filter is currently only implemented for devices that use the ==== //depot/projects/hammer/lib/libc/sys/ntp_adjtime.2#4 (text+ko) ==== @@ -1,7 +1,11 @@ +.\" $NetBSD: ntp_adjtime.2,v 1.6 2003/04/16 13:34:55 wiz Exp $ .\" -.\" Copyright (c) 2003 Tom Rhodes +.\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. .\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Thomas Klausner. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -10,6 +14,13 @@ .\" 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 NetBSD +.\" Foundation, Inc. and its contributors. +.\" 4. Neither the name of The NetBSD Foundation 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -23,116 +34,265 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.3 2007/02/17 01:54:00 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.4 2007/09/15 14:33:55 imp Exp $ .\" -.Dd April 1, 2003 +.Dd July 13, 2005 .Dt NTP_ADJTIME 2 .Os .Sh NAME -.Nm ntp_adjtime -.Nd NTP daemon application interface +.Nm ntp_adjtime , +.Nm ntp_gettime +.Nd Network Time Protocol (NTP) daemon interface system calls +.Sh LIBRARY +.Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/timex.h .Ft int -.Fn ntp_adjtime "struct timex *tp" +.Fn ntp_adjtime "struct timex *" +.Ft int +.Fn ntp_gettime "struct ntptimeval *" .Sh DESCRIPTION -The +The two system calls .Fn ntp_adjtime -system call is used as a kernel interface -for the Network Time Protocol daemon, +and +.Fn ntp_gettime +are the kernel interface to the Network Time Protocol (NTP) daemon .Xr ntpd 8 . -Certain fields of the -.Vt timex -structure are interpreted in either -microseconds or nanoseconds, according to the state of the -.Dv STA_NANO -bit in the -.Va status -word. .Pp -In the -.Fx -kernel, the +The +.Fn ntp_adjtime +function is used by the NTP daemon to adjust the system clock to an +externally derived time. +The time offset and related variables which are set by .Fn ntp_adjtime -and -.Xr ntp_gettime 2 -system calls can be used to determine which -resolution is in use, and to select either one at any time. -The resolution selected affects the scaling of certain fields in the +are used by +.Fn hardclock +to adjust the phase and frequency of the phase- or frequency-lock loop +(PLL resp. FLL) which controls the system clock. +.Pp +The .Fn ntp_gettime -and +function provides the time, maximum error (sync distance) and +estimated error (dispersion) to client user application programs. +.Pp +In the following, all variables that refer PPS are only relevant if +the +.Em PPS_SYNC +option is enabled in the kernel. +.Pp .Fn ntp_adjtime -system calls. -.Pp -Take note that this -.Tn API -is extremely complex and stateful. -Users should not attempt modification without first -reviewing the -.Xr ntpd 8 -sources in depth. +has as argument a +.Va struct timex * +of the following form: .Bd -literal -/* - * NTP daemon interface (ntp_adjtime()) - used to discipline CPU clock - * oscillator and determine status. - * - * Note: The offset, precision and jitter members are in microseconds if - * STA_NANO is zero and nanoseconds if not. - */ struct timex { unsigned int modes; /* clock mode bits (wo) */ - long offset; /* time offset (ns/us) (rw) */ - long freq; /* frequency offset (scaled PPM) (rw) */ - long maxerror; /* maximum error (us) (rw) */ - long esterror; /* estimated error (us) (rw) */ - int status; /* clock status bits (rw) */ - long constant; /* poll interval (log2 s) (rw) */ - long precision; /* clock precision (ns/us) (ro) */ - long tolerance; /* clock frequency tolerance (scaled - * PPM) (ro) */ + long offset; /* time offset (us) (rw) */ + long freq; /* frequency offset (scaled ppm) (rw) */ + long maxerror; /* maximum error (us) (rw) */ + long esterror; /* estimated error (us) (rw) */ + int status; /* clock status bits (rw) */ + long constant; /* pll time constant (rw) */ + long precision; /* clock precision (us) (ro) */ + long tolerance; /* clock frequency tolerance (scaled + * ppm) (ro) */ /* * The following read-only structure members are implemented * only if the PPS signal discipline is configured in the - * kernel. They are included in all configurations to insure - * portability. + * kernel. */ - long ppsfreq; /* PPS frequency (scaled PPM) (ro) */ - long jitter; /* PPS jitter (ns/us) (ro) */ - int shift; /* interval duration (s) (shift) (ro) */ - long stabil; /* PPS stability (scaled PPM) (ro) */ - long jitcnt; /* jitter limit exceeded (ro) */ - long calcnt; /* calibration intervals (ro) */ - long errcnt; /* calibration errors (ro) */ - long stbcnt; /* stability limit exceeded (ro) */ + long ppsfreq; /* pps frequency (scaled ppm) (ro) */ + long jitter; /* pps jitter (us) (ro) */ + int shift; /* interval duration (s) (shift) (ro) */ + long stabil; /* pps stability (scaled ppm) (ro) */ + long jitcnt; /* jitter limit exceeded (ro) */ + long calcnt; /* calibration intervals (ro) */ + long errcnt; /* calibration errors (ro) */ + long stbcnt; /* stability limit exceeded (ro) */ }; .Ed .Pp -Upon successful completion, +The members of this struct have the following meanings when used as +argument for +.Fn ntp_adjtime : +.Bl -tag -width tolerance -compact +.It Fa modes +Defines what settings should be changed with the current +.Fn ntp_adjtime +call (write-only). +Bitwise OR of the following: +.Bl -tag -width MOD_TIMECONST -compact -offset indent +.It MOD_OFFSET +set time offset +.It MOD_FREQUENCY +set frequency offset +.It MOD_MAXERROR +set maximum time error +.It MOD_ESTERROR +set estimated time error +.It MOD_STATUS +set clock status bits +.It MOD_TIMECONST +set PLL time constant +.It MOD_CLKA +set clock A +.It MOD_CLKB +set clock B +.El +.It Fa offset +Time offset (in microseconds), used by the PLL/FLL to adjust the +system time in small increments (read-write). +.It Fa freq +Frequency offset (scaled ppm) (read-write). +.It Fa maxerror +Maximum error (in microseconds). +Initialized by an +.Fn ntp_adjtime +call, and increased by the kernel once each second to reflect the maximum +error bound growth (read-write). +.It Fa esterror +Estimated error (in microseconds). +Set and read by +.Fn ntp_adjtime , +but unused by the kernel (read-write). +.It Fa status +System clock status bits (read-write). +Bitwise OR of the following: +.Bl -tag -width STA_PPSJITTER -compact -offset indent +.It STA_PLL +Enable PLL updates (read-write). +.It STA_PPSFREQ +Enable PPS freq discipline (read-write). +.It STA_PPSTIME +Enable PPS time discipline (read-write). +.It STA_FLL +Select frequency-lock mode (read-write). +.It STA_INS +Insert leap (read-write). +.It STA_DEL +Delete leap (read-write). +.It STA_UNSYNC +Clock unsynchronized (read-write). +.It STA_FREQHOLD +Hold frequency (read-write). +.It STA_PPSSIGNAL +PPS signal present (read-only). +.It STA_PPSJITTER +PPS signal jitter exceeded (read-only). +.It STA_PPSWANDER +PPS signal wander exceeded (read-only). +.It STA_PPSERROR +PPS signal calibration error (read-only). +.It STA_CLOCKERR +Clock hardware fault (read-only). +.El +.It Fa constant +PLL time constant, determines the bandwidth, or +.Dq stiffness , +of the PLL (read-write). +.It Fa precision +Clock precision (in microseconds). +In most cases the same as the kernel tick variable (see +.Xr hz 9 ) . +If a precision clock counter or external time-keeping signal is available, +it could be much lower (and depend on the state of the signal) +(read-only). +.It Fa tolerance +Maximum frequency error, or tolerance of the CPU clock oscillator (scaled +ppm). +Ordinarily a property of the architecture, but could change under +the influence of external time-keeping signals (read-only). +.It Fa ppsfreq +PPS frequency offset produced by the frequency median filter (scaled +ppm) (read-only). +.It Fa jitter +PPS jitter measured by the time median filter in microseconds +(read-only). +.It Fa shift +Logarithm to base 2 of the interval duration in seconds (PPS, +read-only). +.It Fa stabil +PPS stability (scaled ppm); dispersion (wander) measured by the +frequency median filter (read-only). +.It Fa jitcnt +Number of seconds that have been discarded because the jitter measured +by the time median filter exceeded the limit +.Em MAXTIME +(PPS, read-only). +.It Fa calcnt +Count of calibration intervals (PPS, read-only). +.It Fa errcnt +Number of calibration intervals that have been discarded because the +wander exceeded the limit +.Em MAXFREQ +or where the calibration interval jitter exceeded two ticks (PPS, +read-only). +.It Fa stbcnt +Number of calibration intervals that have been discarded because the +frequency wander exceeded the limit +.Em MAXFREQ Ns /4 +(PPS, read-only). +.El +After the .Fn ntp_adjtime -will fill the -.Fa tp -argument with the current clock state. +call, the +.Va struct timex * +structure contains the current values of the corresponding variables. +.Pp +.Fn ntp_gettime +has as argument a >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709172237.l8HMb8HS019044>