Date: Tue, 11 May 2010 17:33:57 GMT From: Ivor Prebeg <iprebeg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 178109 for review Message-ID: <201005111733.o4BHXvfN049457@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178109?ac=10 Change 178109 by iprebeg@iprebeg_nxlab_login on 2010/05/11 17:33:05 IFC@178103 Affected files ... .. //depot/projects/vimage/src/share/man/man1/builtin.1#3 integrate .. //depot/projects/vimage/src/share/man/man3/Makefile#4 integrate .. //depot/projects/vimage/src/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/vimage/src/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/vimage/src/share/man/man4/cas.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ng_hub.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sge.4#3 integrate .. //depot/projects/vimage/src/share/man/man9/make_dev.9#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#15 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#21 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#19 integrate .. //depot/projects/vimage/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#27 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#17 integrate .. //depot/projects/vimage/src/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#16 integrate .. //depot/projects/vimage/src/sys/boot/common/module.c#5 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#26 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#13 integrate .. //depot/projects/vimage/src/sys/dev/ae/if_ae.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#10 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#12 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#47 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#29 integrate .. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#7 integrate .. //depot/projects/vimage/src/sys/dev/bwn/if_bwn.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cas/if_cas.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cas/if_casreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#11 integrate .. //depot/projects/vimage/src/sys/dev/cm/smc90cx6.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cp/if_cp.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#11 integrate .. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#22 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#33 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#31 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/via_dmablit.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ie/if_ie.c#8 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/if_ic.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#20 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#20 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#16 integrate .. //depot/projects/vimage/src/sys/dev/le/lance.c#5 integrate .. //depot/projects/vimage/src/sys/dev/malo/if_malo.c#8 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#15 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#26 integrate .. //depot/projects/vimage/src/sys/dev/mvs/mvs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#23 integrate .. //depot/projects/vimage/src/sys/dev/my/if_my.c#9 integrate .. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#22 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#19 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#32 integrate .. //depot/projects/vimage/src/sys/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sge/if_sgereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#8 integrate .. //depot/projects/vimage/src/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/vimage/src/sys/dev/snc/dp83932.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_run.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgt.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_urtw.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#19 integrate .. //depot/projects/vimage/src/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/vimage/src/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#17 integrate .. //depot/projects/vimage/src/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#16 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#6 integrate .. //depot/projects/vimage/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/vimage/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonkrpc.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#11 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#10 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_ctl.c#4 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#23 integrate .. //depot/projects/vimage/src/sys/geom/geom.h#9 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#15 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#11 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#8 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_events.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#7 integrate .. //depot/projects/vimage/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#22 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#19 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenfunc.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenvar.h#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#16 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#30 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#33 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#26 integrate .. //depot/projects/vimage/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#18 integrate .. //depot/projects/vimage/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#17 integrate .. //depot/projects/vimage/src/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#36 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#32 integrate .. //depot/projects/vimage/src/sys/mips/adm5120/if_admsw.c#7 integrate .. //depot/projects/vimage/src/sys/mips/atheros/if_arge.c#3 integrate .. //depot/projects/vimage/src/sys/mips/include/pmap.h#10 integrate .. //depot/projects/vimage/src/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#20 integrate .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#13 integrate .. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#6 integrate .. //depot/projects/vimage/src/sys/net/if.c#99 integrate .. //depot/projects/vimage/src/sys/net/if_ef.c#20 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#38 integrate .. //depot/projects/vimage/src/sys/net/if_gre.c#18 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#44 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#65 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#38 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_hub.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#35 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ksocket.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#50 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#66 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#38 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#48 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#53 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#17 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#13 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#18 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#18 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#15 integrate .. //depot/projects/vimage/src/sys/sys/buf_ring.h#6 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#21 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#21 integrate .. //depot/projects/vimage/src/sys/sys/param.h#66 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#41 integrate .. //depot/projects/vimage/src/sys/sys/resource.h#10 integrate .. //depot/projects/vimage/src/sys/sys/resourcevar.h#6 integrate .. //depot/projects/vimage/src/sys/sys/vmmeter.h#7 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#29 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#18 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/vimage/src/sys/vm/device_pager.c#13 integrate .. //depot/projects/vimage/src/sys/vm/phys_pager.c#9 integrate .. //depot/projects/vimage/src/sys/vm/sg_pager.c#4 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#25 integrate .. //depot/projects/vimage/src/sys/vm/uma_core.c#14 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#24 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#17 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#30 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#29 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#15 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#24 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.h#4 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#21 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man1/builtin.1#3 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.31 2010/04/25 17:38:53 jilles Exp $ +.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.32 2010/05/09 15:00:30 jilles Exp $ .\" -.Dd April 25, 2010 +.Dd May 9, 2010 .Dt BUILTIN 1 .Os .Sh NAME @@ -200,7 +200,7 @@ .It Ic % Ta \&No Ta Yes Ta \&No .It Ic \&. Ta \&No Ta \&No Ta Yes .It Ic \&: Ta \&No Ta Yes Ta Yes -.It Ic @ Ta \&No Ta Yes Ta Yes +.It Ic @ Ta \&No Ta Yes Ta \&No .It Ic \&[ Ta Yes Ta \&No Ta Yes .It Ic { Ta \&No Ta \&No Ta Yes .It Ic } Ta \&No Ta \&No Ta Yes ==== //depot/projects/vimage/src/share/man/man3/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 -# $FreeBSD: src/share/man/man3/Makefile,v 1.51 2010/01/09 12:31:11 delphij Exp $ +# $FreeBSD: src/share/man/man3/Makefile,v 1.52 2010/05/09 14:21:34 jilles Exp $ .include <bsd.own.mk> @@ -251,7 +251,11 @@ PTHREAD_MLINKS+=pthread_barrier_destroy.3 pthread_barrier_init.3 \ pthread_barrier_destroy.3 pthread_barrier_wait.3 PTHREAD_MLINKS+=pthread_condattr.3 pthread_condattr_destroy.3 \ - pthread_condattr.3 pthread_condattr_init.3 + pthread_condattr.3 pthread_condattr_init.3 \ + pthread_condattr.3 pthread_condattr_getclock.3 \ + pthread_condattr.3 pthread_condattr_setclock.3 \ + pthread_condattr.3 pthread_condattr_getpshared.3 \ + pthread_condattr.3 pthread_condattr_setpshared.3 PTHREAD_MLINKS+=pthread_getconcurrency.3 pthread_setconcurrency.3 PTHREAD_MLINKS+=pthread_multi_np.3 pthread_single_np.3 PTHREAD_MLINKS+=pthread_mutexattr.3 pthread_mutexattr_destroy.3 \ ==== //depot/projects/vimage/src/share/man/man3/pthread_cond_timedwait.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.21 2007/10/22 10:08:00 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.22 2010/05/09 14:21:34 jilles Exp $ .\" -.Dd July 28, 1998 +.Dd May 9, 2010 .Dt PTHREAD_COND_TIMEDWAIT 3 .Os .Sh NAME @@ -56,6 +56,11 @@ .Fa abstime , and the current thread reacquires the lock on .Fa mutex . +.Pp +The clock used to measure +.Fa abstime +can be specified during creation of the condition variable using +.Xr pthread_condattr_setclock 3 . .Sh RETURN VALUES If successful, the .Fn pthread_cond_timedwait @@ -87,7 +92,8 @@ .Xr pthread_cond_destroy 3 , .Xr pthread_cond_init 3 , .Xr pthread_cond_signal 3 , -.Xr pthread_cond_wait 3 +.Xr pthread_cond_wait 3 , +.Xr pthread_condattr_setclock 3 .Sh STANDARDS The .Fn pthread_cond_timedwait ==== //depot/projects/vimage/src/share/man/man3/pthread_condattr.3#2 (text+ko) ==== @@ -25,13 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_condattr.3,v 1.15 2007/10/22 10:08:00 ru Exp $ -.Dd April 28, 2000 +.\" $FreeBSD: src/share/man/man3/pthread_condattr.3,v 1.16 2010/05/09 14:21:34 jilles Exp $ +.Dd May 9, 2010 .Dt PTHREAD_CONDATTR 3 .Os .Sh NAME .Nm pthread_condattr_init , -.Nm pthread_condattr_destroy +.Nm pthread_condattr_destroy , +.Nm pthread_condattr_getclock , +.Nm pthread_condattr_setclock , +.Nm pthread_condattr_getpshared , +.Nm pthread_condattr_setpshared , .Nd condition attribute operations .Sh LIBRARY .Lb libpthread @@ -41,14 +45,17 @@ .Fn pthread_condattr_init "pthread_condattr_t *attr" .Ft int .Fn pthread_condattr_destroy "pthread_condattr_t *attr" +.Ft int +.Fn pthread_condattr_getclock "pthread_condattr_t * restrict attr" "clock_t * restrict clock_id" +.Ft int +.Fn pthread_condattr_setclock "pthread_condattr_t *attr" "clock_t clock_id" +.Ft int +.Fn pthread_condattr_getpshared "pthread_condattr_t * restrict attr" "int * restrict pshared" +.Ft int +.Fn pthread_condattr_setpshared "pthread_condattr_t *attr" "int pshared" .Sh DESCRIPTION Condition attribute objects are used to specify parameters to .Fn pthread_cond_init . -.Fx Ns 's -implementation of conditions does not support any non-default -attributes, so these functions are not very useful, though they are required -to be present by -.Tn POSIX . .Pp The .Fn pthread_condattr_init @@ -57,6 +64,52 @@ The .Fn pthread_condattr_destroy function destroys a condition attribute object. +.Pp +The +.Fn pthread_condattr_getclock +function will put the value of the clock attribute from +.Fa attr +into the memory area pointed to by +.Fa clock_id . +The +.Fn pthread_condattr_setclock +function will set the clock attribute of +.Fa attr +to the value specified in +.Fa clock_id . +The clock attribute affects the interpretation of +.Fa abstime +in +.Xr pthread_cond_timedwait 3 +and may be set to +.Dv CLOCK_REALTIME +(default) +or +.Dv CLOCK_MONOTONIC . +.Pp +The +.Fn pthread_condattr_getpshared +function will put the value of the process-shared attribute from +.Fa attr +into the memory area pointed to by +.Fa pshared . +The +.Fn pthread_condattr_setpshared +function will set the process-shared attribute of +.Fa attr +to the value specified in +.Fa pshared . +The argument +.Fa pshared +may have one of the following values: +.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE" +.It Dv PTHREAD_PROCESS_PRIVATE +The condition variable it is attached to may only be accessed by +threads in the same process as the one that created the object. +.It Dv PTHREAD_PROCESS_SHARED +The condition variable it is attached to may be accessed by +threads in processes other than the one that created the object. +.El .Sh RETURN VALUES If successful, these functions return 0. Otherwise, an error number is returned to indicate the error. @@ -77,8 +130,29 @@ Invalid value for .Fa attr . .El +.Pp +The +.Fn pthread_condattr_setclock +function will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The value specified in +.Fa clock_id +is not one of the allowed values. +.El +.Pp +The +.Fn pthread_condattr_setpshared +function will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The value specified in +.Fa pshared +is not one of the allowed values. +.El .Sh SEE ALSO -.Xr pthread_cond_init 3 +.Xr pthread_cond_init 3 , +.Xr pthread_cond_timedwait 3 .Sh STANDARDS The .Fn pthread_condattr_init @@ -86,3 +160,15 @@ .Fn pthread_condattr_destroy functions conform to .St -p1003.1-96 +.Sh BUGS +The implementation of +condition variables +does not fully conform to +.St -p1003.2 +because the process-shared attribute is ignored; +if any value other than +.Dv PTHREAD_PROCESSES_PRIVATE +is specified in a call to +.Fn pthread_condattr_setpshared , +it will return +.Er EINVAL . ==== //depot/projects/vimage/src/share/man/man4/cas.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/cas.4,v 1.1 2009/06/15 18:24:04 marius Exp $ +.\" $FreeBSD: src/share/man/man4/cas.4,v 1.2 2010/05/03 20:59:27 marius Exp $ .\" -.Dd June 15, 2009 +.Dd May 3, 2010 .Dt CAS 4 .Os .Sh NAME @@ -91,6 +91,9 @@ .Pp .Bl -bullet -compact .It +Sun GigaSwift Ethernet 1.0 MMF (Cassini Kuheen) +(part no.\& 501-5524) +.It Sun GigaSwift Ethernet 1.0 UTP (Cassini) (part no.\& 501-5902) .It ==== //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.4 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.5 2010/05/09 21:34:05 brueffer Exp $ .\" -.Dd February 23, 2007 +.Dd May 9, 2010 .Dt ISCSI_INITIATOR 4 .Os .Sh NAME @@ -48,34 +48,39 @@ The .Nm implements the kernel side of the Internet SCSI (iSCSI) network -protocol standard, the user land companion is +protocol standard. +The userland companion is .Xr iscontrol 8 , and permits access to remote .Em virtual SCSI devices via .Xr cam 4 . .Sh SYSCTL VARIABLES -.Bl -tag -width ".Va net.iscsi.n.targeaddress" +.Bl -tag -width "net.iscsi.n.targedaddress" .It Va debug.iscsi_initiator set the debug-level, 0 means no debugging, 9 for maximum. .It Va net.iscsi.isid the initiator part of the Session Identifier. -.It "the following are informative only:" +.El +.Pp +The following are informative only: +.Pp +.Bl -tag -width "net.iscsi.n.targedaddress" .It Va net.iscsi.driver_version the current version of the driver. .It Va net.iscsi.sessions the number of current active sessions. .It Va net.iscsi.n.targetname -is the targe name of session +the target name of session .Em n . -.It Va net.iscsi.n.targeaddress -is the IP address of the target of session +.It Va net.iscsi.n.targedaddress +the IP address of the target of session .Em n . .It Va net.iscsi.n.stats -are some statistics for session +statistics for session .Em n .It Va net.iscsi.n.pid -is the +the .Em "process id" of the userland side of session .Em n , ==== //depot/projects/vimage/src/share/man/man4/ng_bridge.4#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" .\" Author: Archie Cobbs <archie@FreeBSD.org> .\" -.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.11 2005/09/27 18:10:42 mlaier Exp $ +.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.12 2010/05/05 22:06:05 zec Exp $ .\" -.Dd August 31, 2000 +.Dd May 5, 2010 .Dt NG_BRIDGE 4 .Os .Sh NAME @@ -181,11 +181,17 @@ .It Dv NGM_BRIDGE_GET_TABLE Returns the current host mapping table used to direct packets, in a .Dv "struct ng_bridge_host_ary" . +.It Dv NGM_BRIDGE_SET_PERSISTENT +This command sets the persistent flag on the node, and takes no arguments. .El .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN -control message, or when all hooks have been disconnected. +control message, or when all hooks have been disconnected. Setting the +persistent flag via a +.Dv NGM_BRIDGE_SET_PERSISTENT +control message disables automatic node shutdown when the last hook gets +disconnected. .Sh FILES .Bl -tag -width XXXXXXXX -compact .It Pa /usr/share/examples/netgraph/ether.bridge ==== //depot/projects/vimage/src/share/man/man4/ng_hub.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.1 2004/04/17 12:42:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.2 2010/05/05 22:06:05 zec Exp $ .\" -.Dd April 17, 2004 +.Dd May 5, 2010 .Dt NG_HUB 4 .Os .Sh NAME @@ -45,11 +45,20 @@ node accepts any request to connect, regardless of the hook name, as long as the name is unique. .Sh CONTROL MESSAGES -This node type supports only the generic control messages. +This node type supports the generic control messages, plus the +following: +.Bl -tag -width foo +.It Dv NGM_HUB_SET_PERSISTENT +This command sets the persistent flag on the node, and takes no arguments. +.El .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN -control message, or when all hooks have been disconnected. +control message, or when all hooks have been disconnected. Setting the +persistent flag via a +.Dv NGM_HUB_SET_PERSISTENT +control message disables automatic node shutdown when the last hook gets +disconnected. .Sh SEE ALSO .Xr netgraph 4 , .Xr ng_bridge 4 , ==== //depot/projects/vimage/src/share/man/man4/sge.4#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sge.4,v 1.2 2010/04/29 18:21:27 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/sge.4,v 1.3 2010/05/10 17:48:00 yongari Exp $ .\" -.Dd April 29, 2010 +.Dd May 10, 2010 .Dt SGE 4 .Os .Sh NAME @@ -54,9 +54,9 @@ All LOMs supported by the .Nm driver have TCP/UDP/IP checksum offload for transmit and receive, -hardware VLAN tag stripping/insertion features. -Due to lack of documentation more offloading features like TCP -segmentation offload (TSO), Wake On Lan (WOL), Jumbo frame and an +TCP segmentation offload (TSO), hardware VLAN tag stripping/insertion +features. +Due to lack of documentation Wake On Lan (WOL), Jumbo frame and an interrupt moderation mechanism are not supported yet. .Pp The ==== //depot/projects/vimage/src/share/man/man9/make_dev.9#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.27 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.28 2010/05/06 19:23:49 kib Exp $ .\" -.Dd September 28, 2008 +.Dd May 6, 2010 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -133,9 +133,18 @@ .Pp .Bd -literal -offset indent -compact MAKEDEV_REF reference the created device +MAKEDEV_NOWAIT do not sleep, may return NULL +MAKEDEV_WAITOK allow the function to sleep to satisfy malloc .Ed .Pp The +.Dv MAKEDEV_WAITOK +flag is assumed if none of +.Dv MAKEDEV_WAITOK , +.Dv MAKEDEV_NOWAIT +is specified. +.Pp +The .Xr dev_clone 9 event handler shall specify .Dv MAKEDEV_REF ==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ */ #include "opt_atpic.h" @@ -50,14 +50,14 @@ .bss .globl dtrace_invop_jump_addr .align 8 - .type dtrace_invop_jump_addr, @object - .size dtrace_invop_jump_addr, 8 + .type dtrace_invop_jump_addr,@object + .size dtrace_invop_jump_addr,8 dtrace_invop_jump_addr: .zero 8 .globl dtrace_invop_calltrap_addr .align 8 - .type dtrace_invop_calltrap_addr, @object - .size dtrace_invop_calltrap_addr, 8 + .type dtrace_invop_calltrap_addr,@object + .size dtrace_invop_calltrap_addr,8 dtrace_invop_calltrap_addr: .zero 8 #endif @@ -157,7 +157,6 @@ * kernel from userland. Reenable interrupts if they were enabled * before the trap. This approximates SDT_SYS386TGT on the i386 port. */ - SUPERALIGN_TEXT .globl alltraps .type alltraps,@function @@ -211,16 +210,16 @@ * Set our jump address for the jump back in the event that * the breakpoint wasn't caused by DTrace at all. */ - movq $calltrap, dtrace_invop_calltrap_addr(%rip) + movq $calltrap,dtrace_invop_calltrap_addr(%rip) /* Jump to the code hooked in by DTrace. */ - movq dtrace_invop_jump_addr, %rax + movq dtrace_invop_jump_addr,%rax jmpq *dtrace_invop_jump_addr #endif .globl calltrap .type calltrap,@function calltrap: - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -274,9 +273,11 @@ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: movq %rsp, %rdi +1: + movq %rsp,%rdi call dblfault_handler -2: hlt +2: + hlt jmp 2b IDTVEC(page) @@ -369,7 +370,7 @@ movq %r15,TF_R15(%rsp) /* C preserved */ movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call syscall movq PCPU(CURPCB),%rax andq $~PCB_FULLCTX,PCB_FLAGS(%rax) @@ -456,7 +457,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT #ifdef HWPMC_HOOKS @@ -555,9 +556,9 @@ iretq ENTRY(fork_trampoline) - movq %r12, %rdi /* function */ - movq %rbx, %rsi /* arg1 */ - movq %rsp, %rdx /* trapframe pointer */ + movq %r12,%rdi /* function */ + movq %rbx,%rsi /* arg1 */ + movq %rsp,%rdx /* trapframe pointer */ call fork_exit MEXITCOUNT jmp doreti /* Handle any ASTs */ @@ -628,7 +629,7 @@ testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) je doreti_exit sti - movq %rsp, %rdi /* pass a pointer to the trapframe */ + movq %rsp,%rdi /* pass a pointer to the trapframe */ call ast jmp doreti_ast @@ -648,8 +649,8 @@ * Do not reload segment registers for kernel. * Since we do not reload segments registers with sane * values on kernel entry, descriptors referenced by - * segments registers may be not valid. This is fatal - * for the usermode, but is innocent for the kernel. + * segments registers might be not valid. This is fatal + * for user mode, but is not a problem for the kernel. */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs @@ -662,14 +663,16 @@ /* Restore %fs and fsbase */ movw TF_FS(%rsp),%ax .globl ld_fs -ld_fs: movw %ax,%fs +ld_fs: + movw %ax,%fs cmpw $KUF32SEL,%ax jne 1f movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase -ld_fsbase: wrmsr +ld_fsbase: + wrmsr 1: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si @@ -678,7 +681,8 @@ movl $MSR_GSBASE,%ecx rdmsr .globl ld_gs -ld_gs: movw %si,%gs +ld_gs: + movw %si,%gs wrmsr popfq cmpw $KUG32SEL,%si @@ -687,12 +691,17 @@ movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx .globl ld_gsbase -ld_gsbase: wrmsr -1: .globl ld_es -ld_es: movw TF_ES(%rsp),%es +ld_gsbase: + wrmsr +1: + .globl ld_es +ld_es: + movw TF_ES(%rsp),%es .globl ld_ds -ld_ds: movw TF_DS(%rsp),%ds -ld_regs:movq TF_RDI(%rsp),%rdi +ld_ds: + movw TF_DS(%rsp),%ds +ld_regs: + movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx movq TF_RCX(%rsp),%rcx @@ -711,7 +720,8 @@ jz 1f /* keep running with kernel GS.base */ cli swapgs -1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ +1: + addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ .globl doreti_iret doreti_iret: iretq @@ -738,7 +748,8 @@ testl $PSL_I,TF_RFLAGS(%rsp) jz 1f sti -1: movw %fs,TF_FS(%rsp) +1: + movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) @@ -768,7 +779,7 @@ .globl ds_load_fault ds_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_DS(%rsp) jmp doreti @@ -777,7 +788,7 @@ .globl es_load_fault es_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_ES(%rsp) jmp doreti @@ -786,7 +797,7 @@ .globl fs_load_fault fs_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUF32SEL,TF_FS(%rsp) jmp doreti @@ -796,7 +807,7 @@ gs_load_fault: popfq movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUG32SEL,TF_GS(%rsp) jmp doreti @@ -805,7 +816,7 @@ .globl fsbase_load_fault fsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 @@ -816,7 +827,7 @@ .globl gsbase_load_fault gsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); #include "opt_cpu.h" @@ -240,7 +240,7 @@ printf("\n Features2=0x%b", cpu_feature2, "\020" "\001SSE3" /* SSE3 */ - "\002<b1>" + "\002PCLMULQDQ" /* Carry-Less Mul Quadword */ "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ @@ -264,7 +264,7 @@ "\027MOVBE" "\030POPCNT" "\031<b24>" - "\032<b25>" + "\032AESNI" /* AES Crypto*/ "\033XSAVE" "\034OSXSAVE" "\035<b28>" ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#39 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.696 2010/05/08 20:34:01 alc Exp $"); /* * Manages physical address maps. @@ -2796,7 +2796,7 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2834,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -3414,8 +3415,10 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005111733.o4BHXvfN049457>