Date: Wed, 7 Mar 2012 11:18:39 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r232653 - in user/attilio/vmcontention: . bin/df etc/mtree etc/rc.d include include/xlocale lib/csu/mips lib/libc/arm lib/libc/gen lib/libc/locale lib/libc/mips/gen lib/libc/regex lib/l... Message-ID: <201203071118.q27BIdF9090498@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Wed Mar 7 11:18:38 2012 New Revision: 232653 URL: http://svn.freebsd.org/changeset/base/232653 Log: MFC Added: user/attilio/vmcontention/include/xlocale/ - copied from r232652, head/include/xlocale/ user/attilio/vmcontention/lib/libpmc/pmc.sandybridge.3 - copied unchanged from r232652, head/lib/libpmc/pmc.sandybridge.3 user/attilio/vmcontention/lib/libpmc/pmc.sandybridgeuc.3 - copied unchanged from r232652, head/lib/libpmc/pmc.sandybridgeuc.3 user/attilio/vmcontention/share/man/man4/snd_hdspe.4 - copied unchanged from r232652, head/share/man/man4/snd_hdspe.4 user/attilio/vmcontention/share/man/man4/wbwd.4 - copied unchanged from r232652, head/share/man/man4/wbwd.4 user/attilio/vmcontention/sys/dev/sound/pci/hdspe-pcm.c - copied unchanged from r232652, head/sys/dev/sound/pci/hdspe-pcm.c user/attilio/vmcontention/sys/dev/sound/pci/hdspe.c - copied unchanged from r232652, head/sys/dev/sound/pci/hdspe.c user/attilio/vmcontention/sys/dev/sound/pci/hdspe.h - copied unchanged from r232652, head/sys/dev/sound/pci/hdspe.h user/attilio/vmcontention/sys/dev/wbwd/ - copied from r232652, head/sys/dev/wbwd/ user/attilio/vmcontention/sys/mips/include/tls.h - copied unchanged from r232652, head/sys/mips/include/tls.h user/attilio/vmcontention/sys/mips/mips/freebsd32_machdep.c - copied unchanged from r232652, head/sys/mips/mips/freebsd32_machdep.c user/attilio/vmcontention/sys/modules/sound/driver/hdspe/ - copied from r232652, head/sys/modules/sound/driver/hdspe/ user/attilio/vmcontention/sys/modules/usb/dwc_otg/ - copied from r232652, head/sys/modules/usb/dwc_otg/ user/attilio/vmcontention/sys/modules/wbwd/ - copied from r232652, head/sys/modules/wbwd/ user/attilio/vmcontention/sys/x86/include/float.h - copied unchanged from r232652, head/sys/x86/include/float.h user/attilio/vmcontention/sys/x86/include/ptrace.h - copied unchanged from r232652, head/sys/x86/include/ptrace.h user/attilio/vmcontention/sys/x86/include/trap.h - copied unchanged from r232652, head/sys/x86/include/trap.h user/attilio/vmcontention/tools/regression/usb/ - copied from r232652, head/tools/regression/usb/ Deleted: user/attilio/vmcontention/include/_xlocale_ctype.h user/attilio/vmcontention/sys/mips/mips/elf64_machdep.c Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/UPDATING user/attilio/vmcontention/bin/df/df.1 user/attilio/vmcontention/etc/mtree/BSD.include.dist user/attilio/vmcontention/etc/rc.d/routing user/attilio/vmcontention/include/Makefile user/attilio/vmcontention/include/ctype.h user/attilio/vmcontention/include/langinfo.h user/attilio/vmcontention/include/locale.h user/attilio/vmcontention/include/runetype.h user/attilio/vmcontention/include/string.h user/attilio/vmcontention/include/time.h user/attilio/vmcontention/include/wchar.h user/attilio/vmcontention/include/wctype.h user/attilio/vmcontention/include/xlocale.h user/attilio/vmcontention/lib/csu/mips/crt1.c user/attilio/vmcontention/lib/libc/arm/Symbol.map user/attilio/vmcontention/lib/libc/gen/Makefile.inc user/attilio/vmcontention/lib/libc/gen/closedir.c user/attilio/vmcontention/lib/libc/gen/opendir.c user/attilio/vmcontention/lib/libc/gen/tls.c user/attilio/vmcontention/lib/libc/locale/Symbol.map user/attilio/vmcontention/lib/libc/locale/collate.c user/attilio/vmcontention/lib/libc/locale/nomacros.c user/attilio/vmcontention/lib/libc/locale/setrunelocale.c user/attilio/vmcontention/lib/libc/locale/table.c user/attilio/vmcontention/lib/libc/locale/xlocale.c user/attilio/vmcontention/lib/libc/locale/xlocale_private.h user/attilio/vmcontention/lib/libc/mips/gen/_set_tp.c user/attilio/vmcontention/lib/libc/regex/regcomp.c user/attilio/vmcontention/lib/libc/stdio/mktemp.3 user/attilio/vmcontention/lib/libc/string/swab.3 user/attilio/vmcontention/lib/libc/string/swab.c user/attilio/vmcontention/lib/libc/sys/Makefile.inc user/attilio/vmcontention/lib/libc/uuid/uuid.3 user/attilio/vmcontention/lib/libcam/camlib.c user/attilio/vmcontention/lib/libjail/jail.c user/attilio/vmcontention/lib/libpmc/Makefile user/attilio/vmcontention/lib/libpmc/libpmc.c user/attilio/vmcontention/lib/libthr/arch/mips/include/pthread_md.h user/attilio/vmcontention/libexec/rtld-elf/libmap.c user/attilio/vmcontention/libexec/rtld-elf/mips/reloc.c user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_machdep.h user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml user/attilio/vmcontention/release/doc/share/misc/dev.archlist.txt user/attilio/vmcontention/sbin/geom/class/eli/geli.8 user/attilio/vmcontention/sbin/growfs/debug.c user/attilio/vmcontention/sbin/growfs/growfs.c user/attilio/vmcontention/sbin/ifconfig/ifconfig.8 user/attilio/vmcontention/sbin/ifconfig/iflagg.c user/attilio/vmcontention/sbin/ipfw/dummynet.c user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/ahci.4 user/attilio/vmcontention/share/man/man4/ata.4 user/attilio/vmcontention/share/man/man4/ehci.4 user/attilio/vmcontention/share/man/man4/jme.4 user/attilio/vmcontention/share/man/man4/ng_patch.4 user/attilio/vmcontention/share/man/man4/pcm.4 user/attilio/vmcontention/share/man/man9/Makefile user/attilio/vmcontention/share/man/man9/bus_dma.9 user/attilio/vmcontention/share/man/man9/contigmalloc.9 user/attilio/vmcontention/share/man/man9/ifnet.9 user/attilio/vmcontention/share/man/man9/namei.9 user/attilio/vmcontention/share/man/man9/pci.9 user/attilio/vmcontention/share/misc/committers-ports.dot user/attilio/vmcontention/sys/amd64/amd64/ptrace_machdep.c user/attilio/vmcontention/sys/amd64/conf/DEFAULTS user/attilio/vmcontention/sys/amd64/conf/GENERIC user/attilio/vmcontention/sys/amd64/conf/GENERIC.hints user/attilio/vmcontention/sys/amd64/conf/NOTES user/attilio/vmcontention/sys/amd64/include/float.h user/attilio/vmcontention/sys/amd64/include/ptrace.h user/attilio/vmcontention/sys/amd64/include/trap.h user/attilio/vmcontention/sys/arm/arm/busdma_machdep.c user/attilio/vmcontention/sys/arm/conf/DEFAULTS user/attilio/vmcontention/sys/arm/mv/mvreg.h user/attilio/vmcontention/sys/boot/fdt/dts/db78100.dts user/attilio/vmcontention/sys/boot/forth/loader.conf user/attilio/vmcontention/sys/boot/i386/boot2/boot1.S user/attilio/vmcontention/sys/boot/i386/boot2/boot2.c user/attilio/vmcontention/sys/cam/ctl/ctl.c user/attilio/vmcontention/sys/cam/ctl/ctl.h user/attilio/vmcontention/sys/cam/ctl/ctl_backend.h user/attilio/vmcontention/sys/cam/ctl/ctl_backend_block.c user/attilio/vmcontention/sys/cam/ctl/ctl_backend_ramdisk.c user/attilio/vmcontention/sys/cam/ctl/ctl_error.c user/attilio/vmcontention/sys/cam/ctl/ctl_ioctl.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_misc.c user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c user/attilio/vmcontention/sys/compat/freebsd32/syscalls.master user/attilio/vmcontention/sys/compat/ndis/subr_hal.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/files.amd64 user/attilio/vmcontention/sys/conf/files.i386 user/attilio/vmcontention/sys/conf/files.mips user/attilio/vmcontention/sys/conf/kern.pre.mk user/attilio/vmcontention/sys/conf/options.mips user/attilio/vmcontention/sys/dev/acpica/acpi_pci.c user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/ata/ata-pci.h user/attilio/vmcontention/sys/dev/ata/chipsets/ata-ahci.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-marvell.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/cardbus/cardbus.c user/attilio/vmcontention/sys/dev/e1000/if_igb.c user/attilio/vmcontention/sys/dev/fdt/fdt_common.c user/attilio/vmcontention/sys/dev/fdt/fdt_common.h user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.h user/attilio/vmcontention/sys/dev/hwpmc/pmc_events.h user/attilio/vmcontention/sys/dev/iicbus/ds1775.c user/attilio/vmcontention/sys/dev/iicbus/iicbb.c user/attilio/vmcontention/sys/dev/iicbus/iicbb_if.m user/attilio/vmcontention/sys/dev/mge/if_mge.c user/attilio/vmcontention/sys/dev/mge/if_mgevar.h user/attilio/vmcontention/sys/dev/mpt/mpt_pci.c user/attilio/vmcontention/sys/dev/oce/oce_hw.c user/attilio/vmcontention/sys/dev/pci/hostb_pci.c user/attilio/vmcontention/sys/dev/pci/pci.c user/attilio/vmcontention/sys/dev/pci/pci_if.m user/attilio/vmcontention/sys/dev/pci/pci_private.h user/attilio/vmcontention/sys/dev/pci/pcivar.h user/attilio/vmcontention/sys/dev/pci/vga_pci.c user/attilio/vmcontention/sys/dev/siba/siba_bwn.c user/attilio/vmcontention/sys/dev/tsec/if_tsec.c user/attilio/vmcontention/sys/dev/tsec/if_tsec.h user/attilio/vmcontention/sys/dev/tsec/if_tsec_fdt.c user/attilio/vmcontention/sys/dev/uart/uart_bus_pci.c user/attilio/vmcontention/sys/dev/usb/controller/dwc_otg.c user/attilio/vmcontention/sys/dev/usb/controller/dwc_otg.h user/attilio/vmcontention/sys/dev/usb/controller/dwc_otg_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/usb_controller.c user/attilio/vmcontention/sys/dev/usb/storage/umass.c user/attilio/vmcontention/sys/dev/virtio/pci/virtio_pci.c user/attilio/vmcontention/sys/fs/cd9660/cd9660_vfsops.c user/attilio/vmcontention/sys/fs/cd9660/cd9660_vnops.c user/attilio/vmcontention/sys/fs/fifofs/fifo.h user/attilio/vmcontention/sys/fs/fifofs/fifo_vnops.c user/attilio/vmcontention/sys/fs/hpfs/hpfs_vfsops.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_vfsops.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clrpcops.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvnops.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c user/attilio/vmcontention/sys/fs/ntfs/ntfs_vfsops.c user/attilio/vmcontention/sys/fs/nullfs/null_subr.c user/attilio/vmcontention/sys/fs/pseudofs/pseudofs_vnops.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/i386/conf/DEFAULTS user/attilio/vmcontention/sys/i386/conf/GENERIC user/attilio/vmcontention/sys/i386/conf/GENERIC.hints user/attilio/vmcontention/sys/i386/conf/NOTES user/attilio/vmcontention/sys/i386/conf/XBOX user/attilio/vmcontention/sys/i386/include/float.h user/attilio/vmcontention/sys/i386/include/ptrace.h user/attilio/vmcontention/sys/i386/include/trap.h user/attilio/vmcontention/sys/ia64/conf/DEFAULTS user/attilio/vmcontention/sys/ia64/ia64/busdma_machdep.c user/attilio/vmcontention/sys/kern/kern_jail.c user/attilio/vmcontention/sys/kern/kern_lock.c user/attilio/vmcontention/sys/kern/kern_malloc.c user/attilio/vmcontention/sys/kern/kern_proc.c user/attilio/vmcontention/sys/kern/kern_racct.c user/attilio/vmcontention/sys/kern/kern_tc.c user/attilio/vmcontention/sys/kern/sched_ule.c user/attilio/vmcontention/sys/kern/sys_generic.c user/attilio/vmcontention/sys/kern/sys_pipe.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/kern/vfs_cache.c user/attilio/vmcontention/sys/mips/atheros/if_arge.c user/attilio/vmcontention/sys/mips/cavium/octeon_machdep.c user/attilio/vmcontention/sys/mips/cavium/octopci_bus_space.c user/attilio/vmcontention/sys/mips/conf/DEFAULTS user/attilio/vmcontention/sys/mips/conf/OCTEON1 user/attilio/vmcontention/sys/mips/include/asm.h user/attilio/vmcontention/sys/mips/include/cpu.h user/attilio/vmcontention/sys/mips/include/cpuregs.h user/attilio/vmcontention/sys/mips/include/elf.h user/attilio/vmcontention/sys/mips/include/locore.h user/attilio/vmcontention/sys/mips/include/md_var.h user/attilio/vmcontention/sys/mips/include/param.h user/attilio/vmcontention/sys/mips/include/proc.h user/attilio/vmcontention/sys/mips/include/reg.h user/attilio/vmcontention/sys/mips/include/sigframe.h user/attilio/vmcontention/sys/mips/include/ucontext.h user/attilio/vmcontention/sys/mips/include/vmparam.h user/attilio/vmcontention/sys/mips/mips/bus_space_generic.c user/attilio/vmcontention/sys/mips/mips/busdma_machdep.c user/attilio/vmcontention/sys/mips/mips/cpu.c user/attilio/vmcontention/sys/mips/mips/exception.S user/attilio/vmcontention/sys/mips/mips/genassym.c user/attilio/vmcontention/sys/mips/mips/locore.S user/attilio/vmcontention/sys/mips/mips/machdep.c user/attilio/vmcontention/sys/mips/mips/mpboot.S user/attilio/vmcontention/sys/mips/mips/pm_machdep.c user/attilio/vmcontention/sys/mips/mips/support.S user/attilio/vmcontention/sys/mips/mips/swtch.S user/attilio/vmcontention/sys/mips/mips/trap.c user/attilio/vmcontention/sys/mips/mips/vm_machdep.c user/attilio/vmcontention/sys/mips/sibyte/sb_machdep.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/modules/dtrace/dtrace/Makefile user/attilio/vmcontention/sys/modules/sound/driver/Makefile user/attilio/vmcontention/sys/modules/usb/Makefile user/attilio/vmcontention/sys/net/bpf.c user/attilio/vmcontention/sys/net/ieee8023ad_lacp.c user/attilio/vmcontention/sys/net/if_ethersubr.c user/attilio/vmcontention/sys/net/if_lagg.c user/attilio/vmcontention/sys/net/if_lagg.h user/attilio/vmcontention/sys/net80211/ieee80211.h user/attilio/vmcontention/sys/net80211/ieee80211_action.c user/attilio/vmcontention/sys/net80211/ieee80211_alq.c user/attilio/vmcontention/sys/net80211/ieee80211_alq.h user/attilio/vmcontention/sys/net80211/ieee80211_hwmp.c user/attilio/vmcontention/sys/net80211/ieee80211_input.c user/attilio/vmcontention/sys/net80211/ieee80211_mesh.c user/attilio/vmcontention/sys/net80211/ieee80211_mesh.h user/attilio/vmcontention/sys/net80211/ieee80211_output.c user/attilio/vmcontention/sys/net80211/ieee80211_scan.c user/attilio/vmcontention/sys/netinet/icmp6.h user/attilio/vmcontention/sys/netinet/ip_mroute.c user/attilio/vmcontention/sys/netinet6/ip6_input.c user/attilio/vmcontention/sys/netinet6/nd6.c user/attilio/vmcontention/sys/nfsclient/nfs_bio.c user/attilio/vmcontention/sys/nfsclient/nfs_vnops.c user/attilio/vmcontention/sys/pc98/conf/DEFAULTS user/attilio/vmcontention/sys/pc98/include/float.h user/attilio/vmcontention/sys/pc98/include/ptrace.h user/attilio/vmcontention/sys/pc98/include/trap.h user/attilio/vmcontention/sys/powerpc/conf/DEFAULTS user/attilio/vmcontention/sys/powerpc/include/asm.h user/attilio/vmcontention/sys/powerpc/ofw/ofw_pcibus.c user/attilio/vmcontention/sys/powerpc/powermac/smu.c user/attilio/vmcontention/sys/powerpc/powerpc/busdma_machdep.c user/attilio/vmcontention/sys/powerpc/powerpc/iommu_if.m user/attilio/vmcontention/sys/powerpc/ps3/ps3bus.c user/attilio/vmcontention/sys/sparc64/conf/DEFAULTS user/attilio/vmcontention/sys/sparc64/include/bus_dma.h user/attilio/vmcontention/sys/sparc64/pci/ofw_pcibus.c user/attilio/vmcontention/sys/sparc64/sparc64/bus_machdep.c user/attilio/vmcontention/sys/sys/buf.h user/attilio/vmcontention/sys/sys/bus_dma.h user/attilio/vmcontention/sys/sys/cdefs.h user/attilio/vmcontention/sys/sys/malloc.h user/attilio/vmcontention/sys/sys/pipe.h user/attilio/vmcontention/sys/sys/pmc.h user/attilio/vmcontention/sys/sys/racct.h user/attilio/vmcontention/sys/sys/sysctl.h user/attilio/vmcontention/sys/sys/vnode.h user/attilio/vmcontention/sys/ufs/ffs/ffs_extern.h user/attilio/vmcontention/sys/ufs/ffs/ffs_inode.c user/attilio/vmcontention/sys/ufs/ffs/ffs_snapshot.c user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c user/attilio/vmcontention/sys/ufs/ffs/ffs_vnops.c user/attilio/vmcontention/sys/ufs/ufs/inode.h user/attilio/vmcontention/sys/ufs/ufs/ufs_vnops.c user/attilio/vmcontention/sys/vm/vm_mmap.c user/attilio/vmcontention/sys/x86/include/_stdint.h user/attilio/vmcontention/sys/x86/x86/busdma_machdep.c user/attilio/vmcontention/tools/test/netfibs/initiator.sh user/attilio/vmcontention/usr.bin/calendar/calendars/calendar.freebsd user/attilio/vmcontention/usr.bin/indent/indent.1 user/attilio/vmcontention/usr.bin/rctl/rctl.8 user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/auto user/attilio/vmcontention/usr.sbin/ctladm/Makefile user/attilio/vmcontention/usr.sbin/ctladm/ctladm.8 user/attilio/vmcontention/usr.sbin/ctladm/ctladm.c user/attilio/vmcontention/usr.sbin/jls/jls.c user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh user/attilio/vmcontention/usr.sbin/pkg_install/add/main.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/Makefile.inc1 Wed Mar 7 11:18:38 2012 (r232653) @@ -1108,7 +1108,7 @@ _aicasm= sys/modules/aic7xxx/aicasm _share= share/syscons/scrnmaps .endif -.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") +.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no" _gcc_tools= gnu/usr.bin/cc/cc_tools .endif @@ -1175,7 +1175,7 @@ _clang= usr.bin/clang _clang_libs= lib/clang .endif -.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") +.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no" _cc= gnu/usr.bin/cc .endif Modified: user/attilio/vmcontention/UPDATING ============================================================================== --- user/attilio/vmcontention/UPDATING Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/UPDATING Wed Mar 7 11:18:38 2012 (r232653) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20120306: + Disable by default the option VFS_ALLOW_NONMPSAFE for all supported + platforms. + 20120229: Now unix domain sockets behave "as expected" on nullfs(5). Previously nullfs(5) did not pass through all behaviours to the underlying layer, Modified: user/attilio/vmcontention/bin/df/df.1 ============================================================================== --- user/attilio/vmcontention/bin/df/df.1 Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/bin/df/df.1 Wed Mar 7 11:18:38 2012 (r232653) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd October 18, 2011 +.Dd March 3, 2012 .Dt DF 1 .Os .Sh NAME @@ -158,7 +158,9 @@ is set, the block counts will be display .El .Sh SEE ALSO .Xr lsvfs 1 , +.Xr pstat 1 , .Xr quota 1 , +.Xr swapinfo 1 , .Xr fstatfs 2 , .Xr getfsstat 2 , .Xr statfs 2 , Modified: user/attilio/vmcontention/etc/mtree/BSD.include.dist ============================================================================== --- user/attilio/vmcontention/etc/mtree/BSD.include.dist Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/etc/mtree/BSD.include.dist Wed Mar 7 11:18:38 2012 (r232653) @@ -329,4 +329,6 @@ .. vm .. + xlocale + .. .. Modified: user/attilio/vmcontention/etc/rc.d/routing ============================================================================== --- user/attilio/vmcontention/etc/rc.d/routing Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/etc/rc.d/routing Wed Mar 7 11:18:38 2012 (r232653) @@ -147,14 +147,21 @@ static_inet6() : ${fibs:=1} # disallow "internal" addresses to appear on the wire - i=0 - while test ${i} -lt ${fibs}; do - setfib -F ${i} route ${_action} \ - -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject - setfib -F ${i} route ${_action} \ - -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject - i=$((i + 1)) - done + route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject + route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject + i=1 + if test ${i} -lt ${fibs}; then + printf "Also installing reject routes for FIBs" + while test ${i} -lt ${fibs}; do + setfib -F ${i} route -q ${_action} \ + -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject + setfib -F ${i} route -q ${_action} \ + -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject + printf " %d" ${i} + i=$((i + 1)) + done + printf "\n" + fi case ${ipv6_defaultrouter} in [Nn][Oo] | '') @@ -226,14 +233,21 @@ static_inet6() # for the host case, you will allow to omit the identifiers. # Under this configuration, the packets will go to the default # interface. - i=0 - while test ${i} -lt ${fibs}; do - setfib -F ${i} route ${_action} \ - -inet6 fe80:: -prefixlen 10 ::1 -reject - setfib -F ${i} route ${_action} \ - -inet6 ff02:: -prefixlen 16 ::1 -reject - i=$((i + 1)) - done + route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject + route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject + i=1 + if test ${i} -lt ${fibs}; then + printf "Also installing reject routes for FIBs" + while test ${i} -lt ${fibs}; do + setfib -F ${i} route -q ${_action} \ + -inet6 fe80:: -prefixlen 10 ::1 -reject + setfib -F ${i} route -q ${_action} \ + -inet6 ff02:: -prefixlen 16 ::1 -reject + printf " %d" ${i} + i=$((i + 1)) + done + printf "\n" + fi case ${ipv6_default_interface} in '') Modified: user/attilio/vmcontention/include/Makefile ============================================================================== --- user/attilio/vmcontention/include/Makefile Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/Makefile Wed Mar 7 11:18:38 2012 (r232653) @@ -6,7 +6,7 @@ .include <bsd.own.mk> CLEANFILES= osreldate.h version vers.c -SUBDIR= arpa gssapi protocols rpcsvc rpc +SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ @@ -24,7 +24,7 @@ INCS= a.out.h ar.h assert.h bitstring.h strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h vis.h \ - wchar.h wctype.h wordexp.h xlocale.h _xlocale_ctype.h + wchar.h wctype.h wordexp.h xlocale.h MHDRS= float.h floatingpoint.h stdarg.h Modified: user/attilio/vmcontention/include/ctype.h ============================================================================== --- user/attilio/vmcontention/include/ctype.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/ctype.h Wed Mar 7 11:18:38 2012 (r232653) @@ -78,6 +78,10 @@ int isphonogram(int); int isrune(int); int isspecial(int); #endif + +#if __POSIX_VISIBLE >= 200809 +#include <xlocale/_ctype.h> +#endif __END_DECLS #ifndef __cplusplus Modified: user/attilio/vmcontention/include/langinfo.h ============================================================================== --- user/attilio/vmcontention/include/langinfo.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/langinfo.h Wed Mar 7 11:18:38 2012 (r232653) @@ -130,6 +130,10 @@ typedef __nl_item nl_item; __BEGIN_DECLS char *nl_langinfo(nl_item); + +#if __POSIX_VISIBLE >= 200809 +#include <xlocale/_langinfo.h> +#endif __END_DECLS #endif /* !_LANGINFO_H_ */ Modified: user/attilio/vmcontention/include/locale.h ============================================================================== --- user/attilio/vmcontention/include/locale.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/locale.h Wed Mar 7 11:18:38 2012 (r232653) @@ -77,54 +77,11 @@ struct lconv { __BEGIN_DECLS struct lconv *localeconv(void); char *setlocale(int, const char *); -__END_DECLS #if __POSIX_VISIBLE >= 200809 - -#define LC_COLLATE_MASK (1<<0) -#define LC_CTYPE_MASK (1<<1) -#define LC_MESSAGES_MASK (1<<2) -#define LC_MONETARY_MASK (1<<3) -#define LC_NUMERIC_MASK (1<<4) -#define LC_TIME_MASK (1<<5) -#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \ - LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) - -#define LC_GLOBAL_LOCALE ((locale_t)-1) - -__BEGIN_DECLS - -typedef struct _xlocale *locale_t; -/** - * Creates a new locale. - */ -locale_t newlocale(int mask, const char *locale, locale_t base); - -/** - * Returns an identical duplicate of the passed locale. The returned locale - * must be freed with freelocale(). The returned locale will share components - * with the original. - */ -locale_t duplocale(locale_t base); -/* - * Free a locale_t. This is quite a poorly named function. It actually - * disclaims a reference to a locale_t, rather than freeing it. - */ -int freelocale(locale_t loc); - -/* - * Returns the name of the locale for a particular component of a locale_t. - */ -const char *querylocale(int mask, locale_t loc); - -/* - * Installs the specified locale_t as this thread's locale. - */ -locale_t uselocale(locale_t loc); - +#include <xlocale/_locale.h> +#endif __END_DECLS -#endif /* __POSIX_VISIBLE >= 200809 */ - #endif /* _LOCALE_H_ */ Modified: user/attilio/vmcontention/include/runetype.h ============================================================================== --- user/attilio/vmcontention/include/runetype.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/runetype.h Wed Mar 7 11:18:38 2012 (r232653) @@ -85,11 +85,21 @@ typedef struct { #define _RUNE_MAGIC_1 "RuneMagi" /* Indicates version 0 of RuneLocale */ __BEGIN_DECLS extern const _RuneLocale _DefaultRuneLocale; -__attribute__((deprecated)) -extern _RuneLocale *_CurrentRuneLocale; -/* TODO: This is called quite a lot, so we should use a __thread variable when - * it's available. */ -extern _RuneLocale *__getCurrentRuneLocale(void); +extern const _RuneLocale *_CurrentRuneLocale; +#if defined(__NO_TLS) || defined(__RUNETYPE_INTERNAL) +extern const _RuneLocale *__getCurrentRuneLocale(void); +#else +extern _Thread_local const _RuneLocale *_ThreadRuneLocale; +static __inline const _RuneLocale *__getCurrentRuneLocale(void) +{ + + if (_ThreadRuneLocale) + return _ThreadRuneLocale; + if (_CurrentRuneLocale) + return _CurrentRuneLocale; + return &_DefaultRuneLocale; +} +#endif /* __NO_TLS || __RUNETYPE_INTERNAL */ #define _CurrentRuneLocale (__getCurrentRuneLocale()) __END_DECLS Modified: user/attilio/vmcontention/include/string.h ============================================================================== --- user/attilio/vmcontention/include/string.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/string.h Wed Mar 7 11:18:38 2012 (r232653) @@ -132,6 +132,10 @@ void swab(const void * __restrict, void #endif /* _SWAB_DECLARED */ #endif /* __BSD_VISIBLE */ + +#if __POSIX_VISIBLE >= 200809 +#include <xlocale/_string.h> +#endif __END_DECLS #endif /* _STRING_H_ */ Modified: user/attilio/vmcontention/include/time.h ============================================================================== --- user/attilio/vmcontention/include/time.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/time.h Wed Mar 7 11:18:38 2012 (r232653) @@ -183,6 +183,10 @@ void tzsetwall(void); time_t timelocal(struct tm * const); time_t timegm(struct tm * const); #endif /* __BSD_VISIBLE */ + +#if __POSIX_VISIBLE >= 200809 +#include <xlocale/_time.h> +#endif __END_DECLS #endif /* !_TIME_H_ */ Modified: user/attilio/vmcontention/include/wchar.h ============================================================================== --- user/attilio/vmcontention/include/wchar.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/wchar.h Wed Mar 7 11:18:38 2012 (r232653) @@ -224,6 +224,10 @@ wchar_t *fgetwln(FILE * __restrict, size size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif + +#if __POSIX_VISIBLE >= 200809 +#include <xlocale/_wchar.h> +#endif __END_DECLS #endif /* !_WCHAR_H_ */ Modified: user/attilio/vmcontention/include/wctype.h ============================================================================== --- user/attilio/vmcontention/include/wctype.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/wctype.h Wed Mar 7 11:18:38 2012 (r232653) @@ -87,6 +87,11 @@ wint_t iswrune(wint_t); wint_t iswspecial(wint_t); wint_t nextwctype(wint_t, wctype_t); #endif + +#if __POSIX_VISIBLE >= 200809 +#define _XLOCALE_WCTYPES 1 +#include <xlocale/_ctype.h> +#endif /* __POSIX_VISIBLE >= 200809 */ __END_DECLS #ifndef __cplusplus Modified: user/attilio/vmcontention/include/xlocale.h ============================================================================== --- user/attilio/vmcontention/include/xlocale.h Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/include/xlocale.h Wed Mar 7 11:18:38 2012 (r232653) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 The FreeBSD Foundation + * Copyright (c) 2011, 2012 The FreeBSD Foundation * All rights reserved. * * This software was developed by David Chisnall under sponsorship from @@ -8,16 +8,16 @@ * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -33,225 +33,52 @@ #define _XLOCALE_H_ #include <locale.h> - __BEGIN_DECLS +#include <xlocale/_locale.h> -/* - * Extended locale versions of the locale-aware functions from string.h. - * - * Include <string.h> before <xlocale.h> to expose these. - */ #ifdef _STRING_H_ -int strcoll_l(const char *, const char *, locale_t); -size_t strxfrm_l(char *, const char *, size_t, locale_t); -int strcasecmp_l(const char *, const char *, locale_t); -char *strcasestr_l(const char *, const char *, locale_t); -int strncasecmp_l(const char *, const char *, size_t, locale_t); +#include <xlocale/_string.h> #endif -/* - * Extended locale versions of the locale-aware functions from inttypes.h. - * - * Include <inttypes.h> before <xlocale.h> to expose these. - */ + #ifdef _INTTYPES_H_ -intmax_t -strtoimax_l(const char * __restrict, char ** __restrict, int, locale_t); -uintmax_t -strtoumax_l(const char * __restrict, char ** __restrict, int, locale_t); -intmax_t -wcstoimax_l(const wchar_t * __restrict, wchar_t ** __restrict, int , locale_t); -uintmax_t -wcstoumax_l(const wchar_t * __restrict, wchar_t ** __restrict, int, locale_t); +#include <xlocale/_inttypes.h> #endif -/* - * Extended locale versions of the locale-aware functions from monetary.h. - * - * Include <monetary.h> before <xlocale.h> to expose these. - */ + #ifdef _MONETARY_H_ -ssize_t strfmon_l(char *, size_t, locale_t, const char *, ...) -# if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7 - __attribute__((__format__ (__strfmon__, 4, 5))) -# endif - ; +#include <xlocale/_monetary.h> #endif -/* - * Extended locale versions of the locale-aware functions from stdlib.h. - * - * Include <stdlib.h> before <xlocale.h> to expose these. - */ #ifdef _STDLIB_H_ -double atof_l(const char *, locale_t); -int atoi_l(const char *, locale_t); -long atol_l(const char *, locale_t); -long long atoll_l(const char *, locale_t); -int mblen_l(const char *, size_t, locale_t); -size_t -mbstowcs_l(wchar_t * __restrict, const char * __restrict, size_t, locale_t); -int -mbtowc_l(wchar_t * __restrict, const char * __restrict, size_t, locale_t); -double strtod_l(const char *, char **, locale_t); -float strtof_l(const char *, char **, locale_t); -long strtol_l(const char *, char **, int, locale_t); -long double strtold_l(const char *, char **, locale_t); -long long strtoll_l(const char *, char **, int, locale_t); -unsigned long strtoul_l(const char *, char **, int, locale_t); -unsigned long long strtoull_l(const char *, char **, int, locale_t); -size_t -wcstombs_l(char * __restrict, const wchar_t * __restrict, size_t, locale_t); -int wctomb_l(char *, wchar_t, locale_t); - -int ___mb_cur_max_l(locale_t); -#define MB_CUR_MAX_L(x) (___mb_cur_max_l(x)) - +#include <xlocale/_stdlib.h> #endif -/* - * Extended locale versions of the locale-aware functions from time.h. - * - * Include <time.h> before <xlocale.h> to expose these. - */ + #ifdef _TIME_H_ -size_t -strftime_l(char * __restrict, size_t, const char * __restrict, const - struct tm * __restrict, locale_t) -# if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7 - __attribute__((__format__ (__strftime__, 3, 0))) -# endif - ; -char * -strptime_l(const char * __restrict, const char * __restrict, - struct tm * __restrict, locale_t); +#include <xlocale/_time.h> #endif + #ifdef _LANGINFO_H_ -char *nl_langinfo_l(nl_item, locale_t); +#include <xlocale/_langinfo.h> #endif + #ifdef _CTYPE_H_ -#include <_xlocale_ctype.h> +#include <xlocale/_ctype.h> #endif + #ifdef _WCTYPE_H_ -#define XLOCALE_WCTYPES 1 -#include <_xlocale_ctype.h> +#define _XLOCALE_WCTYPES 1 +#include <xlocale/_ctype.h> #endif #ifdef _STDIO_H_ -int fprintf_l(FILE * __restrict, locale_t, const char * __restrict, ...) - __printflike(3, 4); -int fscanf_l(FILE * __restrict, locale_t, const char * __restrict, ...) - __scanflike(3, 4); -int printf_l(locale_t, const char * __restrict, ...) __printflike(2, 3); -int scanf_l(locale_t, const char * __restrict, ...) __scanflike(2, 3); -int sprintf_l(char * __restrict, locale_t, const char * __restrict, ...) - __printflike(3, 4); -int sscanf_l(const char * __restrict, locale_t, const char * __restrict, ...) - __scanflike(3, 4); -int vfprintf_l(FILE * __restrict, locale_t, const char * __restrict, __va_list) - __printflike(3, 0); -int vprintf_l(locale_t, const char * __restrict, __va_list) __printflike(2, 0); -int vsprintf_l(char * __restrict, locale_t, const char * __restrict, __va_list) - __printflike(3, 0); - -int snprintf_l(char * __restrict, size_t, locale_t, const char * __restrict, - ...) __printflike(4, 5); -int vfscanf_l(FILE * __restrict, locale_t, const char * __restrict, __va_list) - __scanflike(3, 0); -int vscanf_l(locale_t, const char * __restrict, __va_list) __scanflike(2, 0); -int vsnprintf_l(char * __restrict, size_t, locale_t, const char * __restrict, - __va_list) __printflike(4, 0); -int vsscanf_l(const char * __restrict, locale_t, const char * __restrict, - __va_list) __scanflike(3, 0); -int dprintf_l(int, locale_t, const char * __restrict, ...) __printflike(3, 4); -int vdprintf_l(int, locale_t, const char * __restrict, __va_list) - __printflike(3, 0); -int asprintf_l(char **, locale_t, const char *, ...) __printflike(3, 4); -int vasprintf_l(char **, locale_t, const char *, __va_list) __printflike(3, 0); +#include <xlocale/_stdio.h> #endif -#ifdef _WCHAR_H_ -wint_t btowc_l(int, locale_t); -wint_t fgetwc_l(FILE *, locale_t); -wchar_t * -fgetws_l(wchar_t * __restrict, int, FILE * __restrict, locale_t); -wint_t fputwc_l(wchar_t, FILE *, locale_t); -int -fputws_l(const wchar_t * __restrict, FILE * __restrict, locale_t); -int -fwprintf_l(FILE * __restrict, locale_t, const wchar_t * __restrict, - ...); -int -fwscanf_l(FILE * __restrict, locale_t, const wchar_t * __restrict, ...); -wint_t getwc_l(FILE *, locale_t); -wint_t getwchar_l(locale_t); -size_t -mbrlen_l(const char * __restrict, size_t, mbstate_t * __restrict, locale_t); -size_t -mbrtowc_l(wchar_t * __restrict, const char * __restrict, size_t, - mbstate_t * __restrict, locale_t); -int mbsinit_l(const mbstate_t *, locale_t); -size_t -mbsrtowcs_l(wchar_t * __restrict, const char ** __restrict, size_t, - mbstate_t * __restrict, locale_t); -wint_t putwc_l(wchar_t, FILE *, locale_t); -wint_t putwchar_l(wchar_t, locale_t); -int -swprintf_l(wchar_t * __restrict, size_t n, locale_t, - const wchar_t * __restrict, ...); -int -swscanf_l(const wchar_t * __restrict, locale_t, const wchar_t * __restrict, - ...); -wint_t ungetwc_l(wint_t, FILE *, locale_t); -int -vfwprintf_l(FILE * __restrict, locale_t, const wchar_t * __restrict, - __va_list); -int -vswprintf_l(wchar_t * __restrict, size_t n, locale_t, - const wchar_t * __restrict, __va_list); -int vwprintf_l(locale_t, const wchar_t * __restrict, __va_list); -size_t -wcrtomb_l(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t); -int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); -size_t -wcsftime_l(wchar_t * __restrict, size_t, const wchar_t * __restrict, - const struct tm * __restrict, locale_t); -size_t -wcsrtombs_l(char * __restrict, const wchar_t ** __restrict, size_t, - mbstate_t * __restrict, locale_t); -double wcstod_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t); -long -wcstol_l(const wchar_t * __restrict, wchar_t ** __restrict, int, locale_t); -unsigned long -wcstoul_l(const wchar_t * __restrict, wchar_t ** __restrict, int, locale_t); -int wcswidth_l(const wchar_t *, size_t, locale_t); -size_t -wcsxfrm_l(wchar_t * __restrict, const wchar_t * __restrict, size_t, locale_t); -int wctob_l(wint_t, locale_t); -int wcwidth_l(wchar_t, locale_t); -int wprintf_l(locale_t, const wchar_t * __restrict, ...); -int wscanf_l(locale_t, const wchar_t * __restrict, ...); - -int -vfwscanf_l(FILE * __restrict, locale_t, const wchar_t * __restrict, - __va_list); -int vswscanf_l(const wchar_t * __restrict, locale_t, -const wchar_t *__restrict, __va_list); -int vwscanf_l(locale_t, const wchar_t * __restrict, __va_list); -float wcstof_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t); -long double -wcstold_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t); -long long -wcstoll_l(const wchar_t * __restrict, wchar_t ** __restrict, int, locale_t); -unsigned long long -wcstoull_l(const wchar_t * __restrict, wchar_t ** __restrict, int, locale_t); -size_t -mbsnrtowcs_l(wchar_t * __restrict, const char ** __restrict, size_t, size_t, - mbstate_t * __restrict, locale_t); -int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t); -int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t); -size_t -wcsnrtombs_l(char * __restrict, const wchar_t ** __restrict, size_t, size_t, - mbstate_t * __restrict, locale_t); +#ifdef _WCHAR_H_ +#include <xlocale/_wchar.h> #endif + + struct lconv *localeconv_l(locale_t); __END_DECLS Modified: user/attilio/vmcontention/lib/csu/mips/crt1.c ============================================================================== --- user/attilio/vmcontention/lib/csu/mips/crt1.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/csu/mips/crt1.c Wed Mar 7 11:18:38 2012 (r232653) @@ -47,10 +47,8 @@ __FBSDID("$FreeBSD$"); struct Struct_Obj_Entry; struct ps_strings; -#ifndef NOSHARED extern int _DYNAMIC; #pragma weak _DYNAMIC -#endif extern void _init(void); extern void _fini(void); @@ -91,10 +89,11 @@ __start(char **ap, __progname = s + 1; } -#ifndef NOSHARED if (&_DYNAMIC != NULL) atexit(cleanup); -#endif + else + _init_tls(); + #ifdef GCRT atexit(_mcleanup); #endif @@ -102,9 +101,7 @@ __start(char **ap, #ifdef GCRT monstartup(&eprol, &etext); #endif -#ifndef NOGPREL _init(); -#endif exit( main(argc, argv, env) ); } Modified: user/attilio/vmcontention/lib/libc/arm/Symbol.map ============================================================================== --- user/attilio/vmcontention/lib/libc/arm/Symbol.map Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/arm/Symbol.map Wed Mar 7 11:18:38 2012 (r232653) @@ -40,6 +40,7 @@ FBSDprivate_1.0 { __sys_exit; _set_tp; + __aeabi_read_tp; ___longjmp; __umodsi3; __modsi3; Modified: user/attilio/vmcontention/lib/libc/gen/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/Makefile.inc Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/gen/Makefile.inc Wed Mar 7 11:18:38 2012 (r232653) @@ -54,7 +54,7 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \ - dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ + dl_iterate_phdr.3 dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ err.3 exec.3 \ feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ ftok.3 fts.3 ftw.3 \ Modified: user/attilio/vmcontention/lib/libc/gen/closedir.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/closedir.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/gen/closedir.c Wed Mar 7 11:18:38 2012 (r232653) @@ -48,14 +48,12 @@ __FBSDID("$FreeBSD$"); * close a directory. */ int -closedir(dirp) - DIR *dirp; +closedir(DIR *dirp) { int fd; if (__isthreaded) _pthread_mutex_lock(&dirp->dd_lock); - _seekdir(dirp, dirp->dd_rewind); /* free seekdir storage */ fd = dirp->dd_fd; dirp->dd_fd = -1; dirp->dd_loc = 0; Modified: user/attilio/vmcontention/lib/libc/gen/opendir.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/opendir.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/gen/opendir.c Wed Mar 7 11:18:38 2012 (r232653) @@ -66,7 +66,17 @@ opendir(const char *name) DIR * fdopendir(int fd) { + struct stat statb; + /* Check that fd is associated with a directory. */ + if (_fstat(fd, &statb) != 0) + return (NULL); + if (!S_ISDIR(statb.st_mode)) { + errno = ENOTDIR; + return (NULL); + } + if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) + return (NULL); return (__opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP)); } @@ -74,21 +84,11 @@ DIR * __opendir2(const char *name, int flags) { int fd; - struct stat statb; DIR *dir; int saved_errno; - /* - * stat() before _open() because opening of special files may be - * harmful. - */ - if (stat(name, &statb) != 0) - return (NULL); - if (!S_ISDIR(statb.st_mode)) { - errno = ENOTDIR; - return (NULL); - } - if ((fd = _open(name, O_RDONLY | O_NONBLOCK | O_DIRECTORY)) == -1) + if ((fd = _open(name, + O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC)) == -1) return (NULL); dir = __opendir_common(fd, name, flags); @@ -119,19 +119,9 @@ __opendir_common(int fd, const char *nam int saved_errno; int unionstack; int fd2; - struct stat statb; - dirp = NULL; - /* _fstat() the open handler because the file may have changed. */ - if (_fstat(fd, &statb) != 0) - goto fail; - if (!S_ISDIR(statb.st_mode)) { - errno = ENOTDIR; - goto fail; - } - if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1 || - (dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL) - goto fail; + if ((dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL) + return (NULL); dirp->dd_td = (struct _telldir *)((char *)dirp + sizeof(DIR)); LIST_INIT(&dirp->dd_td->td_locq); Modified: user/attilio/vmcontention/lib/libc/gen/tls.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/tls.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/gen/tls.c Wed Mar 7 11:18:38 2012 (r232653) @@ -66,11 +66,11 @@ void __libc_free_tls(void *tls, size_t t #error TLS_TCB_ALIGN undefined for target architecture #endif -#if defined(__ia64__) || defined(__powerpc__) +#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || \ + defined(__powerpc__) #define TLS_VARIANT_I #endif -#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) || defined(__mips__) +#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) #define TLS_VARIANT_II #endif @@ -308,6 +308,13 @@ _init_tls() } } +#ifdef TLS_VARIANT_I + /* + * tls_static_space should include space for TLS structure + */ + tls_static_space += TLS_TCB_SIZE; +#endif + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _set_tp(tls); Modified: user/attilio/vmcontention/lib/libc/locale/Symbol.map ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/Symbol.map Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/Symbol.map Wed Mar 7 11:18:38 2012 (r232653) @@ -194,6 +194,7 @@ FBSD_1.3 { wcstoull_l; wcstoumax_l; __runes_for_locale; + _ThreadRuneLocale; }; FBSDprivate_1.0 { Modified: user/attilio/vmcontention/lib/libc/locale/collate.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/collate.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/collate.c Wed Mar 7 11:18:38 2012 (r232653) @@ -8,11 +8,6 @@ * Portions of this software were developed by David Chisnall * under sponsorship from the FreeBSD Foundation. * - * Copyright (c) 2011 The FreeBSD Foundation - * All rights reserved. - * Portions of this software were developed by David Chisnall - * under sponsorship from the FreeBSD Foundation. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: Modified: user/attilio/vmcontention/lib/libc/locale/nomacros.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/nomacros.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/nomacros.c Wed Mar 7 11:18:38 2012 (r232653) @@ -9,4 +9,10 @@ __FBSDID("$FreeBSD$"); */ #define _EXTERNALIZE_CTYPE_INLINES_ +/* + * Also make sure <runetype.h> does not generate an inline definition + * of __getCurrentRuneLocale(). + */ +#define __RUNETYPE_INTERNAL + #include <ctype.h> Modified: user/attilio/vmcontention/lib/libc/locale/setrunelocale.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/setrunelocale.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/setrunelocale.c Wed Mar 7 11:18:38 2012 (r232653) @@ -38,6 +38,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#define __RUNETYPE_INTERNAL 1 + #include <runetype.h> #include <errno.h> #include <limits.h> @@ -50,6 +52,15 @@ __FBSDID("$FreeBSD$"); #include "mblocal.h" #include "setlocale.h" +#undef _CurrentRuneLocale +extern _RuneLocale const *_CurrentRuneLocale; +#ifndef __NO_TLS +/* + * A cached version of the runes for this thread. Used by ctype.h + */ +_Thread_local const _RuneLocale *_ThreadRuneLocale; +#endif + extern int __mb_sb_limit; extern _RuneLocale *_Read_RuneMagi(FILE *); @@ -72,7 +83,8 @@ static void destruct_ctype(void *v) free(l->runes); free(l); } -_RuneLocale *__getCurrentRuneLocale(void) + +const _RuneLocale *__getCurrentRuneLocale(void) { return XLOCALE_CTYPE(__get_locale())->runes; } @@ -168,9 +180,24 @@ __wrap_setrunelocale(const char *locale) } __mb_cur_max = __xlocale_global_ctype.__mb_cur_max; __mb_sb_limit = __xlocale_global_ctype.__mb_sb_limit; + _CurrentRuneLocale = __xlocale_global_ctype.runes; return (_LDP_LOADED); } -void *__ctype_load(const char *locale, locale_t unused) + +#ifndef __NO_TLS +void +__set_thread_rune_locale(locale_t loc) { + + if (loc == NULL) { + _ThreadRuneLocale = &_DefaultRuneLocale; + } else { + _ThreadRuneLocale = XLOCALE_CTYPE(loc)->runes; + } +} +#endif + +void * +__ctype_load(const char *locale, locale_t unused) { struct xlocale_ctype *l = calloc(sizeof(struct xlocale_ctype), 1); l->header.header.destructor = destruct_ctype; Modified: user/attilio/vmcontention/lib/libc/locale/table.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/table.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/table.c Wed Mar 7 11:18:38 2012 (r232653) @@ -251,7 +251,7 @@ const _RuneLocale _DefaultRuneLocale = { }; #undef _CurrentRuneLocale -_RuneLocale *_CurrentRuneLocale = (_RuneLocale*)&_DefaultRuneLocale; +const _RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale; _RuneLocale * __runes_for_locale(locale_t locale, int *mb_sb_limit) Modified: user/attilio/vmcontention/lib/libc/locale/xlocale.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/xlocale.c Wed Mar 7 11:13:18 2012 (r232652) +++ user/attilio/vmcontention/lib/libc/locale/xlocale.c Wed Mar 7 11:18:38 2012 (r232653) @@ -6,17 +6,18 @@ * the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -31,6 +32,7 @@ #include <pthread.h> #include <stdio.h> #include <string.h> +#include <runetype.h> #include "libc_private.h" #include "xlocale_private.h" @@ -50,6 +52,17 @@ extern struct xlocale_component __xlocal */ extern struct xlocale_component __xlocale_C_collate; extern struct xlocale_component __xlocale_C_ctype; + +#ifndef __NO_TLS +/* + * The locale for this thread. + */ +_Thread_local locale_t __thread_locale; +#endif +/* + * Flag indicating that one or more per-thread locales exist. + */ +int __has_thread_locale; /* * Private functions in setlocale.c. */ @@ -103,6 +116,7 @@ static locale_t thread_local_locale; static void init_key(void) { + pthread_key_create(&locale_info_key, xlocale_release); pthread_setspecific(locale_info_key, (void*)42); if (pthread_getspecific(locale_info_key) == (void*)42) { @@ -110,6 +124,8 @@ static void init_key(void) } else { fake_tls = 1; } + /* At least one per-thread locale has now been set. */ + __has_thread_locale = 1; __detect_path_locale(); } @@ -118,12 +134,14 @@ static pthread_once_t once_control = PTH static locale_t get_thread_locale(void) { + _once(&once_control, init_key); return (fake_tls ? thread_local_locale : pthread_getspecific(locale_info_key)); } +#ifdef __NO_TLS locale_t __get_locale(void) { @@ -131,11 +149,13 @@ __get_locale(void) return (l ? l : &__xlocale_global_locale); } +#endif static void set_thread_locale(locale_t loc) { - pthread_once(&once_control, init_key); + + _once(&once_control, init_key); if (NULL != loc) { xlocale_retain((struct xlocale_refcounted*)loc); @@ -149,6 +169,10 @@ set_thread_locale(locale_t loc) } else { pthread_setspecific(locale_info_key, loc); } +#ifndef __NO_TLS + __thread_locale = loc; + __set_thread_rune_locale(loc); +#endif } /** @@ -159,6 +183,7 @@ static void destruct_locale(void *l) { locale_t loc = l; + for (int type=0 ; type<XLC_LAST ; type++) { if (loc->components[type]) { xlocale_release(loc->components[type]); @@ -177,6 +202,7 @@ static locale_t alloc_locale(void) { locale_t new = calloc(sizeof(struct _xlocale), 1); + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203071118.q27BIdF9090498>