Date: Sat, 23 Jun 2012 02:08:16 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r237467 - in user/attilio/vmcontention: bin/rm contrib/bsnmp/lib contrib/bsnmp/snmp_target contrib/bsnmp/snmp_usm contrib/bsnmp/snmp_vacm contrib/gcc contrib/telnet/telnet etc etc/mtree... Message-ID: <201206230208.q5N28GEO013136@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Jun 23 02:08:15 2012 New Revision: 237467 URL: http://svn.freebsd.org/changeset/base/237467 Log: MFC Added: user/attilio/vmcontention/lib/libc/amd64/sys/__vdso_gettc.c - copied unchanged from r237466, head/lib/libc/amd64/sys/__vdso_gettc.c user/attilio/vmcontention/lib/libc/i386/sys/__vdso_gettc.c - copied unchanged from r237466, head/lib/libc/i386/sys/__vdso_gettc.c user/attilio/vmcontention/lib/libc/sys/__vdso_gettimeofday.c - copied unchanged from r237466, head/lib/libc/sys/__vdso_gettimeofday.c user/attilio/vmcontention/lib/libc/sys/clock_gettime.c - copied unchanged from r237466, head/lib/libc/sys/clock_gettime.c user/attilio/vmcontention/lib/libc/sys/gettimeofday.c - copied unchanged from r237466, head/lib/libc/sys/gettimeofday.c user/attilio/vmcontention/lib/libz/test/ - copied from r237466, head/lib/libz/test/ user/attilio/vmcontention/sbin/camcontrol/progress.c - copied unchanged from r237466, head/sbin/camcontrol/progress.c user/attilio/vmcontention/sbin/camcontrol/progress.h - copied unchanged from r237466, head/sbin/camcontrol/progress.h user/attilio/vmcontention/share/man/man4/est.4 - copied unchanged from r237466, head/share/man/man4/est.4 user/attilio/vmcontention/sys/amd64/include/vdso.h - copied unchanged from r237466, head/sys/amd64/include/vdso.h user/attilio/vmcontention/sys/arm/include/vdso.h - copied unchanged from r237466, head/sys/arm/include/vdso.h user/attilio/vmcontention/sys/contrib/dev/acpica/common/ahpredef.c - copied unchanged from r237466, head/sys/contrib/dev/acpica/common/ahpredef.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h - copied unchanged from r237466, head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h user/attilio/vmcontention/sys/dev/cxgbe/tom/ - copied from r237466, head/sys/dev/cxgbe/tom/ user/attilio/vmcontention/sys/i386/include/vdso.h - copied unchanged from r237466, head/sys/i386/include/vdso.h user/attilio/vmcontention/sys/ia64/include/vdso.h - copied unchanged from r237466, head/sys/ia64/include/vdso.h user/attilio/vmcontention/sys/kern/subr_dummy_vdso_tc.c - copied unchanged from r237466, head/sys/kern/subr_dummy_vdso_tc.c user/attilio/vmcontention/sys/mips/include/vdso.h - copied unchanged from r237466, head/sys/mips/include/vdso.h user/attilio/vmcontention/sys/modules/cxgbe/tom/ - copied from r237466, head/sys/modules/cxgbe/tom/ user/attilio/vmcontention/sys/modules/toecore/ - copied from r237466, head/sys/modules/toecore/ user/attilio/vmcontention/sys/netinet/toecore.c - copied unchanged from r237466, head/sys/netinet/toecore.c user/attilio/vmcontention/sys/netinet/toecore.h - copied unchanged from r237466, head/sys/netinet/toecore.h user/attilio/vmcontention/sys/pc98/include/vdso.h - copied unchanged from r237466, head/sys/pc98/include/vdso.h user/attilio/vmcontention/sys/powerpc/include/vdso.h - copied unchanged from r237466, head/sys/powerpc/include/vdso.h user/attilio/vmcontention/sys/sparc64/include/vdso.h - copied unchanged from r237466, head/sys/sparc64/include/vdso.h user/attilio/vmcontention/sys/sys/vdso.h - copied unchanged from r237466, head/sys/sys/vdso.h user/attilio/vmcontention/sys/x86/include/vdso.h - copied unchanged from r237466, head/sys/x86/include/vdso.h Deleted: user/attilio/vmcontention/lib/libz/example.c user/attilio/vmcontention/lib/libz/minigzip.c user/attilio/vmcontention/sys/dev/cxgb/cxgb_offload.c user/attilio/vmcontention/sys/dev/cxgb/t3cdev.h user/attilio/vmcontention/sys/dev/cxgb/ulp/toecore/ user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_ddp.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_defs.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tcp.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c user/attilio/vmcontention/sys/modules/cxgb/toecore/ user/attilio/vmcontention/sys/netinet/toedev.h Modified: user/attilio/vmcontention/bin/rm/rm.c user/attilio/vmcontention/contrib/bsnmp/lib/bsnmpclient.3 user/attilio/vmcontention/contrib/bsnmp/lib/bsnmplib.3 user/attilio/vmcontention/contrib/bsnmp/snmp_target/snmp_target.3 user/attilio/vmcontention/contrib/bsnmp/snmp_usm/snmp_usm.3 user/attilio/vmcontention/contrib/bsnmp/snmp_vacm/snmp_vacm.3 user/attilio/vmcontention/contrib/gcc/ChangeLog.gcc43 user/attilio/vmcontention/contrib/gcc/fold-const.c user/attilio/vmcontention/contrib/gcc/gimplify.c user/attilio/vmcontention/contrib/gcc/tree-ssa-ccp.c user/attilio/vmcontention/contrib/gcc/tree-ssa-pre.c user/attilio/vmcontention/contrib/telnet/telnet/telnet.1 user/attilio/vmcontention/etc/login.conf user/attilio/vmcontention/etc/mtree/BSD.include.dist user/attilio/vmcontention/etc/periodic/daily/400.status-disks user/attilio/vmcontention/include/Makefile user/attilio/vmcontention/lib/libc/amd64/sys/Makefile.inc user/attilio/vmcontention/lib/libc/gen/aux.c user/attilio/vmcontention/lib/libc/gen/syslog.c user/attilio/vmcontention/lib/libc/i386/sys/Makefile.inc user/attilio/vmcontention/lib/libc/include/libc_private.h user/attilio/vmcontention/lib/libc/net/Makefile.inc user/attilio/vmcontention/lib/libc/stdtime/strftime.c user/attilio/vmcontention/lib/libc/string/Makefile.inc user/attilio/vmcontention/lib/libc/string/strcasecmp.3 user/attilio/vmcontention/lib/libc/string/strcoll.3 user/attilio/vmcontention/lib/libc/string/strstr.3 user/attilio/vmcontention/lib/libc/string/strxfrm.3 user/attilio/vmcontention/lib/libc/sys/Makefile.inc user/attilio/vmcontention/lib/libc/sys/posix_fadvise.2 user/attilio/vmcontention/lib/libedit/common.c user/attilio/vmcontention/lib/libedit/editline.3 user/attilio/vmcontention/lib/libedit/editrc.5 user/attilio/vmcontention/lib/libedit/el.c user/attilio/vmcontention/lib/libedit/el.h user/attilio/vmcontention/lib/libedit/histedit.h user/attilio/vmcontention/lib/libedit/history.c user/attilio/vmcontention/lib/libedit/key.c user/attilio/vmcontention/lib/libedit/key.h user/attilio/vmcontention/lib/libedit/prompt.c user/attilio/vmcontention/lib/libedit/prompt.h user/attilio/vmcontention/lib/libedit/read.c user/attilio/vmcontention/lib/libedit/refresh.c user/attilio/vmcontention/lib/libedit/search.c user/attilio/vmcontention/lib/libedit/sig.c user/attilio/vmcontention/lib/libedit/sig.h user/attilio/vmcontention/lib/libedit/term.c user/attilio/vmcontention/lib/libedit/term.h user/attilio/vmcontention/lib/libedit/tty.c user/attilio/vmcontention/lib/libedit/vi.c user/attilio/vmcontention/lib/libstand/Makefile user/attilio/vmcontention/lib/libutil/login.conf.5 user/attilio/vmcontention/lib/libutil/pw_util.c user/attilio/vmcontention/lib/libz/ChangeLog user/attilio/vmcontention/lib/libz/FAQ user/attilio/vmcontention/lib/libz/FREEBSD-upgrade (contents, props changed) user/attilio/vmcontention/lib/libz/Makefile (contents, props changed) user/attilio/vmcontention/lib/libz/README user/attilio/vmcontention/lib/libz/Symbol.map (contents, props changed) user/attilio/vmcontention/lib/libz/Versions.def (contents, props changed) user/attilio/vmcontention/lib/libz/adler32.c user/attilio/vmcontention/lib/libz/contrib/asm686/match.S (contents, props changed) user/attilio/vmcontention/lib/libz/crc32.c user/attilio/vmcontention/lib/libz/crc32.h user/attilio/vmcontention/lib/libz/deflate.c user/attilio/vmcontention/lib/libz/deflate.h user/attilio/vmcontention/lib/libz/doc/algorithm.txt (contents, props changed) user/attilio/vmcontention/lib/libz/gzguts.h (contents, props changed) user/attilio/vmcontention/lib/libz/gzlib.c user/attilio/vmcontention/lib/libz/gzread.c user/attilio/vmcontention/lib/libz/gzwrite.c user/attilio/vmcontention/lib/libz/infback.c user/attilio/vmcontention/lib/libz/inffixed.h user/attilio/vmcontention/lib/libz/inflate.c user/attilio/vmcontention/lib/libz/inftrees.c user/attilio/vmcontention/lib/libz/trees.c user/attilio/vmcontention/lib/libz/zconf.h user/attilio/vmcontention/lib/libz/zlib.3 user/attilio/vmcontention/lib/libz/zlib.h user/attilio/vmcontention/lib/libz/zopen.c (contents, props changed) user/attilio/vmcontention/lib/libz/zutil.c user/attilio/vmcontention/lib/libz/zutil.h 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/fwdownload.c user/attilio/vmcontention/sbin/ifconfig/ifconfig.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/cpufreq.4 user/attilio/vmcontention/share/man/man4/hptrr.4 user/attilio/vmcontention/share/man/man4/ng_netflow.4 user/attilio/vmcontention/sys/amd64/amd64/pmap.c user/attilio/vmcontention/sys/amd64/amd64/trap.c user/attilio/vmcontention/sys/amd64/conf/GENERIC user/attilio/vmcontention/sys/amd64/include/elf.h user/attilio/vmcontention/sys/amd64/include/pmap.h user/attilio/vmcontention/sys/arm/at91/at91_machdep.c user/attilio/vmcontention/sys/arm/at91/at91_spi.c user/attilio/vmcontention/sys/arm/at91/at91_twi.c user/attilio/vmcontention/sys/arm/at91/at91reg.h user/attilio/vmcontention/sys/arm/at91/at91sam9260.c user/attilio/vmcontention/sys/arm/include/elf.h user/attilio/vmcontention/sys/arm/include/pmap.h user/attilio/vmcontention/sys/boot/common/load_elf.c user/attilio/vmcontention/sys/boot/common/load_elf_obj.c user/attilio/vmcontention/sys/boot/userboot/libstand/Makefile user/attilio/vmcontention/sys/cam/cam_periph.c user/attilio/vmcontention/sys/cam/cam_xpt.c user/attilio/vmcontention/sys/cam/cam_xpt_periph.h user/attilio/vmcontention/sys/cam/scsi/scsi_cd.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.h user/attilio/vmcontention/sys/cam/scsi/scsi_enc.c user/attilio/vmcontention/sys/cam/scsi/scsi_pass.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/files.arm user/attilio/vmcontention/sys/conf/files.ia64 user/attilio/vmcontention/sys/conf/files.mips user/attilio/vmcontention/sys/conf/files.powerpc user/attilio/vmcontention/sys/conf/files.sparc64 user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/contrib/dev/acpica/changes.txt (contents, props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmextern.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmrestag.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompile.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslerror.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslfiles.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asllookup.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslmain.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslsupport.l user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dttemplate.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/dbdisply.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/dbexec.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/dbutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/disassembler/dmopcode.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/disassembler/dmwalk.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/dispatcher/dsfield.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/events/evgpe.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/events/evgpeutil.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/events/evxfgpe.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/executer/exconfig.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utmisc.c user/attilio/vmcontention/sys/contrib/dev/acpica/include/acdebug.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acdisasm.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acglobal.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/aclocal.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acpixf.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acpredef.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acutils.h user/attilio/vmcontention/sys/contrib/rdma/krping/krping.c user/attilio/vmcontention/sys/contrib/rdma/krping/krping.h user/attilio/vmcontention/sys/contrib/rdma/krping/krping_dev.c user/attilio/vmcontention/sys/contrib/rdma/rdma_addr.c user/attilio/vmcontention/sys/contrib/rdma/rdma_cache.c user/attilio/vmcontention/sys/dev/acpica/acpi_video.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_internal.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx_ht.c user/attilio/vmcontention/sys/dev/cxgb/common/cxgb_ctl_defs.h user/attilio/vmcontention/sys/dev/cxgb/cxgb_adapter.h user/attilio/vmcontention/sys/dev/cxgb/cxgb_main.c user/attilio/vmcontention/sys/dev/cxgb/cxgb_offload.h user/attilio/vmcontention/sys/dev/cxgb/cxgb_osdep.h user/attilio/vmcontention/sys/dev/cxgb/cxgb_sge.c user/attilio/vmcontention/sys/dev/cxgb/sys/mvec.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h user/attilio/vmcontention/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_l2t.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_l2t.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_listen.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tom.c user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tom.h user/attilio/vmcontention/sys/dev/cxgbe/adapter.h user/attilio/vmcontention/sys/dev/cxgbe/common/common.h user/attilio/vmcontention/sys/dev/cxgbe/common/t4_hw.c user/attilio/vmcontention/sys/dev/cxgbe/common/t4_msg.h user/attilio/vmcontention/sys/dev/cxgbe/firmware/t4fw_cfg.txt user/attilio/vmcontention/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt user/attilio/vmcontention/sys/dev/cxgbe/firmware/t4fw_interface.h user/attilio/vmcontention/sys/dev/cxgbe/offload.h user/attilio/vmcontention/sys/dev/cxgbe/osdep.h user/attilio/vmcontention/sys/dev/cxgbe/t4_l2t.c user/attilio/vmcontention/sys/dev/cxgbe/t4_l2t.h user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c user/attilio/vmcontention/sys/dev/cxgbe/t4_sge.c user/attilio/vmcontention/sys/dev/drm2/drm_pciids.h user/attilio/vmcontention/sys/dev/fb/fbreg.h user/attilio/vmcontention/sys/dev/flash/at45d.c user/attilio/vmcontention/sys/dev/hptrr/hptrr_osm_bsd.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c user/attilio/vmcontention/sys/dev/isp/isp.c user/attilio/vmcontention/sys/dev/isp/isp_freebsd.h user/attilio/vmcontention/sys/dev/isp/isp_pci.c user/attilio/vmcontention/sys/dev/isp/ispmbox.h user/attilio/vmcontention/sys/dev/isp/ispreg.h user/attilio/vmcontention/sys/dev/isp/ispvar.h user/attilio/vmcontention/sys/dev/ispfw/asm_2400.h user/attilio/vmcontention/sys/dev/ispfw/asm_2500.h user/attilio/vmcontention/sys/dev/pci/pci_pci.c user/attilio/vmcontention/sys/dev/puc/puc_cfg.h user/attilio/vmcontention/sys/dev/puc/pucdata.c user/attilio/vmcontention/sys/dev/twa/tw_osl_cam.c user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c user/attilio/vmcontention/sys/dev/usb/serial/uftdi_reg.h user/attilio/vmcontention/sys/dev/viawd/viawd.c user/attilio/vmcontention/sys/dev/xen/balloon/balloon.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clnode.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvfsops.c user/attilio/vmcontention/sys/i386/conf/GENERIC user/attilio/vmcontention/sys/i386/conf/XEN user/attilio/vmcontention/sys/i386/i386/elf_machdep.c user/attilio/vmcontention/sys/i386/i386/machdep.c user/attilio/vmcontention/sys/i386/include/elf.h user/attilio/vmcontention/sys/i386/include/pmap.h user/attilio/vmcontention/sys/i386/include/vmparam.h user/attilio/vmcontention/sys/ia64/include/elf.h user/attilio/vmcontention/sys/ia64/include/pmap.h user/attilio/vmcontention/sys/kern/imgact_elf.c user/attilio/vmcontention/sys/kern/kern_descrip.c user/attilio/vmcontention/sys/kern/kern_exec.c user/attilio/vmcontention/sys/kern/kern_fork.c user/attilio/vmcontention/sys/kern/kern_tc.c user/attilio/vmcontention/sys/kern/sys_generic.c user/attilio/vmcontention/sys/kern/sys_procdesc.c user/attilio/vmcontention/sys/kern/tty.c user/attilio/vmcontention/sys/kern/vfs_syscalls.c user/attilio/vmcontention/sys/kern/vfs_vnops.c user/attilio/vmcontention/sys/mips/include/elf.h user/attilio/vmcontention/sys/mips/include/pmap.h user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/modules/cxgb/Makefile user/attilio/vmcontention/sys/modules/cxgb/cxgb/Makefile user/attilio/vmcontention/sys/modules/cxgb/iw_cxgb/Makefile user/attilio/vmcontention/sys/modules/cxgb/tom/Makefile user/attilio/vmcontention/sys/modules/cxgbe/Makefile user/attilio/vmcontention/sys/modules/rdma/krping/Makefile user/attilio/vmcontention/sys/net/if_var.h user/attilio/vmcontention/sys/net/if_vlan.c user/attilio/vmcontention/sys/net80211/ieee80211_radiotap.c user/attilio/vmcontention/sys/net80211/ieee80211_var.h user/attilio/vmcontention/sys/netgraph/netflow/netflow.c user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.c user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.h user/attilio/vmcontention/sys/netinet/icmp_var.h user/attilio/vmcontention/sys/netinet/if_ether.c user/attilio/vmcontention/sys/netinet/if_ether.h user/attilio/vmcontention/sys/netinet/in.c user/attilio/vmcontention/sys/netinet/ip_icmp.c user/attilio/vmcontention/sys/netinet/sctp_input.c user/attilio/vmcontention/sys/netinet/sctp_usrreq.c user/attilio/vmcontention/sys/netinet/sctputil.c user/attilio/vmcontention/sys/netinet/tcp_input.c user/attilio/vmcontention/sys/netinet/tcp_offload.c user/attilio/vmcontention/sys/netinet/tcp_offload.h user/attilio/vmcontention/sys/netinet/tcp_output.c user/attilio/vmcontention/sys/netinet/tcp_subr.c user/attilio/vmcontention/sys/netinet/tcp_syncache.c user/attilio/vmcontention/sys/netinet/tcp_syncache.h user/attilio/vmcontention/sys/netinet/tcp_timer.c user/attilio/vmcontention/sys/netinet/tcp_usrreq.c user/attilio/vmcontention/sys/netinet/tcp_var.h user/attilio/vmcontention/sys/netinet6/in6_src.c user/attilio/vmcontention/sys/ofed/drivers/infiniband/core/cma.c user/attilio/vmcontention/sys/ofed/drivers/infiniband/core/iwcm.c user/attilio/vmcontention/sys/ofed/include/linux/net.h user/attilio/vmcontention/sys/ofed/include/net/netevent.h user/attilio/vmcontention/sys/ofed/include/rdma/iw_cm.h user/attilio/vmcontention/sys/powerpc/include/elf.h user/attilio/vmcontention/sys/powerpc/include/pmap.h user/attilio/vmcontention/sys/sparc64/include/elf.h user/attilio/vmcontention/sys/sparc64/include/pmap.h user/attilio/vmcontention/sys/sys/file.h user/attilio/vmcontention/sys/sys/sysent.h user/attilio/vmcontention/sys/ufs/ffs/ffs_vnops.c user/attilio/vmcontention/sys/vm/pmap.h user/attilio/vmcontention/sys/vm/swap_pager.c user/attilio/vmcontention/sys/vm/vm_map.c user/attilio/vmcontention/sys/vm/vm_object.h user/attilio/vmcontention/sys/vm/vm_page.c user/attilio/vmcontention/sys/vm/vm_page.h user/attilio/vmcontention/sys/vm/vm_pageout.c user/attilio/vmcontention/sys/vm/vnode_pager.c user/attilio/vmcontention/sys/x86/x86/tsc.c user/attilio/vmcontention/tools/regression/usr.bin/make/common.sh user/attilio/vmcontention/usr.bin/make/Makefile user/attilio/vmcontention/usr.bin/makewhatis/makewhatis.c user/attilio/vmcontention/usr.bin/minigzip/Makefile user/attilio/vmcontention/usr.bin/netstat/inet.c user/attilio/vmcontention/usr.bin/sockstat/sockstat.c user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile user/attilio/vmcontention/usr.sbin/bsdinstall/partedit/diskeditor.c user/attilio/vmcontention/usr.sbin/bsdinstall/partedit/part_wizard.c user/attilio/vmcontention/usr.sbin/crunch/crunchide/exec_elf32.c user/attilio/vmcontention/usr.sbin/ctladm/ctladm.c user/attilio/vmcontention/usr.sbin/ifmcstat/ifmcstat.c user/attilio/vmcontention/usr.sbin/kbdmap/kbdmap.c user/attilio/vmcontention/usr.sbin/kldxref/ef.c user/attilio/vmcontention/usr.sbin/mfiutil/Makefile user/attilio/vmcontention/usr.sbin/mfiutil/mfi_cmd.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_config.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_drive.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_evt.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_flash.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_patrol.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_show.c user/attilio/vmcontention/usr.sbin/mfiutil/mfi_volume.c user/attilio/vmcontention/usr.sbin/mfiutil/mfiutil.c user/attilio/vmcontention/usr.sbin/mfiutil/mfiutil.h Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/contrib/gcc/ (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/lib/libz/contrib/ (props changed) user/attilio/vmcontention/lib/libz/contrib/README.contrib (props changed) user/attilio/vmcontention/lib/libz/contrib/asm686/ (props changed) user/attilio/vmcontention/lib/libz/contrib/asm686/README.686 (props changed) user/attilio/vmcontention/lib/libz/contrib/gcc_gvmat64/ (props changed) user/attilio/vmcontention/lib/libz/contrib/gcc_gvmat64/gvmat64.S (props changed) user/attilio/vmcontention/lib/libz/doc/ (props changed) user/attilio/vmcontention/lib/libz/doc/rfc1950.txt (props changed) user/attilio/vmcontention/lib/libz/doc/rfc1951.txt (props changed) user/attilio/vmcontention/lib/libz/doc/rfc1952.txt (props changed) user/attilio/vmcontention/lib/libz/doc/txtvsbin.txt (props changed) user/attilio/vmcontention/lib/libz/gzclose.c (props changed) user/attilio/vmcontention/sbin/ (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/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/dev/acpica/common/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/disassembler/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/dispatcher/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/events/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/executer/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/include/ (props changed) Modified: user/attilio/vmcontention/bin/rm/rm.c ============================================================================== --- user/attilio/vmcontention/bin/rm/rm.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/bin/rm/rm.c Sat Jun 23 02:08:15 2012 (r237467) @@ -301,10 +301,16 @@ rm_tree(char **argv) if (fflag) continue; /* FALLTHROUGH */ - default: + + case FTS_F: + case FTS_NSOK: if (Pflag) - if (!rm_overwrite(p->fts_accpath, NULL)) + if (!rm_overwrite(p->fts_accpath, p->fts_info == + FTS_NSOK ? NULL : p->fts_statp)) continue; + /* FALLTHROUGH */ + + default: rval = unlink(p->fts_accpath); if (rval == 0 || (fflag && errno == ENOENT)) { if (rval == 0 && vflag) @@ -408,7 +414,7 @@ rm_file(char **argv) int rm_overwrite(char *file, struct stat *sbp) { - struct stat sb; + struct stat sb, sb2; struct statfs fsb; off_t len; int bsize, fd, wlen; @@ -427,8 +433,15 @@ rm_overwrite(char *file, struct stat *sb file, sbp->st_ino); return (0); } - if ((fd = open(file, O_WRONLY, 0)) == -1) + if ((fd = open(file, O_WRONLY|O_NONBLOCK|O_NOFOLLOW, 0)) == -1) + goto err; + if (fstat(fd, &sb2)) goto err; + if (sb2.st_dev != sbp->st_dev || sb2.st_ino != sbp->st_ino || + !S_ISREG(sb2.st_mode)) { + errno = EPERM; + goto err; + } if (fstatfs(fd, &fsb) == -1) goto err; bsize = MAX(fsb.f_iosize, 1024); Modified: user/attilio/vmcontention/contrib/bsnmp/lib/bsnmpclient.3 ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/lib/bsnmpclient.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/bsnmp/lib/bsnmpclient.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -368,7 +368,7 @@ This format expects an argument of type and appends the length of the string (as computed by .Xr strlen 3 ) and each of the characters in the string to the OID. -.It Li ( Va N Ns Li ) +.It ( Va N Ns ) This format expects no argument. .Va N must be a decimal number and is stored into an internal variable Modified: user/attilio/vmcontention/contrib/bsnmp/lib/bsnmplib.3 ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/lib/bsnmplib.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/bsnmp/lib/bsnmplib.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -161,7 +161,6 @@ is not zero, .Fa v.octetstring.octets points to a string allocated by .Xr malloc 3 . -.Pp .Bd -literal -offset indent #define SNMP_ENGINE_ID_SIZ 32 @@ -176,7 +175,6 @@ struct snmp_engine { .Pp This structure represents an SNMP engine as specified by the SNMP Management Architecture described in RFC 3411. -.Pp .Bd -literal -offset indent #define SNMP_ADM_STR32_SIZ (32 + 1) #define SNMP_AUTH_KEY_SIZ 40 @@ -225,7 +223,6 @@ enum snmp_privacy { and .Fa priv_key contain the authentication and privacy keys for the user. -.Pp .Bd -literal -offset indent #define SNMP_COMMUNITY_MAXLEN 128 #define SNMP_MAX_BINDINGS 100 @@ -389,7 +386,7 @@ If successfull, a plain text scoped PDU The function .Fn snmp_pdu_init_secparams calculates the initialization vector for the privacy protocol in use before -the PDU pointed to by +the PDU pointed to by .Fa pdu may be encrypted or decrypted. .Pp @@ -504,7 +501,7 @@ the cryptographic functions from The library may optionally be built without references to the .Xr crypto 3 library. In such case only plain text SNMPv3 PDUs without message digests -may be proccessed correctly. +may be proccessed correctly. .Sh STANDARDS This implementation conforms to the applicable IETF RFCs and ITU-T recommendations. Modified: user/attilio/vmcontention/contrib/bsnmp/snmp_target/snmp_target.3 ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/snmp_target/snmp_target.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/bsnmp/snmp_target/snmp_target.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -33,7 +33,7 @@ .Os .Sh NAME .Nm snmp_target -.Nd "Target addresses and notifications module for +.Nd "Target addresses and notifications module for" .Xr bsnmpd 1 .Sh LIBRARY .Pq begemotSnmpdModulePath."target" = "/usr/lib/snmp_target.so" Modified: user/attilio/vmcontention/contrib/bsnmp/snmp_usm/snmp_usm.3 ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/snmp_usm/snmp_usm.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/bsnmp/snmp_usm/snmp_usm.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -33,7 +33,7 @@ .Os .Sh NAME .Nm snmp_usm -.Nd "user-based security module for +.Nd "user-based security module for" .Xr bsnmpd 1 .Sh LIBRARY .Pq begemotSnmpdModulePath."usm" = "/usr/lib/snmp_usm.so" @@ -79,7 +79,7 @@ supported. .It Va usmUserAuthProtocol The value of this column contains the OID corresponding to the authentication protocol used by the USM user. The following protocols and their OIDs are known to -.Nm +.Nm module .Bl -tag -width ".It Va NoAuthProtocol" .It NoAuthProtocol 1.3.6.1.6.3.10.1.1.1 @@ -91,7 +91,7 @@ These columns may be used to change the .It Va usmUserPrivProtocol The value of this column contains the OID corresponding to the privacy protocol used by the USM user. The following protocols and their OIDs are known to -.Nm +.Nm module .Bl -tag -width ".It Va NoPrivProtocol" .It NoPrivProtocol 1.3.6.1.6.3.10.1.2.1 Modified: user/attilio/vmcontention/contrib/bsnmp/snmp_vacm/snmp_vacm.3 ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/snmp_vacm/snmp_vacm.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/bsnmp/snmp_vacm/snmp_vacm.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -33,7 +33,7 @@ .Os .Sh NAME .Nm snmp_vacm -.Nd "View-based Access Control module for +.Nd "View-based Access Control module for" .Xr bsnmpd 1 .Sh LIBRARY .Pq begemotSnmpdModulePath."vacm" = "/usr/lib/snmp_vacm.so" Modified: user/attilio/vmcontention/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- user/attilio/vmcontention/contrib/gcc/ChangeLog.gcc43 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/gcc/ChangeLog.gcc43 Sat Jun 23 02:08:15 2012 (r237467) @@ -5,6 +5,18 @@ with SSE3 instruction set support. * doc/invoke.texi: Likewise. +2007-04-12 Richard Guenther <rguenther@suse.de> (r123736) + + PR tree-optimization/24689 + PR tree-optimization/31307 + * fold-const.c (operand_equal_p): Compare INTEGER_CST array + indices by value. + * gimplify.c (canonicalize_addr_expr): To be consistent with + gimplify_compound_lval only set operands two and three of + ARRAY_REFs if they are not gimple_min_invariant. This makes + it never at this place. + * tree-ssa-ccp.c (maybe_fold_offset_to_array_ref): Likewise. + 2007-04-07 H.J. Lu <hongjiu.lu@intel.com> (r123639) * config/i386/i386.c (ix86_handle_option): Handle SSSE3. @@ -96,7 +108,7 @@ * doc/invoke.texi: Add entry about geode processor. -2006-10-24 Richard Guenther <rguenther@suse.de> +2006-10-24 Richard Guenther <rguenther@suse.de> (r118001) PR middle-end/28796 * builtins.c (fold_builtin_classify): Use HONOR_INFINITIES @@ -170,7 +182,13 @@ * doc/invoke.texi: Document -mssse3/-mno-ssse3 switches. -2006-10-21 Richard Guenther <rguenther@suse.de> +2006-10-21 Richard Guenther <rguenther@suse.de> (r117932) + + PR tree-optimization/3511 + * tree-ssa-pre.c (phi_translate): Fold CALL_EXPRs that + got new invariant arguments during PHI translation. + +2006-10-21 Richard Guenther <rguenther@suse.de> (r117929) * builtins.c (fold_builtin_classify): Fix typo. Modified: user/attilio/vmcontention/contrib/gcc/fold-const.c ============================================================================== --- user/attilio/vmcontention/contrib/gcc/fold-const.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/gcc/fold-const.c Sat Jun 23 02:08:15 2012 (r237467) @@ -2802,9 +2802,13 @@ operand_equal_p (tree arg0, tree arg1, u case ARRAY_REF: case ARRAY_RANGE_REF: - /* Operands 2 and 3 may be null. */ + /* Operands 2 and 3 may be null. + Compare the array index by value if it is constant first as we + may have different types but same value here. */ return (OP_SAME (0) - && OP_SAME (1) + && (tree_int_cst_equal (TREE_OPERAND (arg0, 1), + TREE_OPERAND (arg1, 1)) + || OP_SAME (1)) && OP_SAME_WITH_NULL (2) && OP_SAME_WITH_NULL (3)); Modified: user/attilio/vmcontention/contrib/gcc/gimplify.c ============================================================================== --- user/attilio/vmcontention/contrib/gcc/gimplify.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/gcc/gimplify.c Sat Jun 23 02:08:15 2012 (r237467) @@ -1600,9 +1600,7 @@ canonicalize_addr_expr (tree *expr_p) /* All checks succeeded. Build a new node to merge the cast. */ *expr_p = build4 (ARRAY_REF, dctype, obj_expr, TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - size_binop (EXACT_DIV_EXPR, TYPE_SIZE_UNIT (dctype), - size_int (TYPE_ALIGN_UNIT (dctype)))); + NULL_TREE, NULL_TREE); *expr_p = build1 (ADDR_EXPR, ctype, *expr_p); } Modified: user/attilio/vmcontention/contrib/gcc/tree-ssa-ccp.c ============================================================================== --- user/attilio/vmcontention/contrib/gcc/tree-ssa-ccp.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/gcc/tree-ssa-ccp.c Sat Jun 23 02:08:15 2012 (r237467) @@ -1621,9 +1621,7 @@ maybe_fold_offset_to_array_ref (tree bas if (!integer_zerop (elt_offset)) idx = int_const_binop (PLUS_EXPR, idx, elt_offset, 0); - return build4 (ARRAY_REF, orig_type, base, idx, min_idx, - size_int (tree_low_cst (elt_size, 1) - / (TYPE_ALIGN_UNIT (elt_type)))); + return build4 (ARRAY_REF, orig_type, base, idx, NULL_TREE, NULL_TREE); } Modified: user/attilio/vmcontention/contrib/gcc/tree-ssa-pre.c ============================================================================== --- user/attilio/vmcontention/contrib/gcc/tree-ssa-pre.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/gcc/tree-ssa-pre.c Sat Jun 23 02:08:15 2012 (r237467) @@ -1076,6 +1076,7 @@ phi_translate (tree expr, value_set_t se tree newexpr; tree vh = get_value_handle (expr); bool listchanged = false; + bool invariantarg = false; VEC (tree, gc) *vuses = VALUE_HANDLE_VUSES (vh); VEC (tree, gc) *tvuses; @@ -1134,10 +1135,26 @@ phi_translate (tree expr, value_set_t se if (newval != oldval) { listchanged = true; + invariantarg |= is_gimple_min_invariant (newval); TREE_VALUE (newwalker) = get_value_handle (newval); } } } + + /* In case of new invariant args we might try to fold the call + again. */ + if (invariantarg) + { + tree tmp = fold_ternary (CALL_EXPR, TREE_TYPE (expr), + newop0, newarglist, newop2); + if (tmp) + { + STRIP_TYPE_NOPS (tmp); + if (is_gimple_min_invariant (tmp)) + return tmp; + } + } + if (listchanged) vn_lookup_or_add (newarglist, NULL); Modified: user/attilio/vmcontention/contrib/telnet/telnet/telnet.1 ============================================================================== --- user/attilio/vmcontention/contrib/telnet/telnet/telnet.1 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/contrib/telnet/telnet/telnet.1 Sat Jun 23 02:08:15 2012 (r237467) @@ -344,7 +344,6 @@ Only enough of each command to uniquely and .Ic display commands). -.Pp .Bl -tag -width "mode type" .It Ic auth Ar argument ... The auth command manipulates the information sent through the @@ -664,7 +663,6 @@ An end of file (in command mode) will al Sends one or more special character sequences to the remote host. The following are the arguments which may be specified (more than one argument may be specified at a time): -.Pp .Bl -tag -width escape .It Ic abort Sends the Modified: user/attilio/vmcontention/etc/login.conf ============================================================================== --- user/attilio/vmcontention/etc/login.conf Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/etc/login.conf Sat Jun 23 02:08:15 2012 (r237467) @@ -23,10 +23,10 @@ # AND SEMANTICS'' section of getcap(3) for more escape sequences). default:\ - :passwd_format=md5:\ + :passwd_format=sha512:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES:\ + :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ Modified: user/attilio/vmcontention/etc/mtree/BSD.include.dist ============================================================================== --- user/attilio/vmcontention/etc/mtree/BSD.include.dist Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/etc/mtree/BSD.include.dist Sat Jun 23 02:08:15 2012 (r237467) @@ -102,6 +102,8 @@ .. ciss .. + filemon + .. firewire .. hwpmc Modified: user/attilio/vmcontention/etc/periodic/daily/400.status-disks ============================================================================== --- user/attilio/vmcontention/etc/periodic/daily/400.status-disks Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/etc/periodic/daily/400.status-disks Sat Jun 23 02:08:15 2012 (r237467) @@ -19,12 +19,15 @@ case "$daily_status_disks_enable" in df $daily_status_disks_df_flags && rc=1 || rc=3 # display which filesystems need backing up - if ! [ -f /etc/fstab ]; then - export PATH_FSTAB=/dev/null - fi + if [ -s /etc/dumpdates ]; then + if ! [ -f /etc/fstab ]; then + export PATH_FSTAB=/dev/null + fi - echo "" - dump W || rc=3;; + echo "" + dump W || rc=3 + fi + ;; *) rc=0;; esac Modified: user/attilio/vmcontention/include/Makefile ============================================================================== --- user/attilio/vmcontention/include/Makefile Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/include/Makefile Sat Jun 23 02:08:15 2012 (r237467) @@ -39,7 +39,7 @@ LDIRS= bsm cam geom net net80211 netatal sys vm LSUBDIRS= cam/ata cam/scsi \ - dev/acpica dev/an dev/bktr dev/ciss dev/firewire dev/hwpmc \ + dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ Modified: user/attilio/vmcontention/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/amd64/sys/Makefile.inc Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/amd64/sys/Makefile.inc Sat Jun 23 02:08:15 2012 (r237467) @@ -1,7 +1,8 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD$ -SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c amd64_set_gsbase.c +SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \ + amd64_set_gsbase.c __vdso_gettc.c MDASM= vfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \ reboot.S sbrk.S setlogin.S sigreturn.S Copied: user/attilio/vmcontention/lib/libc/amd64/sys/__vdso_gettc.c (from r237466, head/lib/libc/amd64/sys/__vdso_gettc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/amd64/sys/__vdso_gettc.c Sat Jun 23 02:08:15 2012 (r237467, copy of r237466, head/lib/libc/amd64/sys/__vdso_gettc.c) @@ -0,0 +1,49 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> + * + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/time.h> +#include <sys/vdso.h> +#include <machine/cpufunc.h> + +static u_int +__vdso_gettc_low(const struct vdso_timehands *th) +{ + uint32_t rv; + + __asm __volatile("rdtsc; shrd %%cl, %%edx, %0" + : "=a" (rv) : "c" (th->th_x86_shift) : "edx"); + return (rv); +} + +u_int +__vdso_gettc(const struct vdso_timehands *th) +{ + + return (th->th_x86_shift > 0 ? __vdso_gettc_low(th) : rdtsc32()); +} Modified: user/attilio/vmcontention/lib/libc/gen/aux.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/aux.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/gen/aux.c Sat Jun 23 02:08:15 2012 (r237467) @@ -66,6 +66,7 @@ __init_elf_aux_vector(void) static pthread_once_t aux_once = PTHREAD_ONCE_INIT; static int pagesize, osreldate, canary_len, ncpus, pagesizes_len; static char *canary, *pagesizes; +static void *timekeep; static void init_aux(void) @@ -101,6 +102,10 @@ init_aux(void) case AT_NCPUS: ncpus = aux->a_un.a_val; break; + + case AT_TIMEKEEP: + timekeep = aux->a_un.a_ptr; + break; } } } @@ -163,6 +168,16 @@ _elf_aux_info(int aux, void *buf, int bu } else res = EINVAL; break; + case AT_TIMEKEEP: + if (buflen == sizeof(void *)) { + if (timekeep != NULL) { + *(void **)buf = timekeep; + res = 0; + } else + res = ENOENT; + } else + res = EINVAL; + break; default: res = ENOENT; break; Modified: user/attilio/vmcontention/lib/libc/gen/syslog.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/syslog.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/gen/syslog.c Sat Jun 23 02:08:15 2012 (r237467) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/un.h> #include <netdb.h> +#include <assert.h> #include <errno.h> #include <fcntl.h> #include <paths.h> @@ -413,8 +414,11 @@ void closelog(void) { THREAD_LOCK(); - (void)_close(LogFile); - LogFile = -1; + assert(LogFile >= -1); + if (LogFile != -1) { + (void)_close(LogFile); + LogFile = -1; + } LogTag = NULL; status = NOCONN; THREAD_UNLOCK(); Modified: user/attilio/vmcontention/lib/libc/i386/sys/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/i386/sys/Makefile.inc Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/i386/sys/Makefile.inc Sat Jun 23 02:08:15 2012 (r237467) @@ -5,7 +5,8 @@ SRCS+= i386_clr_watch.c i386_set_watch.c i386_vm86.c .endif SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \ - i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c + i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \ + __vdso_gettc.c MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \ reboot.S sbrk.S setlogin.S sigreturn.S syscall.S Copied: user/attilio/vmcontention/lib/libc/i386/sys/__vdso_gettc.c (from r237466, head/lib/libc/i386/sys/__vdso_gettc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/i386/sys/__vdso_gettc.c Sat Jun 23 02:08:15 2012 (r237467, copy of r237466, head/lib/libc/i386/sys/__vdso_gettc.c) @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> + * + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/time.h> +#include <sys/vdso.h> +#include <machine/cpufunc.h> + +static u_int +__vdso_gettc_low(const struct vdso_timehands *th) +{ + uint32_t rv; + + __asm __volatile("rdtsc; shrd %%cl, %%edx, %0" + : "=a" (rv) : "c" (th->th_x86_shift) : "edx"); + return (rv); +} + +#pragma weak __vdso_gettc +u_int +__vdso_gettc(const struct vdso_timehands *th) +{ + + return (th->th_x86_shift > 0 ? __vdso_gettc_low(th) : rdtsc32()); +} Modified: user/attilio/vmcontention/lib/libc/include/libc_private.h ============================================================================== --- user/attilio/vmcontention/lib/libc/include/libc_private.h Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/include/libc_private.h Sat Jun 23 02:08:15 2012 (r237467) @@ -34,6 +34,7 @@ #ifndef _LIBC_PRIVATE_H_ #define _LIBC_PRIVATE_H_ +#include <sys/_types.h> #include <sys/_pthreadtypes.h> /* @@ -245,6 +246,12 @@ extern void * __sys_freebsd6_mmap(void * /* Without back-compat translation */ extern int __sys_fcntl(int, int, ...); +struct timespec; +struct timeval; +struct timezone; +int __sys_gettimeofday(struct timeval *, struct timezone *); +int __sys_clock_gettime(__clockid_t, struct timespec *ts); + /* execve() with PATH processing to implement posix_spawnp() */ int _execvpe(const char *, char * const *, char * const *); Modified: user/attilio/vmcontention/lib/libc/net/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/net/Makefile.inc Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/net/Makefile.inc Sat Jun 23 02:08:15 2012 (r237467) @@ -36,7 +36,7 @@ LFLAGS+=-P_nsyy CLEANFILES+=nslexer.c -nslexer.c: nslexer.l +nslexer.c: nslexer.l nsparser.h ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} Modified: user/attilio/vmcontention/lib/libc/stdtime/strftime.c ============================================================================== --- user/attilio/vmcontention/lib/libc/stdtime/strftime.c Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/stdtime/strftime.c Sat Jun 23 02:08:15 2012 (r237467) @@ -67,7 +67,7 @@ extern char * tzname[]; #define PAD_SPACE 2 #define PAD_ZERO 3 -static const char* fmt_padding[][4] = { +static const char fmt_padding[][4][5] = { /* DEFAULT, LESS, SPACE, ZERO */ #define PAD_FMT_MONTHDAY 0 #define PAD_FMT_HMS 0 Modified: user/attilio/vmcontention/lib/libc/string/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/string/Makefile.inc Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/string/Makefile.inc Sat Jun 23 02:08:15 2012 (r237467) @@ -42,10 +42,13 @@ MLINKS+=ffs.3 ffsl.3 \ ffs.3 flsll.3 MLINKS+=index.3 rindex.3 MLINKS+=memchr.3 memrchr.3 -MLINKS+=strcasecmp.3 strncasecmp.3 +MLINKS+=strcasecmp.3 strncasecmp.3 \ + strcasecmp.3 strcasecmp_l.3 \ + strcasecmp.3 strncasecmp_l.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 MLINKS+=strcmp.3 strncmp.3 +MLINKS+=strcoll.3 strcoll_l.3 MLINKS+=strcpy.3 stpcpy.3 \ strcpy.3 stpncpy.3 \ strcpy.3 strncpy.3 @@ -57,8 +60,10 @@ MLINKS+=strerror.3 perror.3 \ MLINKS+=strlcpy.3 strlcat.3 MLINKS+=strlen.3 strnlen.3 MLINKS+=strstr.3 strcasestr.3 \ - strstr.3 strnstr.3 + strstr.3 strnstr.3 \ + strstr.3 strcasestr_l.3 MLINKS+=strtok.3 strtok_r.3 +MLINKS+=strxfrm.3 strxfrm_l.3 MLINKS+=wmemchr.3 wcpcpy.3 \ wmemchr.3 wcpncpy.3 \ wmemchr.3 wcscasecmp.3 \ Modified: user/attilio/vmcontention/lib/libc/string/strcasecmp.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strcasecmp.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/string/strcasecmp.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -45,6 +45,12 @@ .Fn strcasecmp "const char *s1" "const char *s2" .Ft int .Fn strncasecmp "const char *s1" "const char *s2" "size_t len" +.In string.h +.In xlocale.h +.Ft int +.Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc" +.Ft int +.Fn strncasecmp_l "const char *s1" "const char *s2" "site_t len" "locale_t loc" .Sh DESCRIPTION The .Fn strcasecmp @@ -58,16 +64,22 @@ and .Pp The .Fn strncasecmp -compares at most +function compares at most .Fa len characters. -.Sh RETURN VALUES The +.Fn strcasecmp_l +and +.Fn strncasecmp_l +functions do the same as their non-locale versions above, but take an +explicit locale rather than using the current locale. +.Sh RETURN VALUES +The functions .Fn strcasecmp and .Fn strncasecmp return an integer greater than, equal to, or less than 0, -according as +depending on whether .Fa s1 is lexicographically greater than, equal to, or less than .Fa s2 @@ -77,6 +89,11 @@ The comparison is done using unsigned ch .Sq Li \e200 is greater than .Ql \e0 . +The functions +.Fn strcasecmp_l +and +.Fn strncasecmp_l +do the same but take explicit locales. .Sh SEE ALSO .Xr bcmp 3 , .Xr memcmp 3 , Modified: user/attilio/vmcontention/lib/libc/string/strcoll.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strcoll.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/string/strcoll.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -44,6 +44,8 @@ .In string.h .Ft int .Fn strcoll "const char *s1" "const char *s2" +.Ft int +.Fn strcoll_l "const char *s1" "const char *s2" "locale_t loc" .Sh DESCRIPTION The .Fn strcoll @@ -54,7 +56,7 @@ and .Fa s2 according to the current locale collation and returns an integer greater than, equal to, or less than 0, -according as +depending on whether .Fa s1 is greater than, equal to, or less than .Fa s2 . @@ -62,6 +64,9 @@ If information about the current locale the value of .Fn strcmp s1 s2 is returned. +The +.Fn strcoll_l +function uses an explicit locale argument rather than the system locale. .Sh SEE ALSO .Xr setlocale 3 , .Xr strcmp 3 , @@ -70,6 +75,9 @@ is returned. .Sh STANDARDS The .Fn strcoll -function -conforms to +function conforms to .St -isoC . +The +.Fn strcoll_l +function conforms to +.St -p1003.1-2008 . Modified: user/attilio/vmcontention/lib/libc/string/strstr.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strstr.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/string/strstr.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -49,6 +49,10 @@ .Fn strcasestr "const char *big" "const char *little" .Ft char * .Fn strnstr "const char *big" "const char *little" "size_t len" +.In string.h +.In xlocale.h +.Ft char * +.Fn strcasestr_l "const char *big" "const char *little" "locale_t loc" .Sh DESCRIPTION The .Fn strstr @@ -65,6 +69,12 @@ function is similar to but ignores the case of both strings. .Pp The +.Fn strcasestr_l +function does the same as +.Fn strcasestr +but takes an explicit locale rather than using the current locale. +.Pp +The .Fn strnstr function locates the first occurrence of the null-terminated string Modified: user/attilio/vmcontention/lib/libc/string/strxfrm.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/string/strxfrm.3 Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/string/strxfrm.3 Sat Jun 23 02:08:15 2012 (r237467) @@ -44,6 +44,8 @@ .In string.h .Ft size_t .Fn strxfrm "char * restrict dst" "const char * restrict src" "size_t n" +.Ft size_t +.Fn strxfrm_l "char * restrict dst" "const char *restrict src" "size_t n" "locale_t loc" .Sh DESCRIPTION The .Fn strxfrm @@ -73,10 +75,16 @@ after is equal to comparing two original strings with .Fn strcoll . +.Pp +.Fn strxfrm_l +does the same, however takes an explicit locale rather than the global +locale. .Sh RETURN VALUES Upon successful completion, .Fn strxfrm -returns the length of the transformed string not including +and +.Fn strxfrm_l +return the length of the transformed string not including the terminating null character. If this value is .Fa n @@ -94,3 +102,7 @@ The function conforms to .St -isoC . +The +.Fn strxfrm_l +function conforms to +.St -p1003.1-2008 . Modified: user/attilio/vmcontention/lib/libc/sys/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/Makefile.inc Sat Jun 23 01:30:51 2012 (r237466) +++ user/attilio/vmcontention/lib/libc/sys/Makefile.inc Sat Jun 23 02:08:15 2012 (r237467) @@ -15,6 +15,10 @@ # .sinclude "${.CURDIR}/${LIBC_ARCH}/sys/Makefile.inc" +SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c +NOASM+= clock_gettime.o gettimeofday.o +PSEUDO+= _clock_gettime.o _gettimeofday.o + # Sources common to both syscall interfaces: SRCS+= stack_protector.c stack_protector_compat.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) Copied: user/attilio/vmcontention/lib/libc/sys/__vdso_gettimeofday.c (from r237466, head/lib/libc/sys/__vdso_gettimeofday.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/sys/__vdso_gettimeofday.c Sat Jun 23 02:08:15 2012 (r237467, copy of r237466, head/lib/libc/sys/__vdso_gettimeofday.c) @@ -0,0 +1,142 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> + * + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/elf.h> +#include <sys/time.h> +#include <sys/vdso.h> +#include <errno.h> +#include <time.h> +#include <machine/atomic.h> +#include "libc_private.h" + +static u_int +tc_delta(const struct vdso_timehands *th) +{ + + return ((__vdso_gettc(th) - th->th_offset_count) & + th->th_counter_mask); +} + +static int +binuptime(struct bintime *bt, struct vdso_timekeep *tk, int abs) +{ + struct vdso_timehands *th; + uint32_t curr, gen; + + do { + if (!tk->tk_enabled) + return (ENOSYS); + + /* + * XXXKIB. The load of tk->tk_current should use + * atomic_load_acq_32 to provide load barrier. But + * since tk points to r/o mapped page, x86 + * implementation of atomic_load_acq faults. + */ + curr = tk->tk_current; + rmb(); + th = &tk->tk_th[curr]; + if (th->th_algo != VDSO_TH_ALGO_1) + return (ENOSYS); + gen = th->th_gen; + *bt = th->th_offset; + bintime_addx(bt, th->th_scale * tc_delta(th)); + if (abs) + bintime_add(bt, &th->th_boottime); + + /* + * Barrier for load of both tk->tk_current and th->th_gen. + */ + rmb(); + } while (curr != tk->tk_current || gen == 0 || gen != th->th_gen); + return (0); +} + +static struct vdso_timekeep *tk; + +int +__vdso_gettimeofday(struct timeval *tv, struct timezone *tz) +{ + struct bintime bt; + int error; + + if (tz != NULL) + return (ENOSYS); + if (tk == NULL) { + error = _elf_aux_info(AT_TIMEKEEP, &tk, sizeof(tk)); + if (error != 0 || tk == NULL) + return (ENOSYS); + } + if (tk->tk_ver != VDSO_TK_VER_CURR) + return (ENOSYS); + error = binuptime(&bt, tk, 1); + if (error != 0) + return (error); + bintime2timeval(&bt, tv); + return (0); +} + +int +__vdso_clock_gettime(clockid_t clock_id, struct timespec *ts) +{ + struct bintime bt; + int abs, error; + + if (tk == NULL) { + error = _elf_aux_info(AT_TIMEKEEP, &tk, sizeof(tk)); + if (error != 0 || tk == NULL) + return (ENOSYS); + } + if (tk->tk_ver != VDSO_TK_VER_CURR) + return (ENOSYS); + switch (clock_id) { + case CLOCK_REALTIME: + case CLOCK_REALTIME_PRECISE: + case CLOCK_REALTIME_FAST: + case CLOCK_SECOND: + abs = 1; + break; + case CLOCK_MONOTONIC: + case CLOCK_MONOTONIC_PRECISE: + case CLOCK_MONOTONIC_FAST: + case CLOCK_UPTIME: + case CLOCK_UPTIME_PRECISE: + case CLOCK_UPTIME_FAST: + abs = 0; + break; + default: + return (ENOSYS); + } + error = binuptime(&bt, tk, abs); + if (error != 0) + return (error); + bintime2timespec(&bt, ts); + if (clock_id == CLOCK_SECOND) + ts->tv_nsec = 0; + return (0); +} Copied: user/attilio/vmcontention/lib/libc/sys/clock_gettime.c (from r237466, head/lib/libc/sys/clock_gettime.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/sys/clock_gettime.c Sat Jun 23 02:08:15 2012 (r237467, copy of r237466, head/lib/libc/sys/clock_gettime.c) @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> + * + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/syscall.h> +#include <sys/time.h> +#include <sys/vdso.h> +#include <errno.h> +#include <time.h> +#include "libc_private.h" + +int __clock_gettime(clockid_t, struct timespec *ts); + +__weak_reference(__clock_gettime, clock_gettime); + +int +__clock_gettime(clockid_t clock_id, struct timespec *ts) +{ + int error; + + if (__vdso_clock_gettime != NULL && __vdso_gettc != NULL) + error = __vdso_clock_gettime(clock_id, ts); + else + error = ENOSYS; + if (error == ENOSYS) + error = __sys_clock_gettime(clock_id, ts); + return (error); +} Copied: user/attilio/vmcontention/lib/libc/sys/gettimeofday.c (from r237466, head/lib/libc/sys/gettimeofday.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/sys/gettimeofday.c Sat Jun 23 02:08:15 2012 (r237467, copy of r237466, head/lib/libc/sys/gettimeofday.c) @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> + * + * Redistribution and use in source and binary forms, with or without *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206230208.q5N28GEO013136>