Date: Sat, 26 Nov 2011 13:54:56 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r227993 - in user/attilio/vmcontention: . bin/ps bin/sh bin/test cddl/sbin/zfs cddl/sbin/zpool cddl/usr.bin/zstreamdump cddl/usr.sbin/zdb contrib/libc++ contrib/libcxxrt contrib/top etc... Message-ID: <201111261354.pAQDsuuJ093810@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Nov 26 13:54:55 2011 New Revision: 227993 URL: http://svn.freebsd.org/changeset/base/227993 Log: MFC Added: user/attilio/vmcontention/contrib/libc++/ - copied from r227992, head/contrib/libc++/ user/attilio/vmcontention/contrib/libcxxrt/ - copied from r227992, head/contrib/libcxxrt/ user/attilio/vmcontention/lib/libc++/ - copied from r227992, head/lib/libc++/ user/attilio/vmcontention/lib/libc/sys/ffclock.2 - copied unchanged from r227992, head/lib/libc/sys/ffclock.2 user/attilio/vmcontention/lib/libcxxrt/ - copied from r227992, head/lib/libcxxrt/ user/attilio/vmcontention/sbin/camcontrol/fwdownload.c - copied unchanged from r227992, head/sbin/camcontrol/fwdownload.c user/attilio/vmcontention/sys/mips/nlm/hal/nlm_hal.c - copied unchanged from r227992, head/sys/mips/nlm/hal/nlm_hal.c user/attilio/vmcontention/tools/regression/bin/sh/parameters/optind1.0 - copied unchanged from r227992, head/tools/regression/bin/sh/parameters/optind1.0 user/attilio/vmcontention/tools/tinder.sh - copied unchanged from r227992, head/tools/tinder.sh user/attilio/vmcontention/usr.bin/procstat/procstat_auxv.c - copied unchanged from r227992, head/usr.bin/procstat/procstat_auxv.c user/attilio/vmcontention/usr.bin/procstat/procstat_rlimit.c - copied unchanged from r227992, head/usr.bin/procstat/procstat_rlimit.c Deleted: user/attilio/vmcontention/gnu/lib/libodialog/ user/attilio/vmcontention/share/man/man4/amd.4 user/attilio/vmcontention/sys/dev/amd/ user/attilio/vmcontention/sys/modules/amd/ user/attilio/vmcontention/usr.sbin/sade/config.c user/attilio/vmcontention/usr.sbin/sade/dispatch.c Modified: user/attilio/vmcontention/Makefile user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/bin/ps/ps.1 user/attilio/vmcontention/bin/ps/ps.c user/attilio/vmcontention/bin/sh/options.c user/attilio/vmcontention/bin/test/test.c user/attilio/vmcontention/cddl/sbin/zfs/Makefile user/attilio/vmcontention/cddl/sbin/zpool/Makefile user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile user/attilio/vmcontention/etc/mtree/BSD.include.dist user/attilio/vmcontention/etc/rc.resume user/attilio/vmcontention/gnu/lib/Makefile user/attilio/vmcontention/gnu/usr.bin/dialog/Makefile user/attilio/vmcontention/lib/Makefile user/attilio/vmcontention/lib/clang/clang.build.mk user/attilio/vmcontention/lib/libc/gen/opendir.c user/attilio/vmcontention/lib/libc/locale/xlocale.c user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c user/attilio/vmcontention/lib/libc/string/strcasecmp.c user/attilio/vmcontention/lib/libc/string/strcmp.c user/attilio/vmcontention/lib/libc/string/strcoll.c user/attilio/vmcontention/lib/libc/string/strncmp.c user/attilio/vmcontention/lib/libc/sys/Makefile.inc user/attilio/vmcontention/lib/libc/sys/Symbol.map user/attilio/vmcontention/lib/libc/sys/getsockopt.2 user/attilio/vmcontention/lib/libkvm/kvm_getprocs.3 user/attilio/vmcontention/lib/libkvm/kvm_proc.c user/attilio/vmcontention/lib/libpam/Makefile.inc user/attilio/vmcontention/lib/libpam/modules/Makefile.inc user/attilio/vmcontention/lib/libpam/modules/pam_ssh/pam_ssh.c user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml user/attilio/vmcontention/release/picobsd/build/Makefile.conf user/attilio/vmcontention/release/picobsd/build/picobsd user/attilio/vmcontention/sbin/camcontrol/Makefile user/attilio/vmcontention/sbin/camcontrol/camcontrol.8 user/attilio/vmcontention/sbin/camcontrol/camcontrol.c user/attilio/vmcontention/sbin/camcontrol/camcontrol.h user/attilio/vmcontention/sbin/camcontrol/util.c user/attilio/vmcontention/sbin/geom/class/part/gpart.8 user/attilio/vmcontention/sbin/ipfw/nat.c user/attilio/vmcontention/share/examples/drivers/make_device_driver.sh user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/acpi_wmi.4 user/attilio/vmcontention/share/man/man9/driver.9 user/attilio/vmcontention/share/mk/bsd.lib.mk user/attilio/vmcontention/share/mk/bsd.libnames.mk user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/sys/amd64/amd64/legacy.c user/attilio/vmcontention/sys/amd64/linux32/linux32_proto.h user/attilio/vmcontention/sys/arm/econa/ehci_ebus.c user/attilio/vmcontention/sys/arm/econa/ohci_ec.c user/attilio/vmcontention/sys/arm/mv/mv_pci.c user/attilio/vmcontention/sys/arm/xscale/i80321/i80321_pci.c user/attilio/vmcontention/sys/arm/xscale/i8134x/i81342_pci.c user/attilio/vmcontention/sys/arm/xscale/ixp425/avila_ata.c user/attilio/vmcontention/sys/arm/xscale/ixp425/ixp425_pci.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/linprocfs/linprocfs.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/contrib/ipfilter/netinet/ip_compat.h user/attilio/vmcontention/sys/contrib/ipfilter/netinet/ip_proxy.c user/attilio/vmcontention/sys/dev/aac/aac_pci.c user/attilio/vmcontention/sys/dev/acpi_support/acpi_wmi.c user/attilio/vmcontention/sys/dev/acpica/acpi_battery.c user/attilio/vmcontention/sys/dev/acpica/acpi_cpu.c user/attilio/vmcontention/sys/dev/acpica/acpi_isab.c user/attilio/vmcontention/sys/dev/acpica/acpi_pcib_acpi.c user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/amr/amr_pci.c user/attilio/vmcontention/sys/dev/arcmsr/arcmsr.c user/attilio/vmcontention/sys/dev/ata/ata-disk.c user/attilio/vmcontention/sys/dev/ata/ata-pci.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_athioctl.h user/attilio/vmcontention/sys/dev/bce/if_bce.c user/attilio/vmcontention/sys/dev/bfe/if_bfe.c user/attilio/vmcontention/sys/dev/bge/if_bge.c user/attilio/vmcontention/sys/dev/bm/if_bm.c user/attilio/vmcontention/sys/dev/bwn/if_bwn.c user/attilio/vmcontention/sys/dev/bxe/if_bxe.c user/attilio/vmcontention/sys/dev/cas/if_cas.c user/attilio/vmcontention/sys/dev/cesa/cesa.c user/attilio/vmcontention/sys/dev/cxgb/cxgb_main.c user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c user/attilio/vmcontention/sys/dev/dc/dcphy.c user/attilio/vmcontention/sys/dev/dc/if_dc.c user/attilio/vmcontention/sys/dev/dc/pnphy.c user/attilio/vmcontention/sys/dev/eisa/eisaconf.c user/attilio/vmcontention/sys/dev/esp/esp_pci.c user/attilio/vmcontention/sys/dev/esp/esp_sbus.c user/attilio/vmcontention/sys/dev/et/if_et.c user/attilio/vmcontention/sys/dev/fb/fb.c user/attilio/vmcontention/sys/dev/firewire/firewire.c user/attilio/vmcontention/sys/dev/firewire/fwohci_pci.c user/attilio/vmcontention/sys/dev/gem/if_gem_pci.c user/attilio/vmcontention/sys/dev/gem/if_gem_sbus.c user/attilio/vmcontention/sys/dev/gpio/gpiobus.c user/attilio/vmcontention/sys/dev/hifn/hifn7751.c user/attilio/vmcontention/sys/dev/hme/if_hme_pci.c user/attilio/vmcontention/sys/dev/hme/if_hme_sbus.c user/attilio/vmcontention/sys/dev/hptiop/hptiop.c user/attilio/vmcontention/sys/dev/hptmv/entry.c user/attilio/vmcontention/sys/dev/hptrr/hptrr_osm_bsd.c user/attilio/vmcontention/sys/dev/ichsmb/ichsmb_pci.c user/attilio/vmcontention/sys/dev/ida/ida_pci.c user/attilio/vmcontention/sys/dev/if_ndis/if_ndis_usb.c user/attilio/vmcontention/sys/dev/iicbus/iicbus.c user/attilio/vmcontention/sys/dev/iicbus/iicsmb.c user/attilio/vmcontention/sys/dev/iwn/if_iwn.c user/attilio/vmcontention/sys/dev/iwn/if_iwnreg.h user/attilio/vmcontention/sys/dev/lge/if_lge.c user/attilio/vmcontention/sys/dev/mca/mca_bus.c user/attilio/vmcontention/sys/dev/mfi/mfi_pci.c user/attilio/vmcontention/sys/dev/mii/acphy.c user/attilio/vmcontention/sys/dev/mii/amphy.c user/attilio/vmcontention/sys/dev/mii/atphy.c user/attilio/vmcontention/sys/dev/mii/axphy.c user/attilio/vmcontention/sys/dev/mii/bmtphy.c user/attilio/vmcontention/sys/dev/mii/brgphy.c user/attilio/vmcontention/sys/dev/mii/ciphy.c user/attilio/vmcontention/sys/dev/mii/e1000phy.c user/attilio/vmcontention/sys/dev/mii/gentbi.c user/attilio/vmcontention/sys/dev/mii/icsphy.c user/attilio/vmcontention/sys/dev/mii/ip1000phy.c user/attilio/vmcontention/sys/dev/mii/jmphy.c user/attilio/vmcontention/sys/dev/mii/lxtphy.c user/attilio/vmcontention/sys/dev/mii/mii.c user/attilio/vmcontention/sys/dev/mii/miidevs user/attilio/vmcontention/sys/dev/mii/mlphy.c user/attilio/vmcontention/sys/dev/mii/nsgphy.c user/attilio/vmcontention/sys/dev/mii/nsphy.c user/attilio/vmcontention/sys/dev/mii/nsphyter.c user/attilio/vmcontention/sys/dev/mii/pnaphy.c user/attilio/vmcontention/sys/dev/mii/qsphy.c user/attilio/vmcontention/sys/dev/mii/rdcphy.c user/attilio/vmcontention/sys/dev/mii/rgephy.c user/attilio/vmcontention/sys/dev/mii/rlphy.c user/attilio/vmcontention/sys/dev/mii/rlswitch.c user/attilio/vmcontention/sys/dev/mii/smcphy.c user/attilio/vmcontention/sys/dev/mii/tdkphy.c user/attilio/vmcontention/sys/dev/mii/tlphy.c user/attilio/vmcontention/sys/dev/mii/truephy.c user/attilio/vmcontention/sys/dev/mii/ukphy.c user/attilio/vmcontention/sys/dev/mii/xmphy.c user/attilio/vmcontention/sys/dev/mlx/mlx_pci.c user/attilio/vmcontention/sys/dev/mps/mps_pci.c user/attilio/vmcontention/sys/dev/msk/if_msk.c user/attilio/vmcontention/sys/dev/mvs/mvs_pci.c user/attilio/vmcontention/sys/dev/mvs/mvs_soc.c user/attilio/vmcontention/sys/dev/netmap/netmap.c user/attilio/vmcontention/sys/dev/nfe/if_nfe.c user/attilio/vmcontention/sys/dev/nge/if_nge.c user/attilio/vmcontention/sys/dev/nve/if_nve.c user/attilio/vmcontention/sys/dev/ofw/ofw_iicbus.c user/attilio/vmcontention/sys/dev/pccbb/pccbb_isa.c user/attilio/vmcontention/sys/dev/pccbb/pccbb_pci.c user/attilio/vmcontention/sys/dev/pci/eisa_pci.c user/attilio/vmcontention/sys/dev/pci/isa_pci.c user/attilio/vmcontention/sys/dev/pci/pci_pci.c user/attilio/vmcontention/sys/dev/pcn/if_pcn.c user/attilio/vmcontention/sys/dev/ppbus/lpbb.c user/attilio/vmcontention/sys/dev/ppbus/lpt.c user/attilio/vmcontention/sys/dev/ppbus/ppb_base.c user/attilio/vmcontention/sys/dev/ppbus/ppb_msq.c user/attilio/vmcontention/sys/dev/ppbus/ppbconf.c user/attilio/vmcontention/sys/dev/ppbus/vpo.c user/attilio/vmcontention/sys/dev/ppc/ppc.c user/attilio/vmcontention/sys/dev/puc/puc_pccard.c user/attilio/vmcontention/sys/dev/puc/puc_pci.c user/attilio/vmcontention/sys/dev/quicc/quicc_bfe_fdt.c user/attilio/vmcontention/sys/dev/re/if_re.c user/attilio/vmcontention/sys/dev/rt/if_rt.c user/attilio/vmcontention/sys/dev/safe/safe.c user/attilio/vmcontention/sys/dev/scc/scc_bfe_ebus.c user/attilio/vmcontention/sys/dev/scc/scc_bfe_macio.c user/attilio/vmcontention/sys/dev/scc/scc_bfe_quicc.c user/attilio/vmcontention/sys/dev/scc/scc_bfe_sbus.c user/attilio/vmcontention/sys/dev/sec/sec.c user/attilio/vmcontention/sys/dev/sf/if_sf.c user/attilio/vmcontention/sys/dev/sfxge/sfxge.c user/attilio/vmcontention/sys/dev/sge/if_sge.c user/attilio/vmcontention/sys/dev/siba/siba.c user/attilio/vmcontention/sys/dev/siba/siba_bwn.c user/attilio/vmcontention/sys/dev/siba/siba_cc.c user/attilio/vmcontention/sys/dev/siba/siba_core.c user/attilio/vmcontention/sys/dev/siba/siba_pcib.c user/attilio/vmcontention/sys/dev/siis/siis.c user/attilio/vmcontention/sys/dev/sis/if_sis.c user/attilio/vmcontention/sys/dev/sk/if_sk.c user/attilio/vmcontention/sys/dev/smbus/smbus.c user/attilio/vmcontention/sys/dev/sound/isa/gusc.c user/attilio/vmcontention/sys/dev/sound/isa/sbc.c user/attilio/vmcontention/sys/dev/sound/pci/csa.c user/attilio/vmcontention/sys/dev/sound/pci/fm801.c user/attilio/vmcontention/sys/dev/sound/usb/uaudio.c user/attilio/vmcontention/sys/dev/spibus/spibus.c user/attilio/vmcontention/sys/dev/ste/if_ste.c user/attilio/vmcontention/sys/dev/stge/if_stge.c user/attilio/vmcontention/sys/dev/tl/if_tl.c user/attilio/vmcontention/sys/dev/tsec/if_tsec_fdt.c user/attilio/vmcontention/sys/dev/twa/tw_osl_freebsd.c user/attilio/vmcontention/sys/dev/twe/twe_freebsd.c user/attilio/vmcontention/sys/dev/tws/tws.c user/attilio/vmcontention/sys/dev/ubsec/ubsec.c user/attilio/vmcontention/sys/dev/usb/controller/at91dci_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/atmegadci_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/ehci_ixp4xx.c user/attilio/vmcontention/sys/dev/usb/controller/ehci_mv.c user/attilio/vmcontention/sys/dev/usb/controller/ehci_pci.c user/attilio/vmcontention/sys/dev/usb/controller/musb_otg_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/ohci_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/ohci_pci.c user/attilio/vmcontention/sys/dev/usb/controller/ohci_s3c24x0.c user/attilio/vmcontention/sys/dev/usb/controller/uhci_pci.c user/attilio/vmcontention/sys/dev/usb/controller/uss820dci_atmelarm.c user/attilio/vmcontention/sys/dev/usb/controller/xhci_pci.c user/attilio/vmcontention/sys/dev/usb/net/if_aue.c user/attilio/vmcontention/sys/dev/usb/net/if_axe.c user/attilio/vmcontention/sys/dev/usb/net/if_mos.c user/attilio/vmcontention/sys/dev/usb/net/if_rue.c user/attilio/vmcontention/sys/dev/usb/net/if_udav.c user/attilio/vmcontention/sys/dev/usb/net/ruephy.c user/attilio/vmcontention/sys/dev/usb/usbdevs user/attilio/vmcontention/sys/dev/usb/wlan/if_run.c user/attilio/vmcontention/sys/dev/vge/if_vge.c user/attilio/vmcontention/sys/dev/vr/if_vr.c user/attilio/vmcontention/sys/dev/vte/if_vte.c user/attilio/vmcontention/sys/dev/wb/if_wb.c user/attilio/vmcontention/sys/dev/xen/pcifront/pcifront.c user/attilio/vmcontention/sys/dev/xl/if_xl.c user/attilio/vmcontention/sys/dev/xl/xlphy.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_conv.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_denode.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_fat.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_lookup.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_vfsops.c user/attilio/vmcontention/sys/fs/nfs/nfs_var.h user/attilio/vmcontention/sys/fs/nfsclient/nfs_clrpcops.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clstate.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c user/attilio/vmcontention/sys/fs/procfs/procfs_status.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs.h user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/i386/i386/legacy.c user/attilio/vmcontention/sys/i386/linux/linux_proto.h user/attilio/vmcontention/sys/isa/vga_isa.c user/attilio/vmcontention/sys/kern/init_sysent.c user/attilio/vmcontention/sys/kern/kern_ffclock.c user/attilio/vmcontention/sys/kern/kern_mutex.c user/attilio/vmcontention/sys/kern/kern_proc.c user/attilio/vmcontention/sys/kern/kern_sx.c user/attilio/vmcontention/sys/kern/kern_tc.c user/attilio/vmcontention/sys/kern/makesyscalls.sh user/attilio/vmcontention/sys/kern/subr_bus.c user/attilio/vmcontention/sys/kern/syscalls.c user/attilio/vmcontention/sys/kern/syscalls.master user/attilio/vmcontention/sys/kern/systrace_args.c user/attilio/vmcontention/sys/kern/vfs_syscalls.c user/attilio/vmcontention/sys/mips/adm5120/admpci.c user/attilio/vmcontention/sys/mips/atheros/apb.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_ehci.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_machdep.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_ohci.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_pci.c user/attilio/vmcontention/sys/mips/atheros/ar724x_pci.c user/attilio/vmcontention/sys/mips/atheros/if_arge.c user/attilio/vmcontention/sys/mips/cavium/octopci.c user/attilio/vmcontention/sys/mips/cavium/usb/octusb_octeon.c user/attilio/vmcontention/sys/mips/conf/AR91XX_BASE user/attilio/vmcontention/sys/mips/conf/AR91XX_BASE.hints user/attilio/vmcontention/sys/mips/conf/PB92 user/attilio/vmcontention/sys/mips/conf/TP-WN1043ND user/attilio/vmcontention/sys/mips/conf/TP-WN1043ND.hints user/attilio/vmcontention/sys/mips/idt/idtpci.c user/attilio/vmcontention/sys/mips/idt/if_kr.c user/attilio/vmcontention/sys/mips/include/cpufunc.h user/attilio/vmcontention/sys/mips/malta/gt.c user/attilio/vmcontention/sys/mips/malta/gt_pci.c user/attilio/vmcontention/sys/mips/nlm/cms.c user/attilio/vmcontention/sys/mips/nlm/files.xlp user/attilio/vmcontention/sys/mips/nlm/hal/cop2.h user/attilio/vmcontention/sys/mips/nlm/hal/fmn.c user/attilio/vmcontention/sys/mips/nlm/hal/fmn.h user/attilio/vmcontention/sys/mips/nlm/hal/iomap.h user/attilio/vmcontention/sys/mips/nlm/hal/pcibus.h user/attilio/vmcontention/sys/mips/nlm/hal/pic.h user/attilio/vmcontention/sys/mips/nlm/mpreset.S user/attilio/vmcontention/sys/mips/nlm/msgring.h user/attilio/vmcontention/sys/mips/nlm/xlp.h user/attilio/vmcontention/sys/mips/nlm/xlp_machdep.c user/attilio/vmcontention/sys/mips/nlm/xlp_pci.c user/attilio/vmcontention/sys/mips/rmi/dev/nlge/if_nlge.c user/attilio/vmcontention/sys/mips/rmi/dev/sec/rmisec.c user/attilio/vmcontention/sys/mips/rmi/xlr_pci.c user/attilio/vmcontention/sys/mips/rmi/xls_ehci.c user/attilio/vmcontention/sys/mips/rt305x/rt305x_dotg.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/net/bpf.c user/attilio/vmcontention/sys/net/bpf.h user/attilio/vmcontention/sys/net/if.c user/attilio/vmcontention/sys/netinet/if_ether.c user/attilio/vmcontention/sys/netinet/in.c user/attilio/vmcontention/sys/netinet/sctp.h user/attilio/vmcontention/sys/netinet/sctp_output.c user/attilio/vmcontention/sys/netinet/sctp_pcb.c user/attilio/vmcontention/sys/netinet/sctp_pcb.h user/attilio/vmcontention/sys/netinet/sctp_structs.h user/attilio/vmcontention/sys/netinet/sctp_sysctl.c user/attilio/vmcontention/sys/netinet/sctp_sysctl.h user/attilio/vmcontention/sys/netinet/sctp_uio.h user/attilio/vmcontention/sys/netinet/sctp_usrreq.c user/attilio/vmcontention/sys/netinet/sctputil.c user/attilio/vmcontention/sys/pci/if_rl.c user/attilio/vmcontention/sys/pci/if_rlreg.h user/attilio/vmcontention/sys/pci/intpm.c user/attilio/vmcontention/sys/pci/viapm.c user/attilio/vmcontention/sys/powerpc/aim/nexus.c user/attilio/vmcontention/sys/powerpc/mambo/mambo.c user/attilio/vmcontention/sys/powerpc/mpc85xx/nexus.c user/attilio/vmcontention/sys/powerpc/mpc85xx/pci_fdt.c user/attilio/vmcontention/sys/powerpc/ofw/ofw_cpu.c user/attilio/vmcontention/sys/powerpc/ofw/ofw_pcib_pci.c user/attilio/vmcontention/sys/powerpc/powermac/cpcht.c user/attilio/vmcontention/sys/powerpc/powermac/cuda.c user/attilio/vmcontention/sys/powerpc/powermac/grackle.c user/attilio/vmcontention/sys/powerpc/powermac/pmu.c user/attilio/vmcontention/sys/powerpc/powermac/uninorthpci.c user/attilio/vmcontention/sys/powerpc/ps3/ehci_ps3.c user/attilio/vmcontention/sys/powerpc/ps3/ohci_ps3.c user/attilio/vmcontention/sys/powerpc/ps3/ps3bus.c user/attilio/vmcontention/sys/powerpc/ps3/ps3pic.c user/attilio/vmcontention/sys/sparc64/central/central.c user/attilio/vmcontention/sys/sparc64/conf/GENERIC user/attilio/vmcontention/sys/sparc64/ebus/ebus.c user/attilio/vmcontention/sys/sparc64/ebus/epic.c user/attilio/vmcontention/sys/sparc64/fhc/fhc.c user/attilio/vmcontention/sys/sparc64/pci/apb.c user/attilio/vmcontention/sys/sparc64/pci/fire.c user/attilio/vmcontention/sys/sparc64/pci/ofw_pcib.c user/attilio/vmcontention/sys/sparc64/pci/ofw_pcibus.c user/attilio/vmcontention/sys/sparc64/pci/psycho.c user/attilio/vmcontention/sys/sparc64/pci/sbbc.c user/attilio/vmcontention/sys/sparc64/pci/schizo.c user/attilio/vmcontention/sys/sparc64/sbus/dma_sbus.c user/attilio/vmcontention/sys/sparc64/sbus/sbus.c user/attilio/vmcontention/sys/sparc64/sparc64/eeprom.c user/attilio/vmcontention/sys/sparc64/sparc64/jbusppm.c user/attilio/vmcontention/sys/sparc64/sparc64/nexus.c user/attilio/vmcontention/sys/sparc64/sparc64/rtc.c user/attilio/vmcontention/sys/sparc64/sparc64/sc_machdep.c user/attilio/vmcontention/sys/sparc64/sparc64/schppm.c user/attilio/vmcontention/sys/sparc64/sparc64/ssm.c user/attilio/vmcontention/sys/sparc64/sparc64/upa.c user/attilio/vmcontention/sys/sys/bus.h user/attilio/vmcontention/sys/sys/mutex.h user/attilio/vmcontention/sys/sys/param.h user/attilio/vmcontention/sys/sys/proc.h user/attilio/vmcontention/sys/sys/resource.h user/attilio/vmcontention/sys/sys/sx.h user/attilio/vmcontention/sys/sys/syscall.h user/attilio/vmcontention/sys/sys/syscall.mk user/attilio/vmcontention/sys/sys/sysctl.h user/attilio/vmcontention/sys/sys/sysproto.h user/attilio/vmcontention/sys/sys/timeffc.h user/attilio/vmcontention/sys/sys/timepps.h user/attilio/vmcontention/sys/vm/vm_map.c user/attilio/vmcontention/sys/x86/pci/pci_bus.c user/attilio/vmcontention/sys/x86/pci/qpi.c user/attilio/vmcontention/sys/x86/x86/mptable_pci.c user/attilio/vmcontention/sys/xen/xenstore/xenstore.c user/attilio/vmcontention/tools/tools/ath/athstats/athstats.c user/attilio/vmcontention/usr.bin/procstat/Makefile user/attilio/vmcontention/usr.bin/procstat/procstat.1 user/attilio/vmcontention/usr.bin/procstat/procstat.c user/attilio/vmcontention/usr.bin/procstat/procstat.h user/attilio/vmcontention/usr.bin/procstat/procstat_args.c user/attilio/vmcontention/usr.sbin/acpi/acpidb/acpidb.c user/attilio/vmcontention/usr.sbin/bluetooth/bt3cfw/bt3cfw.c user/attilio/vmcontention/usr.sbin/boot0cfg/boot0cfg.c user/attilio/vmcontention/usr.sbin/cron/crontab/crontab.5 user/attilio/vmcontention/usr.sbin/mfiutil/mfi_config.c user/attilio/vmcontention/usr.sbin/sade/Makefile user/attilio/vmcontention/usr.sbin/sade/devices.c user/attilio/vmcontention/usr.sbin/sade/disks.c user/attilio/vmcontention/usr.sbin/sade/dmenu.c user/attilio/vmcontention/usr.sbin/sade/install.c user/attilio/vmcontention/usr.sbin/sade/label.c user/attilio/vmcontention/usr.sbin/sade/main.c user/attilio/vmcontention/usr.sbin/sade/menus.c user/attilio/vmcontention/usr.sbin/sade/misc.c user/attilio/vmcontention/usr.sbin/sade/msg.c user/attilio/vmcontention/usr.sbin/sade/sade.h user/attilio/vmcontention/usr.sbin/sade/system.c user/attilio/vmcontention/usr.sbin/tzsetup/Makefile user/attilio/vmcontention/usr.sbin/tzsetup/tzsetup.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bind9/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/contrib/bzip2/ (props changed) user/attilio/vmcontention/contrib/com_err/ (props changed) user/attilio/vmcontention/contrib/compiler-rt/ (props changed) user/attilio/vmcontention/contrib/dialog/ (props changed) user/attilio/vmcontention/contrib/ee/ (props changed) user/attilio/vmcontention/contrib/expat/ (props changed) user/attilio/vmcontention/contrib/file/ (props changed) user/attilio/vmcontention/contrib/gcc/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/contrib/gdtoa/ (props changed) user/attilio/vmcontention/contrib/gnu-sort/ (props changed) user/attilio/vmcontention/contrib/groff/ (props changed) user/attilio/vmcontention/contrib/less/ (props changed) user/attilio/vmcontention/contrib/libpcap/ (props changed) user/attilio/vmcontention/contrib/libstdc++/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed) user/attilio/vmcontention/contrib/ncurses/ (props changed) user/attilio/vmcontention/contrib/netcat/ (props changed) user/attilio/vmcontention/contrib/ntp/ (props changed) user/attilio/vmcontention/contrib/one-true-awk/ (props changed) user/attilio/vmcontention/contrib/openbsm/ (props changed) user/attilio/vmcontention/contrib/openpam/ (props changed) user/attilio/vmcontention/contrib/openresolv/ (props changed) user/attilio/vmcontention/contrib/pf/ (props changed) user/attilio/vmcontention/contrib/sendmail/ (props changed) user/attilio/vmcontention/contrib/tcpdump/ (props changed) user/attilio/vmcontention/contrib/tcsh/ (props changed) user/attilio/vmcontention/contrib/tnftp/ (props changed) user/attilio/vmcontention/contrib/top/ (props changed) user/attilio/vmcontention/contrib/top/install-sh (props changed) user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed) user/attilio/vmcontention/contrib/tzcode/zic/ (props changed) user/attilio/vmcontention/contrib/tzdata/ (props changed) user/attilio/vmcontention/contrib/wpa/ (props changed) user/attilio/vmcontention/contrib/xz/ (props changed) user/attilio/vmcontention/crypto/heimdal/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/crypto/openssl/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed) user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed) user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/lib/libc/stdtime/ (props changed) user/attilio/vmcontention/lib/libutil/ (props changed) user/attilio/vmcontention/lib/libz/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed) user/attilio/vmcontention/share/zoneinfo/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/amd64/include/xen/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/boot/i386/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed) user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed) user/attilio/vmcontention/sys/contrib/pf/ (props changed) user/attilio/vmcontention/sys/contrib/x86emu/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) user/attilio/vmcontention/usr.bin/csup/ (props changed) user/attilio/vmcontention/usr.bin/procstat/ (props changed) user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed) user/attilio/vmcontention/usr.sbin/rtsold/ (props changed) user/attilio/vmcontention/usr.sbin/zic/ (props changed) Modified: user/attilio/vmcontention/Makefile ============================================================================== --- user/attilio/vmcontention/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -182,10 +182,12 @@ buildworld: upgrade_checks # # In the following, the first 'rm' in a series will usually remove all # files and directories. If it does not, then there are probably some -# files with chflags set, so this unsets them and tries the 'rm' a +# files with file flags set, so this unsets them and tries the 'rm' a # second time. There are situations where this target will be cleaning # some directories via more than one method, but that duplication is -# needed to correctly handle all the possible situations. +# needed to correctly handle all the possible situations. Removing all +# files without file flags set in the first 'rm' instance saves time, +# because 'chflags' will need to operate on fewer files afterwards. # BW_CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} cleanworld: Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/Makefile.inc1 Sat Nov 26 13:54:55 2011 (r227993) @@ -1218,6 +1218,9 @@ _startup_libs+= lib/csu/${MACHINE_CPUARC _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc +.if ${MK_LIBCPLUSPLUS} != "no" +_startup_libs+= lib/libcxxrt +.endif gnu/lib/libgcc__L: lib/libc__L @@ -1636,4 +1639,7 @@ _xi-links: ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done +.else +xdev xdev-buil xdev-install: + @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/ObsoleteFiles.inc Sat Nov 26 13:54:55 2011 (r227993) @@ -38,6 +38,19 @@ # xargs -n1 | sort | uniq -d; # done +# 20111125: amd(4) removed +OLD_FILES+=usr/share/man/man4/amd.4.gz +# 20111125: libodialog removed +OLD_FILES+=usr/lib/libodialog.a +OLD_FILES+=usr/lib/libodialog.so +OLD_LIBS+=usr/lib/libodialog.so.7 +OLD_FILES+=usr/lib/libodialog_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libodialog.a +OLD_FILES+=usr/lib32/libodialog.so +OLD_LIBS+=usr/lib32/libodialog.so.7 +OLD_FILES+=usr/lib32/libodialog_p.a +.endif # 20110930: sysinstall removed OLD_FILES+=usr/sbin/sysinstall OLD_FILES+=usr/share/man/man8/sysinstall.8.gz Modified: user/attilio/vmcontention/bin/ps/ps.1 ============================================================================== --- user/attilio/vmcontention/bin/ps/ps.1 Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/bin/ps/ps.1 Sat Nov 26 13:54:55 2011 (r227993) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd October 30, 2011 +.Dd November 22, 2011 .Dt PS 1 .Os .Sh NAME @@ -98,12 +98,6 @@ The default output format includes, for controlling terminal, state, CPU time (including both user and system time) and associated command. .Pp -The process file system (see -.Xr procfs 5 ) -should be mounted when -.Nm -is executed, otherwise not all information will be available. -.Pp The options are as follows: .Bl -tag -width indent .It Fl a @@ -686,9 +680,6 @@ attempts to automatically determine the .Bl -tag -width ".Pa /boot/kernel/kernel" -compact .It Pa /boot/kernel/kernel default system namelist -.It Pa /proc -the mount point of -.Xr procfs 5 .El .Sh SEE ALSO .Xr kill 1 , Modified: user/attilio/vmcontention/bin/ps/ps.c ============================================================================== --- user/attilio/vmcontention/bin/ps/ps.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/bin/ps/ps.c Sat Nov 26 13:54:55 2011 (r227993) @@ -130,7 +130,6 @@ struct listinfo { } l; }; -static int check_procfs(void); static int addelem_gid(struct listinfo *, const char *); static int addelem_pid(struct listinfo *, const char *); static int addelem_tty(struct listinfo *, const char *); @@ -411,14 +410,6 @@ main(int argc, char *argv[]) argv += optind; /* - * If the user specified ps -e then they want a copy of the process - * environment kvm_getenvv(3) attempts to open /proc/<pid>/mem. - * Check to make sure that procfs is mounted on /proc, otherwise - * print a warning informing the user that output will be incomplete. - */ - if (needenv == 1 && check_procfs() == 0) - warnx("Process environment requires procfs(5)"); - /* * If there arguments after processing all the options, attempt * to treat them as a list of process ids. */ @@ -1360,18 +1351,6 @@ kludge_oldps_options(const char *optlist return (newopts); } -static int -check_procfs(void) -{ - struct statfs mnt; - - if (statfs("/proc", &mnt) < 0) - return (0); - if (strcmp(mnt.f_fstypename, "procfs") != 0) - return (0); - return (1); -} - static void usage(void) { Modified: user/attilio/vmcontention/bin/sh/options.c ============================================================================== --- user/attilio/vmcontention/bin/sh/options.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/bin/sh/options.c Sat Nov 26 13:54:55 2011 (r227993) @@ -401,9 +401,10 @@ setcmd(int argc, char **argv) void getoptsreset(const char *value) { - if (number(value) == 1) { + while (*value == '0') + value++; + if (strcmp(value, "1") == 0) shellparam.reset = 1; - } } /* Modified: user/attilio/vmcontention/bin/test/test.c ============================================================================== --- user/attilio/vmcontention/bin/test/test.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/bin/test/test.c Sat Nov 26 13:54:55 2011 (r227993) @@ -119,7 +119,7 @@ enum token_types { }; static struct t_op { - const char *op_text; + char op_text[4]; short op_num, op_type; } const ops [] = { {"-r", FILRD, UNOP}, @@ -162,7 +162,7 @@ static struct t_op { {"-o", BOR, BBINOP}, {"(", LPAREN, PAREN}, {")", RPAREN, PAREN}, - {0, 0, 0} + {"", 0, 0} }; static struct t_op const *t_wp_op; @@ -427,7 +427,7 @@ t_lex(char *s) t_wp_op = NULL; return EOI; } - while (op->op_text) { + while (*op->op_text) { if (strcmp(s, op->op_text) == 0) { if (((op->op_type == UNOP || op->op_type == BUNOP) && isunopoperand()) || @@ -456,7 +456,7 @@ isunopoperand(void) if (nargc == 2) return parenlevel == 1 && strcmp(s, ")") == 0; t = *(t_wp + 2); - while (op->op_text) { + while (*op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && (parenlevel == 0 || t[0] != ')' || t[1] != '\0'); @@ -478,7 +478,7 @@ islparenoperand(void) return parenlevel == 1 && strcmp(s, ")") == 0; if (nargc != 3) return 0; - while (op->op_text) { + while (*op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP; op++; Modified: user/attilio/vmcontention/cddl/sbin/zfs/Makefile ============================================================================== --- user/attilio/vmcontention/cddl/sbin/zfs/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/cddl/sbin/zfs/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -25,6 +25,4 @@ DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs -MANFILTER= sed -e '/^$$/d' - .include <bsd.prog.mk> Modified: user/attilio/vmcontention/cddl/sbin/zpool/Makefile ============================================================================== --- user/attilio/vmcontention/cddl/sbin/zpool/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/cddl/sbin/zpool/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -30,6 +30,4 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs -MANFILTER= sed -e '/^$$/d' - .include <bsd.prog.mk> Modified: user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile ============================================================================== --- user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -24,6 +24,4 @@ LDADD= -lm -lnvpair -lumem -lzpool -lpth CSTD= c99 -MANFILTER= sed -e '/^$$/d' - .include <bsd.prog.mk> Modified: user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -27,6 +27,4 @@ DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} $ ${LIBUUTIL} ${LIBZFS} ${LIBZPOOL} LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool -MANFILTER= sed -e '/^$$/d' - .include <bsd.prog.mk> Modified: user/attilio/vmcontention/etc/mtree/BSD.include.dist ============================================================================== --- user/attilio/vmcontention/etc/mtree/BSD.include.dist Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/etc/mtree/BSD.include.dist Sat Nov 26 13:54:55 2011 (r227993) @@ -76,6 +76,10 @@ tr1 .. .. + v1 + ext + .. + .. .. cam ata Modified: user/attilio/vmcontention/etc/rc.resume ============================================================================== --- user/attilio/vmcontention/etc/rc.resume Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/etc/rc.resume Sat Nov 26 13:54:55 2011 (r227993) @@ -50,7 +50,7 @@ if [ -r /var/run/rc.suspend.tch ]; then fi if [ -r /var/run/moused.pid ]; then - kill -HUP `head -1 /var/run/moused.pid` + pkill -HUP -F /var/run/moused.pid fi # Turns on a power supply of a card in the slot inactivated. Modified: user/attilio/vmcontention/gnu/lib/Makefile ============================================================================== --- user/attilio/vmcontention/gnu/lib/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/gnu/lib/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -2,8 +2,7 @@ .include <bsd.own.mk> -SUBDIR= csu libgcc libgcov libdialog libgomp libodialog libregex libreadline \ - libssp +SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. Modified: user/attilio/vmcontention/gnu/usr.bin/dialog/Makefile ============================================================================== --- user/attilio/vmcontention/gnu/usr.bin/dialog/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/gnu/usr.bin/dialog/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -3,7 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= $(LIBDIALOG) $(LIBNCURSES) $(LIBM) +DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBM} LDADD= -ldialog -lncursesw -lm CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Modified: user/attilio/vmcontention/lib/Makefile ============================================================================== --- user/attilio/vmcontention/lib/Makefile Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/Makefile Sat Nov 26 13:54:55 2011 (r227993) @@ -48,7 +48,9 @@ SUBDIR_ORDERED= ${_csu} \ libsbuf \ libtacplus \ libutil \ - ${_libypclnt} + ${_libypclnt} \ + ${_libcxxrt} \ + ${_libcplusplus} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ @@ -203,6 +205,11 @@ _libsmb= libsmb _libmp= libmp .endif +.if ${MK_LIBCPLUSPLUS} != "no" +_libcxxrt= libcxxrt +_libcplusplus= libc++ +.endif + .if ${MK_PMC} != "no" _libpmc= libpmc .endif Modified: user/attilio/vmcontention/lib/clang/clang.build.mk ============================================================================== --- user/attilio/vmcontention/lib/clang/clang.build.mk Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/clang/clang.build.mk Sat Nov 26 13:54:55 2011 (r227993) @@ -9,7 +9,7 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG # Correct for gcc miscompilation when compiling on PPC with -O2 -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -O1 .endif Modified: user/attilio/vmcontention/lib/libc/gen/opendir.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/opendir.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/gen/opendir.c Sat Nov 26 13:54:55 2011 (r227993) @@ -75,6 +75,8 @@ __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 @@ -89,7 +91,13 @@ __opendir2(const char *name, int flags) if ((fd = _open(name, O_RDONLY | O_NONBLOCK | O_DIRECTORY)) == -1) return (NULL); - return __opendir_common(fd, name, flags); + dir = __opendir_common(fd, name, flags); + if (dir == NULL) { + saved_errno = errno; + _close(fd); + errno = saved_errno; + } + return (dir); } static int @@ -110,6 +118,7 @@ __opendir_common(int fd, const char *nam int incr; int saved_errno; int unionstack; + int fd2; struct stat statb; dirp = NULL; @@ -199,14 +208,15 @@ __opendir_common(int fd, const char *nam * which has also been read -- see fts.c. */ if (flags & DTF_REWIND) { - (void)_close(fd); - if ((fd = _open(name, O_RDONLY | O_DIRECTORY)) == -1) { + if ((fd2 = _open(name, O_RDONLY | O_DIRECTORY)) == -1) { saved_errno = errno; free(buf); free(dirp); errno = saved_errno; return (NULL); } + (void)_dup2(fd2, fd); + _close(fd2); } /* @@ -309,7 +319,6 @@ __opendir_common(int fd, const char *nam fail: saved_errno = errno; free(dirp); - (void)_close(fd); errno = saved_errno; return (NULL); } Modified: user/attilio/vmcontention/lib/libc/locale/xlocale.c ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/xlocale.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/locale/xlocale.c Sat Nov 26 13:54:55 2011 (r227993) @@ -200,8 +200,13 @@ static int dupcomponent(int type, locale if (new->components[type]) { strncpy(new->components[type]->locale, src->locale, ENCODING_LEN); } - } else { + } else if (base->components[type]) { new->components[type] = xlocale_retain(base->components[type]); + } else { + /* If the component was NULL, return success - if base is a valid + * locale then the flag indicating that this isn't present should be + * set. If it isn't a valid locale, then we're stuck anyway. */ + return 1; } return (0 != new->components[type]); } Modified: user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c ============================================================================== --- user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c Sat Nov 26 13:54:55 2011 (r227993) @@ -413,6 +413,9 @@ sctp_opt_info(int sd, sctp_assoc_t id, i case SCTP_PEER_ADDR_THLDS: ((struct sctp_paddrthlds *)arg)->spt_assoc_id = id; break; + case SCTP_REMOTE_UDP_ENCAPS_PORT: + ((struct sctp_udpencaps *)arg)->sue_assoc_id = id; + break; case SCTP_MAX_BURST: ((struct sctp_assoc_value *)arg)->assoc_id = id; break; Modified: user/attilio/vmcontention/lib/libc/string/strcasecmp.c ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strcasecmp.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/string/strcasecmp.c Sat Nov 26 13:54:55 2011 (r227993) @@ -42,14 +42,15 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include "xlocale_private.h" -typedef unsigned char u_char; - int strcasecmp_l(const char *s1, const char *s2, locale_t locale) { const u_char *us1 = (const u_char *)s1, *us2 = (const u_char *)s2; + if (s1 == s2) + return (0); + FIX_LOCALE(locale); while (tolower_l(*us1, locale) == tolower_l(*us2++, locale)) @@ -67,18 +68,22 @@ int strncasecmp_l(const char *s1, const char *s2, size_t n, locale_t locale) { FIX_LOCALE(locale); - if (n != 0) { - const u_char - *us1 = (const u_char *)s1, - *us2 = (const u_char *)s2; - - do { - if (tolower_l(*us1, locale) != tolower_l(*us2++, locale)) - return (tolower_l(*us1, locale) - tolower_l(*--us2, locale)); - if (*us1++ == '\0') - break; - } while (--n != 0); - } + + const u_char + *us1 = (const u_char *)s1, + *us2 = (const u_char *)s2; + + /* use a bitwise or to avoid an additional branch instruction */ + if ((s1 == s2) | (n == 0)) + return (0); + + + do { + if (tolower_l(*us1, locale) != tolower_l(*us2++, locale)) + return (tolower_l(*us1, locale) - tolower_l(*--us2, locale)); + if (*us1++ == '\0') + break; + } while (--n != 0); return (0); } Modified: user/attilio/vmcontention/lib/libc/string/strcmp.c ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strcmp.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/string/strcmp.c Sat Nov 26 13:54:55 2011 (r227993) @@ -44,6 +44,9 @@ __FBSDID("$FreeBSD$"); int strcmp(const char *s1, const char *s2) { + if (s1 == s2) + return (0); + while (*s1 == *s2++) if (*s1++ == '\0') return (0); Modified: user/attilio/vmcontention/lib/libc/string/strcoll.c ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strcoll.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/string/strcoll.c Sat Nov 26 13:54:55 2011 (r227993) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> int -strcoll_l(const char *s, const char *s2, locale_t locale) +strcoll_l(const char *s1, const char *s2, locale_t locale) { int len, len2, prim, prim2, sec, sec2, ret, ret2; const char *t, *t2; @@ -50,16 +50,16 @@ strcoll_l(const char *s, const char *s2, (struct xlocale_collate*)locale->components[XLC_COLLATE]; if (table->__collate_load_error) - return strcmp(s, s2); + return strcmp(s1, s2); len = len2 = 1; ret = ret2 = 0; if (table->__collate_substitute_nontrivial) { - t = tt = __collate_substitute(table, s); + t = tt = __collate_substitute(table, s1); t2 = tt2 = __collate_substitute(table, s2); } else { tt = tt2 = NULL; - t = s; + t = s1; t2 = s2; } while(*t && *t2) { @@ -95,8 +95,8 @@ strcoll_l(const char *s, const char *s2, } int -strcoll(const char *s, const char *s2) +strcoll(const char *s1, const char *s2) { - return strcoll_l(s, s2, __get_locale()); + return strcoll_l(s1, s2, __get_locale()); } Modified: user/attilio/vmcontention/lib/libc/string/strncmp.c ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strncmp.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/string/strncmp.c Sat Nov 26 13:54:55 2011 (r227993) @@ -39,8 +39,10 @@ int strncmp(const char *s1, const char *s2, size_t n) { - if (n == 0) + /* use a bitwise or to avoid an additional branch instruction */ + if ((n == 0) | (s1 == s2)) return (0); + do { if (*s1 != *s2++) return (*(const unsigned char *)s1 - Modified: user/attilio/vmcontention/lib/libc/sys/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/Makefile.inc Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/sys/Makefile.inc Sat Nov 26 13:54:55 2011 (r227993) @@ -80,7 +80,7 @@ MAN+= abort2.2 accept.2 access.2 acct.2 bind.2 brk.2 cap_enter.2 cap_new.2 chdir.2 chflags.2 \ chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 closefrom.2 \ connect.2 cpuset.2 cpuset_getaffinity.2 dup.2 execve.2 _exit.2 \ - extattr_get_file.2 fcntl.2 fhopen.2 flock.2 fork.2 fsync.2 \ + extattr_get_file.2 fcntl.2 ffclock.2 fhopen.2 flock.2 fork.2 fsync.2 \ getdirentries.2 getdtablesize.2 \ getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \ getloginclass.2 getpeername.2 getpgrp.2 getpid.2 getpriority.2 \ @@ -142,6 +142,8 @@ MLINKS+=extattr_get_file.2 extattr.2 \ extattr_get_file.2 extattr_set_fd.2 \ extattr_get_file.2 extattr_set_file.2 \ extattr_get_file.2 extattr_set_link.2 +MLINKS+=ffclock.2 ffclock_getcounter.2 ffclock.2 ffclock_getestimate.2 \ + ffclock.2 ffclock_setestimate.2 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2 MLINKS+=getdirentries.2 getdents.2 MLINKS+=getfh.2 lgetfh.2 Modified: user/attilio/vmcontention/lib/libc/sys/Symbol.map ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/Symbol.map Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/sys/Symbol.map Sat Nov 26 13:54:55 2011 (r227993) @@ -365,6 +365,9 @@ FBSD_1.2 { cap_getmode; cap_new; cap_getrights; + ffclock_getcounter; + ffclock_getestimate; + ffclock_setestimate; getloginclass; pdfork; pdgetpid; Copied: user/attilio/vmcontention/lib/libc/sys/ffclock.2 (from r227992, head/lib/libc/sys/ffclock.2) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/sys/ffclock.2 Sat Nov 26 13:54:55 2011 (r227993, copy of r227992, head/lib/libc/sys/ffclock.2) @@ -0,0 +1,177 @@ +.\" Copyright (c) 2011 The University of Melbourne +.\" All rights reserved. +.\" +.\" This documentation was written by Julien Ridoux at the University of +.\" Melbourne 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: +.\" 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 +.\" 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) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd November 21, 2011 +.Dt FFCLOCK 2 +.Os +.Sh NAME +.Nm ffclock_getcounter , +.Nm ffclock_getestimate , +.Nm ffclock_setestimate +.Nd Retrieve feed-forward counter, get and set feed-forward clock estimates. +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/timeffc.h +.Ft int +.Fn ffclock_getcounter "ffcounter *ffcount" +.Ft int +.Fn ffclock_getestimate "struct ffclock_estimate *cest" +.Ft int +.Fn ffclock_setestimate "struct ffclock_estimate *cest" +.Sh DESCRIPTION +The ffclock is an alternative method to synchronise the system clock. +The ffclock implements a feed-forward paradigm and decouples the timestamping +and timekeeping kernel functions. +This ensures that past clock errors do not affect current timekeeping, an +approach radically different from the feedback alternative implemented by the +ntpd daemon when adjusting the system clock. +The feed-forward approach has demonstrated better performance and higher +robustness than a feedback approach when synchronising over the network. +.Pp +In the feed-forward context, a +.Em timestamp +is a cumulative value of the ticks of the timecounter, which can be converted +into seconds by using the feed-forward +.Em clock estimates. +.Pp +The +.Fn ffclock_getcounter +system call allows the calling process to retrieve the current value of the +feed-forward counter maintained by the kernel. +.Pp +The +.Fn ffclock_getestimate +and +.Fn ffclock_setestimate +system calls allow the caller to get and set the kernel's feed-forward clock +parameter estimates respectively. +The +.Fn ffclock_setestimate +system call should be invoked by a single instance of a feed-forward +synchronisation daemon. +The +.Fn ffclock_getestimate +system call can be called by any process to retrieve the feed-forward clock +estimates. +.Pp +The feed-forward approach does not require that the clock estimates be retrieved +every time a timestamp is to be converted into seconds. +The number of system calls can therefore be greatly reduced if the calling +process retrieves the clock estimates from the clock synchronisation daemon +instead. +The +.Fn ffclock_getestimate +must be used when the feed-forward synchronisation daemon is not running +.Po see +.Sx USAGE +below +.Pc . +.Pp +The clock parameter estimates structure pointed to by +.Fa cest +is defined in +.In sys/timeffc.h +as: +.Bd -literal +struct ffclock_estimate { + struct bintime update_time; /* Time of last estimates update. */ + ffcounter update_ffcount; /* Counter value at last update. */ + ffcounter leapsec_next; /* Counter value of next leap second. */ + uint64_t period; /* Estimate of counter period. */ + uint32_t errb_abs; /* Bound on absolute clock error [ns]. */ + uint32_t errb_rate; /* Bound on counter rate error [ps/s]. */ + uint32_t status; /* Clock status. */ + int16_t leapsec_total; /* All leap seconds seen so far. */ + int8_t leapsec; /* Next leap second (in {-1,0,1}). */ +}; +.Ed +.Pp +Only the super-user may set the feed-forward clock estimates. +.Sh RETURN VALUES +.Rv -std +.Sh ERRORS +The following error codes may be set in +.Va errno : +.Bl -tag -width Er +.It Bq Er EFAULT +The +.Fa ffcount +or +.Fa cest +pointer referenced invalid memory. +.It Bq Er EPERM +A user other than the super-user attempted to set the feed-forward clock +parameter estimates. +.El +.Sh USAGE +The feed-forward paradigm enables the definition of specialised clock functions. +.Pp +In its simplest form, +.Fn ffclock_getcounter +can be used to establish strict order between events or to measure small time +intervals very accurately with a minimum performance cost. +.Pp +Different methods exist to access absolute time +.Po or +.Qq wall-clock time +.Pc tracked by the ffclock. +The simplest method uses the ffclock sysctl interface +.Va kern.ffclock +to make the system clock return the ffclock time. +The +.Xr clock_gettime 2 +system call can then be used to retrieve the current time seen by the +feed-forward clock. +Note that this setting affects the entire system and that a feed-forward +synchronisation daemon should be running. +.Pp +A less automated method consists of retrieving the feed-forward counter +timestamp from the kernel and using the feed-forward clock parameter estimates +to convert the timestamp into seconds. +The feed-forward clock parameter estimates can be retrieved from the kernel or +from the synchronisation daemon directly (preferred). +This method allows converting timestamps using different clock models as needed +by the application, while collecting meaningful upper bounds on current clock +error. +.Sh SEE ALSO +.Xr date 1 , +.Xr adjtime 2 , +.Xr clock_gettime 2 , +.Xr ctime 3 +.Sh HISTORY +Feed-forward clock support first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +The feed-forward clock support was written by +.An Julien Ridoux Aq jridoux@unimelb.edu.au +in collaboration with +.An Darryl Veitch Aq dveitch@unimelb.edu.au +at the University of Melbourne under sponsorship from the FreeBSD Foundation. Modified: user/attilio/vmcontention/lib/libc/sys/getsockopt.2 ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/getsockopt.2 Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libc/sys/getsockopt.2 Sat Nov 26 13:54:55 2011 (r227993) @@ -28,7 +28,7 @@ .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd June 13, 2008 +.Dd November 21, 2011 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -533,7 +533,9 @@ on a non-listening socket was attempted. .Sh HISTORY The .Fn getsockopt -system call appeared in +and +.Fn setsockopt +system calls appeared in .Bx 4.2 . .Sh BUGS Several of the socket options should be handled at lower levels of the system. Modified: user/attilio/vmcontention/lib/libkvm/kvm_getprocs.3 ============================================================================== --- user/attilio/vmcontention/lib/libkvm/kvm_getprocs.3 Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libkvm/kvm_getprocs.3 Sat Nov 26 13:54:55 2011 (r227993) @@ -32,7 +32,7 @@ .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd September 27, 2003 +.Dd November 22, 2011 .Dt KVM_GETPROCS 3 .Os .Sh NAME @@ -172,10 +172,3 @@ on failure. .Xr kvm_write 3 .Sh BUGS These routines do not belong in the kvm interface. -.Pp -In order for -.Xr kvm_getenvv 3 -to function correctly, -.Xr procfs 5 -must be mounted on -.Pa /proc . Modified: user/attilio/vmcontention/lib/libkvm/kvm_proc.c ============================================================================== --- user/attilio/vmcontention/lib/libkvm/kvm_proc.c Sat Nov 26 13:43:50 2011 (r227992) +++ user/attilio/vmcontention/lib/libkvm/kvm_proc.c Sat Nov 26 13:54:55 2011 (r227993) @@ -72,9 +72,6 @@ __FBSDID("$FreeBSD$"); #include <nlist.h> #include <kvm.h> -#include <vm/vm.h> -#include <vm/vm_param.h> - #include <sys/sysctl.h> #include <limits.h> @@ -623,276 +620,16 @@ _kvm_realloc(kvm_t *kd, void *p, size_t return (np); } -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif - /* - * Read in an argument vector from the user address space of process kp. - * addr if the user-space base address of narg null-terminated contiguous - * strings. This is used to read in both the command arguments and - * environment strings. Read at most maxcnt characters of strings. + * Get the command args or environment. */ static char ** -kvm_argv(kvm_t *kd, const struct kinfo_proc *kp, u_long addr, int narg, - int maxcnt) -{ - char *np, *cp, *ep, *ap; - u_long oaddr = -1; - int len, cc; - char **argv; - - /* - * Check that there aren't an unreasonable number of arguments, - * and that the address is in user space. Special test for - * VM_MIN_ADDRESS as it evaluates to zero, but is not a simple zero - * constant for some archs. We cannot use the pre-processor here and - * for some archs the compiler would trigger a signedness warning. - */ - if (narg > 512 || addr + 1 < VM_MIN_ADDRESS + 1 || addr >= VM_MAXUSER_ADDRESS) - return (0); - - /* - * kd->argv : work space for fetching the strings from the target - * process's space, and is converted for returning to caller - */ - if (kd->argv == 0) { - /* - * Try to avoid reallocs. - */ - kd->argc = MAX(narg + 1, 32); - kd->argv = (char **)_kvm_malloc(kd, kd->argc * - sizeof(*kd->argv)); - if (kd->argv == 0) - return (0); - } else if (narg + 1 > kd->argc) { - kd->argc = MAX(2 * kd->argc, narg + 1); - kd->argv = (char **)_kvm_realloc(kd, kd->argv, kd->argc * - sizeof(*kd->argv)); - if (kd->argv == 0) - return (0); - } - /* - * kd->argspc : returned to user, this is where the kd->argv - * arrays are left pointing to the collected strings. - */ - if (kd->argspc == 0) { - kd->argspc = (char *)_kvm_malloc(kd, PAGE_SIZE); - if (kd->argspc == 0) - return (0); - kd->arglen = PAGE_SIZE; - } - /* - * kd->argbuf : used to pull in pages from the target process. - * the strings are copied out of here. - */ - if (kd->argbuf == 0) { - kd->argbuf = (char *)_kvm_malloc(kd, PAGE_SIZE); - if (kd->argbuf == 0) - return (0); - } - - /* Pull in the target process'es argv vector */ - cc = sizeof(char *) * narg; - if (kvm_uread(kd, kp, addr, (char *)kd->argv, cc) != cc) - return (0); - /* - * ap : saved start address of string we're working on in kd->argspc - * np : pointer to next place to write in kd->argspc - * len: length of data in kd->argspc - * argv: pointer to the argv vector that we are hunting around the - * target process space for, and converting to addresses in - * our address space (kd->argspc). - */ - ap = np = kd->argspc; - argv = kd->argv; - len = 0; - /* - * Loop over pages, filling in the argument vector. - * Note that the argv strings could be pointing *anywhere* in - * the user address space and are no longer contiguous. - * Note that *argv is modified when we are going to fetch a string - * that crosses a page boundary. We copy the next part of the string - * into to "np" and eventually convert the pointer. - */ - while (argv < kd->argv + narg && *argv != 0) { - - /* get the address that the current argv string is on */ - addr = (u_long)*argv & ~(PAGE_SIZE - 1); - - /* is it the same page as the last one? */ - if (addr != oaddr) { - if (kvm_uread(kd, kp, addr, kd->argbuf, PAGE_SIZE) != - PAGE_SIZE) - return (0); - oaddr = addr; - } - - /* offset within the page... kd->argbuf */ - addr = (u_long)*argv & (PAGE_SIZE - 1); - - /* cp = start of string, cc = count of chars in this chunk */ - cp = kd->argbuf + addr; - cc = PAGE_SIZE - addr; - - /* dont get more than asked for by user process */ - if (maxcnt > 0 && cc > maxcnt - len) - cc = maxcnt - len; - - /* pointer to end of string if we found it in this page */ - ep = memchr(cp, '\0', cc); - if (ep != 0) - cc = ep - cp + 1; - /* - * at this point, cc is the count of the chars that we are - * going to retrieve this time. we may or may not have found - * the end of it. (ep points to the null if the end is known) - */ - - /* will we exceed the malloc/realloced buffer? */ - if (len + cc > kd->arglen) { - int off; - char **pp; - char *op = kd->argspc; - - kd->arglen *= 2; - kd->argspc = (char *)_kvm_realloc(kd, kd->argspc, - kd->arglen); - if (kd->argspc == 0) - return (0); - /* - * Adjust argv pointers in case realloc moved - * the string space. - */ - off = kd->argspc - op; - for (pp = kd->argv; pp < argv; pp++) - *pp += off; - ap += off; - np += off; - } - /* np = where to put the next part of the string in kd->argspc*/ - /* np is kinda redundant.. could use "kd->argspc + len" */ - memcpy(np, cp, cc); - np += cc; /* inc counters */ - len += cc; - - /* - * if end of string found, set the *argv pointer to the - * saved beginning of string, and advance. argv points to - * somewhere in kd->argv.. This is initially relative - * to the target process, but when we close it off, we set - * it to point in our address space. - */ - if (ep != 0) { - *argv++ = ap; - ap = np; - } else { - /* update the address relative to the target process */ - *argv += cc; - } - - if (maxcnt > 0 && len >= maxcnt) { - /* - * We're stopping prematurely. Terminate the - * current string. - */ - if (ep == 0) { - *np = '\0'; - *argv++ = ap; - } - break; - } - } - /* Make sure argv is terminated. */ - *argv = 0; - return (kd->argv); -} - -static void -ps_str_a(struct ps_strings *p, u_long *addr, int *n) -{ - *addr = (u_long)p->ps_argvstr; - *n = p->ps_nargvstr; -} - -static void -ps_str_e (struct ps_strings *p, u_long *addr, int *n) -{ - *addr = (u_long)p->ps_envstr; - *n = p->ps_nenvstr; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111261354.pAQDsuuJ093810>