From owner-svn-src-user@FreeBSD.ORG Sat Apr 6 13:12:11 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 60C5B61C; Sat, 6 Apr 2013 13:12:11 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 50DE8D38; Sat, 6 Apr 2013 13:12:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r36DCBLE095848; Sat, 6 Apr 2013 13:12:11 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r36DC6Kf095819; Sat, 6 Apr 2013 13:12:06 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201304061312.r36DC6Kf095819@svn.freebsd.org> From: Attilio Rao Date: Sat, 6 Apr 2013 13:12:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r249197 - in user/attilio/vmcontention: . bin/dd bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt cddl/co... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Apr 2013 13:12:11 -0000 Author: attilio Date: Sat Apr 6 13:12:05 2013 New Revision: 249197 URL: http://svnweb.freebsd.org/changeset/base/249197 Log: MFC Added: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh - copied unchanged from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh - copied unchanged from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh - copied unchanged from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d - copied unchanged from r249196, head/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d user/attilio/vmcontention/contrib/bmake/unit-tests/export-env - copied unchanged from r249196, head/contrib/bmake/unit-tests/export-env - copied from r249196, head/contrib/unbound/ user/attilio/vmcontention/etc/periodic/daily/401.status-graid - copied unchanged from r249196, head/etc/periodic/daily/401.status-graid user/attilio/vmcontention/share/man/man4/ctl.4 - copied unchanged from r249196, head/share/man/man4/ctl.4 user/attilio/vmcontention/sys/arm/include/at91_gpio.h - copied unchanged from r249196, head/sys/arm/include/at91_gpio.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asllistsup.c - copied unchanged from r249196, head/sys/contrib/dev/acpica/compiler/asllistsup.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asloffset.c - copied unchanged from r249196, head/sys/contrib/dev/acpica/compiler/asloffset.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utpredef.c - copied unchanged from r249196, head/sys/contrib/dev/acpica/components/utilities/utpredef.c user/attilio/vmcontention/sys/dev/cfi/cfi_bus_nexus.c - copied unchanged from r249196, head/sys/dev/cfi/cfi_bus_nexus.c user/attilio/vmcontention/sys/modules/ctl/ - copied from r249196, head/sys/modules/ctl/ user/attilio/vmcontention/sys/modules/cxgbe/t4_firmware/ - copied from r249196, head/sys/modules/cxgbe/t4_firmware/ user/attilio/vmcontention/tools/tools/cxgbetool/reg_defs_t5.c - copied unchanged from r249196, head/tools/tools/cxgbetool/reg_defs_t5.c Directory Properties: user/attilio/vmcontention/contrib/unbound/ (props changed) Deleted: user/attilio/vmcontention/etc/periodic/daily/405.status-ata-raid user/attilio/vmcontention/sbin/atacontrol/ user/attilio/vmcontention/share/man/man4/atapicam.4 user/attilio/vmcontention/share/man/man4/ataraid.4 user/attilio/vmcontention/sys/dev/ata/ata-disk.c user/attilio/vmcontention/sys/dev/ata/ata-disk.h user/attilio/vmcontention/sys/dev/ata/ata-raid-ddf.h user/attilio/vmcontention/sys/dev/ata/ata-raid.c user/attilio/vmcontention/sys/dev/ata/ata-raid.h user/attilio/vmcontention/sys/dev/ata/atapi-cam.c user/attilio/vmcontention/sys/dev/ata/atapi-cd.c user/attilio/vmcontention/sys/dev/ata/atapi-cd.h user/attilio/vmcontention/sys/dev/ata/atapi-fd.c user/attilio/vmcontention/sys/dev/ata/atapi-fd.h user/attilio/vmcontention/sys/dev/ata/atapi-tape.c user/attilio/vmcontention/sys/dev/ata/atapi-tape.h user/attilio/vmcontention/sys/modules/ata/atacam/ user/attilio/vmcontention/sys/modules/ata/atadisk/ user/attilio/vmcontention/sys/modules/ata/atapicam/ user/attilio/vmcontention/sys/modules/ata/atapicd/ user/attilio/vmcontention/sys/modules/ata/atapifd/ user/attilio/vmcontention/sys/modules/ata/atapist/ user/attilio/vmcontention/sys/modules/ata/ataraid/ user/attilio/vmcontention/sys/modules/cxgbe/firmware/ user/attilio/vmcontention/usr.sbin/bhyve/uart.c user/attilio/vmcontention/usr.sbin/burncd/ Modified: user/attilio/vmcontention/Makefile user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/bin/dd/dd.c user/attilio/vmcontention/bin/setfacl/setfacl.1 user/attilio/vmcontention/bin/sh/exec.c user/attilio/vmcontention/bin/sh/expand.c user/attilio/vmcontention/bin/sh/input.c user/attilio/vmcontention/bin/sh/input.h user/attilio/vmcontention/bin/sh/jobs.c user/attilio/vmcontention/bin/sh/main.c user/attilio/vmcontention/bin/sh/memalloc.c user/attilio/vmcontention/bin/sh/memalloc.h user/attilio/vmcontention/bin/sh/parser.c user/attilio/vmcontention/bin/sh/parser.h user/attilio/vmcontention/bin/sh/redir.c user/attilio/vmcontention/bin/sh/trap.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/attilio/vmcontention/cddl/contrib/opensolaris/tools/ctf/cvt/input.c user/attilio/vmcontention/contrib/bmake/ChangeLog user/attilio/vmcontention/contrib/bmake/FILES user/attilio/vmcontention/contrib/bmake/Makefile user/attilio/vmcontention/contrib/bmake/bmake.1 user/attilio/vmcontention/contrib/bmake/bmake.cat1 user/attilio/vmcontention/contrib/bmake/boot-strap user/attilio/vmcontention/contrib/bmake/configure user/attilio/vmcontention/contrib/bmake/configure.in user/attilio/vmcontention/contrib/bmake/dir.c user/attilio/vmcontention/contrib/bmake/job.c user/attilio/vmcontention/contrib/bmake/job.h user/attilio/vmcontention/contrib/bmake/main.c user/attilio/vmcontention/contrib/bmake/make.1 user/attilio/vmcontention/contrib/bmake/make.h user/attilio/vmcontention/contrib/bmake/meta.c user/attilio/vmcontention/contrib/bmake/meta.h user/attilio/vmcontention/contrib/bmake/mk/ChangeLog user/attilio/vmcontention/contrib/bmake/mk/dirdeps.mk user/attilio/vmcontention/contrib/bmake/mk/gendirdeps.mk user/attilio/vmcontention/contrib/bmake/mk/install-mk user/attilio/vmcontention/contrib/bmake/mk/meta.stage.mk user/attilio/vmcontention/contrib/bmake/mk/meta2deps.py user/attilio/vmcontention/contrib/bmake/mk/meta2deps.sh user/attilio/vmcontention/contrib/bmake/mk/sys.dependfile.mk user/attilio/vmcontention/contrib/bmake/parse.c user/attilio/vmcontention/contrib/bmake/unit-tests/Makefile.in user/attilio/vmcontention/contrib/bmake/unit-tests/test.exp user/attilio/vmcontention/contrib/bmake/var.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_disk_posix.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_extattr_freebsd.c user/attilio/vmcontention/crypto/openssh/krl.c user/attilio/vmcontention/crypto/openssh/readconf.c user/attilio/vmcontention/crypto/openssh/readconf.h user/attilio/vmcontention/crypto/openssh/ssh.c user/attilio/vmcontention/crypto/openssh/sshconnect2.c user/attilio/vmcontention/crypto/openssh/umac128.c user/attilio/vmcontention/etc/defaults/periodic.conf user/attilio/vmcontention/etc/mtree/BSD.usr.dist user/attilio/vmcontention/etc/periodic/daily/Makefile user/attilio/vmcontention/lib/libc/gen/wordexp.c user/attilio/vmcontention/lib/libc/stdlib/rand.3 user/attilio/vmcontention/lib/libc/stdlib/rand.c user/attilio/vmcontention/lib/libc/stdlib/random.3 user/attilio/vmcontention/lib/libc/stdlib/random.c user/attilio/vmcontention/lib/libc/sys/extattr_get_file.2 user/attilio/vmcontention/lib/libc/sys/getsockopt.2 user/attilio/vmcontention/lib/libpam/modules/pam_unix/pam_unix.c user/attilio/vmcontention/rescue/rescue/Makefile user/attilio/vmcontention/sbin/Makefile user/attilio/vmcontention/sbin/camcontrol/camcontrol.8 user/attilio/vmcontention/sbin/camcontrol/camcontrol.c user/attilio/vmcontention/sbin/geom/class/raid/graid.8 user/attilio/vmcontention/sbin/geom/class/stripe/gstripe.8 user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.c user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/ata.4 user/attilio/vmcontention/share/man/man4/igb.4 user/attilio/vmcontention/share/man/man5/devfs.conf.5 user/attilio/vmcontention/share/man/man5/periodic.conf.5 user/attilio/vmcontention/share/man/man5/rc.conf.5 user/attilio/vmcontention/share/man/man7/hier.7 user/attilio/vmcontention/share/misc/committers-ports.dot user/attilio/vmcontention/share/mk/sys.mk user/attilio/vmcontention/sys/amd64/conf/GENERIC user/attilio/vmcontention/sys/amd64/vmm/intel/vmx.c user/attilio/vmcontention/sys/amd64/vmm/io/vlapic.c user/attilio/vmcontention/sys/amd64/vmm/vmm_stat.c user/attilio/vmcontention/sys/amd64/vmm/vmm_stat.h user/attilio/vmcontention/sys/arm/arm/locore.S user/attilio/vmcontention/sys/arm/arm/machdep.c user/attilio/vmcontention/sys/arm/arm/vfp.c user/attilio/vmcontention/sys/arm/at91/at91_machdep.c user/attilio/vmcontention/sys/arm/at91/at91_mci.c user/attilio/vmcontention/sys/arm/at91/at91_pio.c user/attilio/vmcontention/sys/arm/at91/at91_piovar.h user/attilio/vmcontention/sys/arm/at91/at91_pmc.c user/attilio/vmcontention/sys/arm/at91/at91rm9200.c user/attilio/vmcontention/sys/arm/at91/at91rm9200_devices.c user/attilio/vmcontention/sys/arm/at91/uart_dev_at91usart.c user/attilio/vmcontention/sys/arm/conf/AC100 user/attilio/vmcontention/sys/arm/conf/ARMADAXP user/attilio/vmcontention/sys/arm/conf/AVILA user/attilio/vmcontention/sys/arm/conf/CAMBRIA user/attilio/vmcontention/sys/arm/conf/CRB user/attilio/vmcontention/sys/arm/conf/CUBIEBOARD user/attilio/vmcontention/sys/arm/conf/EFIKA_MX user/attilio/vmcontention/sys/arm/conf/EP80219 user/attilio/vmcontention/sys/arm/conf/IQ31244 user/attilio/vmcontention/sys/arm/conf/TS7800 user/attilio/vmcontention/sys/arm/include/machdep.h user/attilio/vmcontention/sys/arm/include/setjmp.h user/attilio/vmcontention/sys/arm/s3c2xx0/uart_dev_s3c2410.c user/attilio/vmcontention/sys/arm/sa11x0/uart_dev_sa1110.c user/attilio/vmcontention/sys/arm/ti/aintc.c user/attilio/vmcontention/sys/boot/arm/uboot/start.S user/attilio/vmcontention/sys/boot/common/util.c user/attilio/vmcontention/sys/boot/fdt/fdt_loader_cmd.c user/attilio/vmcontention/sys/cam/ata/ata_da.c user/attilio/vmcontention/sys/cam/ata/ata_xpt.c user/attilio/vmcontention/sys/cam/cam.c user/attilio/vmcontention/sys/cam/cam.h user/attilio/vmcontention/sys/cam/cam_periph.c user/attilio/vmcontention/sys/cam/cam_periph.h user/attilio/vmcontention/sys/cam/cam_sim.c user/attilio/vmcontention/sys/cam/cam_xpt.c user/attilio/vmcontention/sys/cam/cam_xpt_sim.h user/attilio/vmcontention/sys/cam/ctl/README.ctl.txt user/attilio/vmcontention/sys/cam/ctl/ctl.c user/attilio/vmcontention/sys/cam/ctl/ctl_backend_block.c user/attilio/vmcontention/sys/cam/ctl/ctl_frontend_cam_sim.c user/attilio/vmcontention/sys/cam/ctl/ctl_frontend_internal.c user/attilio/vmcontention/sys/cam/ctl/scsi_ctl.c user/attilio/vmcontention/sys/cam/scsi/scsi_all.c user/attilio/vmcontention/sys/cam/scsi/scsi_all.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_pass.c user/attilio/vmcontention/sys/cam/scsi/scsi_xpt.c user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/sdt.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h 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/linux/linux_file.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files 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/ahpredef.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompile.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompiler.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asldefine.h 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/aslglobal.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asllisting.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslmain.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslpredef.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslprepkg.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslresource.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asltypes.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslwalks.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/dbmethod.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/debugger/dbnames.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/dispatcher/dswexec.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/events/evevent.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/executer/exoparg2.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/namespace/nseval.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/namespace/nspredef.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/tables/tbfadt.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/tables/tbxface.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utdelete.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utmutex.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utosi.c user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/utxface.c 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/acnamesp.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/dev/ahci/ahciem.c user/attilio/vmcontention/sys/dev/ata/ata-all.c user/attilio/vmcontention/sys/dev/ata/ata-all.h user/attilio/vmcontention/sys/dev/ata/ata-cbus.c user/attilio/vmcontention/sys/dev/ata/ata-dma.c user/attilio/vmcontention/sys/dev/ata/ata-lowlevel.c user/attilio/vmcontention/sys/dev/ata/ata-pci.c user/attilio/vmcontention/sys/dev/ata/ata-pci.h user/attilio/vmcontention/sys/dev/ata/ata-queue.c user/attilio/vmcontention/sys/dev/ata/ata-sata.c user/attilio/vmcontention/sys/dev/ata/ata_if.m user/attilio/vmcontention/sys/dev/ata/chipsets/ata-acard.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-acerlabs.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-intel.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-ite.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-serverworks.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-siliconimage.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_debug.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_internal.h user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h user/attilio/vmcontention/sys/dev/ath/if_ath_rx.c user/attilio/vmcontention/sys/dev/ath/if_ath_rx.h user/attilio/vmcontention/sys/dev/ath/if_ath_rx_edma.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/bge/if_bge.c user/attilio/vmcontention/sys/dev/ciss/ciss.c 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_hw.h user/attilio/vmcontention/sys/dev/cxgbe/common/t4_msg.h user/attilio/vmcontention/sys/dev/cxgbe/common/t4_regs.h user/attilio/vmcontention/sys/dev/cxgbe/osdep.h user/attilio/vmcontention/sys/dev/cxgbe/t4_ioctl.h user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c user/attilio/vmcontention/sys/dev/cxgbe/t4_sge.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_connect.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_cpl_io.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_ddp.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_listen.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_tom.c user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_tom.h user/attilio/vmcontention/sys/dev/drm2/drm_edid.c user/attilio/vmcontention/sys/dev/drm2/i915/intel_iic.c user/attilio/vmcontention/sys/dev/drm2/i915/intel_modes.c user/attilio/vmcontention/sys/dev/drm2/i915/intel_sdvo.c user/attilio/vmcontention/sys/dev/e1000/if_em.c user/attilio/vmcontention/sys/dev/e1000/if_igb.c user/attilio/vmcontention/sys/dev/e1000/if_igb.h user/attilio/vmcontention/sys/dev/e1000/if_lem.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.c user/attilio/vmcontention/sys/dev/hwpmc/pmc_events.h user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c user/attilio/vmcontention/sys/dev/md/md.c user/attilio/vmcontention/sys/dev/nvd/nvd.c user/attilio/vmcontention/sys/dev/nvme/nvme.h user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr.c user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr_cmd.c user/attilio/vmcontention/sys/dev/nvme/nvme_ns.c user/attilio/vmcontention/sys/dev/nvme/nvme_ns_cmd.c user/attilio/vmcontention/sys/dev/nvme/nvme_private.h user/attilio/vmcontention/sys/dev/nvme/nvme_qpair.c user/attilio/vmcontention/sys/dev/tws/tws_cam.c user/attilio/vmcontention/sys/dev/tws/tws_user.c user/attilio/vmcontention/sys/dev/uart/uart_core.c user/attilio/vmcontention/sys/dev/uart/uart_dev_imx.c user/attilio/vmcontention/sys/dev/uart/uart_dev_pl011.c user/attilio/vmcontention/sys/dev/uart/uart_dev_quicc.c user/attilio/vmcontention/sys/dev/uart/uart_dev_sab82532.c user/attilio/vmcontention/sys/dev/uart/uart_dev_z8530.c user/attilio/vmcontention/sys/dev/usb/misc/udbp.c user/attilio/vmcontention/sys/dev/usb/usb_device.c user/attilio/vmcontention/sys/dev/usb/usbdevs user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/geom/geom_dev.c user/attilio/vmcontention/sys/geom/geom_disk.c user/attilio/vmcontention/sys/i386/conf/GENERIC user/attilio/vmcontention/sys/i386/conf/XBOX user/attilio/vmcontention/sys/ia64/conf/GENERIC user/attilio/vmcontention/sys/kern/init_main.c user/attilio/vmcontention/sys/kern/init_sysent.c user/attilio/vmcontention/sys/kern/kern_intr.c user/attilio/vmcontention/sys/kern/kern_sig.c user/attilio/vmcontention/sys/kern/subr_bus_dma.c user/attilio/vmcontention/sys/kern/sys_pipe.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/uipc_mbuf.c user/attilio/vmcontention/sys/kern/uipc_sockbuf.c user/attilio/vmcontention/sys/kern/uipc_socket.c user/attilio/vmcontention/sys/kern/vfs_extattr.c user/attilio/vmcontention/sys/kern/vfs_lookup.c user/attilio/vmcontention/sys/kern/vfs_vnops.c user/attilio/vmcontention/sys/mips/adm5120/uart_dev_adm5120.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_setup.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_setup.h user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.c user/attilio/vmcontention/sys/mips/atheros/ar933xreg.h user/attilio/vmcontention/sys/mips/atheros/if_arge.c user/attilio/vmcontention/sys/mips/atheros/uart_dev_ar933x.c user/attilio/vmcontention/sys/mips/conf/AP121 user/attilio/vmcontention/sys/mips/conf/AP121.hints user/attilio/vmcontention/sys/mips/conf/AR933X_BASE user/attilio/vmcontention/sys/mips/conf/OCTEON1 user/attilio/vmcontention/sys/mips/conf/XLR user/attilio/vmcontention/sys/mips/conf/XLR64 user/attilio/vmcontention/sys/mips/conf/XLRN32 user/attilio/vmcontention/sys/mips/conf/std.SWARM user/attilio/vmcontention/sys/mips/conf/std.XLP user/attilio/vmcontention/sys/mips/malta/std.malta user/attilio/vmcontention/sys/mips/rt305x/uart_dev_rt305x.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/modules/ata/Makefile user/attilio/vmcontention/sys/modules/cxgbe/Makefile user/attilio/vmcontention/sys/modules/dtrace/dtrace/Makefile user/attilio/vmcontention/sys/modules/igb/Makefile user/attilio/vmcontention/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c user/attilio/vmcontention/sys/netgraph/ng_ksocket.c user/attilio/vmcontention/sys/netinet/sctp_constants.h user/attilio/vmcontention/sys/netinet/tcp_input.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_sockopt.c user/attilio/vmcontention/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c user/attilio/vmcontention/sys/pc98/conf/GENERIC user/attilio/vmcontention/sys/pc98/conf/NOTES user/attilio/vmcontention/sys/powerpc/aim/trap.c user/attilio/vmcontention/sys/powerpc/conf/GENERIC user/attilio/vmcontention/sys/powerpc/conf/GENERIC64 user/attilio/vmcontention/sys/powerpc/conf/MPC85XX user/attilio/vmcontention/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c user/attilio/vmcontention/sys/sparc64/conf/GENERIC user/attilio/vmcontention/sys/sparc64/pci/sbbc.c user/attilio/vmcontention/sys/sys/ata.h user/attilio/vmcontention/sys/sys/bus.h user/attilio/vmcontention/sys/sys/bus_dma.h user/attilio/vmcontention/sys/sys/extattr.h user/attilio/vmcontention/sys/sys/proc.h user/attilio/vmcontention/sys/sys/socket.h user/attilio/vmcontention/sys/sys/syscall.h user/attilio/vmcontention/sys/sys/syscall.mk user/attilio/vmcontention/sys/sys/syscallsubr.h user/attilio/vmcontention/sys/sys/sysproto.h user/attilio/vmcontention/sys/sys/systm.h user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c user/attilio/vmcontention/sys/vm/vm_radix.c user/attilio/vmcontention/sys/x86/x86/busdma_machdep.c user/attilio/vmcontention/tools/regression/lib/libc/gen/test-wordexp.c user/attilio/vmcontention/tools/tools/cxgbetool/cxgbetool.c user/attilio/vmcontention/usr.bin/bmake/Makefile user/attilio/vmcontention/usr.bin/bmake/config.h user/attilio/vmcontention/usr.bin/bmake/unit-tests/Makefile user/attilio/vmcontention/usr.bin/calendar/calendars/calendar.freebsd user/attilio/vmcontention/usr.bin/ctlstat/ctlstat.8 user/attilio/vmcontention/usr.sbin/Makefile user/attilio/vmcontention/usr.sbin/acpi/acpidb/Makefile user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile user/attilio/vmcontention/usr.sbin/bhyve/Makefile user/attilio/vmcontention/usr.sbin/bhyve/mptbl.c user/attilio/vmcontention/usr.sbin/bhyvectl/bhyvectl.c user/attilio/vmcontention/usr.sbin/bluetooth/ath3kfw/ath3kfw.c user/attilio/vmcontention/usr.sbin/bsdconfig/share/device.subr user/attilio/vmcontention/usr.sbin/ctladm/ctladm.8 user/attilio/vmcontention/usr.sbin/extattr/rmextattr.c user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bmake/ (props changed) user/attilio/vmcontention/contrib/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/libarchive/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/lib/libc/ (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/amd64/vmm/ (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/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/namespace/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/tables/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/components/utilities/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/include/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) user/attilio/vmcontention/usr.sbin/bhyve/ (props changed) user/attilio/vmcontention/usr.sbin/bhyvectl/ (props changed) Modified: user/attilio/vmcontention/Makefile ============================================================================== --- user/attilio/vmcontention/Makefile Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/Makefile Sat Apr 6 13:12:05 2013 (r249197) @@ -392,6 +392,14 @@ universe_${target}_${target_arch}: unive .endfor .endif .if !defined(MAKE_JUST_WORLDS) +# If we are building world and kernels wait for the required worlds to finish +.if !defined(MAKE_JUST_KERNELS) +.for target_arch in ${TARGET_ARCHES_${target}} +universe_${target}_kernels: universe_${target}_${target_arch} +.endfor +.endif +universe_${target}: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_prologue .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/Makefile.inc1 Sat Apr 6 13:12:05 2013 (r249197) @@ -1743,13 +1743,15 @@ XDTP=/usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ - _SHLIBDIRPREFIX=${XDTP} \ - TOOLS_PREFIX=${XDTP} -CD2ENV=${CDENV} \ + _SHLIBDIRPREFIX=${XDDESTDIR} \ + TOOLS_PREFIX=${XDDESTDIR} +CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ + -B${XDDESTDIR}/usr/lib +CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \ MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH} -CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp -CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp +CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} XDDESTDIR=${DESTDIR}${XDTP} .if !defined(OSREL) @@ -1759,8 +1761,24 @@ OSREL!= uname -r | sed -e 's/[-(].*//' .ORDER: xdev-build xdev-install xdev: xdev-build xdev-install -.ORDER: _xb-build-tools _xb-cross-tools -xdev-build: _xb-build-tools _xb-cross-tools +.ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools +xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools + +_xb-worldtmp: + mkdir -p ${CDTMP}/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${CDTMP}/usr >/dev/null + +_xb-bootstrap-tools: +.for _tool in \ + ${_clang_tblgen} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all; \ + ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install +.endfor _xb-build-tools: ${_+_}@cd ${.CURDIR}; \ @@ -1770,7 +1788,9 @@ _xb-cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar + usr.bin/ar \ + ${_clang_libs} \ + ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ obj; \ @@ -1796,7 +1816,8 @@ _xi-cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar + usr.bin/ar \ + ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/ObsoleteFiles.inc Sat Apr 6 13:12:05 2013 (r249197) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20130404: legacy ATA stack removed +OLD_FILES+=sbin/atacontrol +OLD_FILES+=usr/share/man/man8/atacontrol.8.gz +OLD_FILES+=usr/share/man/man4/atapicam.4.gz +OLD_FILES+=usr/share/man/man4/ataraid.4.gz +OLD_FILES+=usr/sbin/burncd +OLD_FILES+=usr/share/man/man8/burncd.8.gz # 20130316: vinum.4 removed OLD_FILES+=usr/share/man/man4/vinum.4.gz # 20130312: fortunes-o removed Modified: user/attilio/vmcontention/bin/dd/dd.c ============================================================================== --- user/attilio/vmcontention/bin/dd/dd.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/dd/dd.c Sat Apr 6 13:12:05 2013 (r249197) @@ -98,6 +98,13 @@ main(int argc __unused, char *argv[]) dd_in(); dd_close(); + /* + * Some devices such as cfi(4) may perform significant amounts + * of work when a write descriptor is closed. Close the out + * descriptor explicitly so that the summary handler (called + * from an atexit() hook) includes this work. + */ + close(out.fd); exit(0); } Modified: user/attilio/vmcontention/bin/setfacl/setfacl.1 ============================================================================== --- user/attilio/vmcontention/bin/setfacl/setfacl.1 Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/setfacl/setfacl.1 Sat Apr 6 13:12:05 2013 (r249197) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2013 +.Dd April 1, 2013 .Dt SETFACL 1 .Os .Sh NAME @@ -401,6 +401,10 @@ NFSv4 ACL entries are evaluated in their .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +Note that the file owner is always granted the read_acl, write_acl, +read_attributes, and write_attributes permissions, even if the ACL +would deny it. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES Modified: user/attilio/vmcontention/bin/sh/exec.c ============================================================================== --- user/attilio/vmcontention/bin/sh/exec.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/exec.c Sat Apr 6 13:12:05 2013 (r249197) @@ -165,7 +165,7 @@ tryexec(char *cmd, char **argv, char **e } } *argv = cmd; - *--argv = _PATH_BSHELL; + *--argv = __DECONST(char *, _PATH_BSHELL); execve(_PATH_BSHELL, argv, envp); } errno = e; @@ -188,7 +188,7 @@ padvance(const char **path, const char * { const char *p, *start; char *q; - int len; + size_t len; if (*path == NULL) return NULL; Modified: user/attilio/vmcontention/bin/sh/expand.c ============================================================================== --- user/attilio/vmcontention/bin/sh/expand.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/expand.c Sat Apr 6 13:12:05 2013 (r249197) @@ -460,7 +460,7 @@ expbackq(union node *cmd, int quoted, in int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - int nnl; + size_t nnl; INTOFF; saveifs = ifsfirst; @@ -1163,9 +1163,9 @@ nometa: static void expmeta(char *enddir, char *name) { - char *p; - char *q; - char *start; + const char *p; + const char *q; + const char *start; char *endname; int metaflag; struct stat statb; @@ -1229,7 +1229,7 @@ expmeta(char *enddir, char *name) addfname(expdir); return; } - endname = p; + endname = name + (p - name); if (start != name) { p = name; while (p < start) { @@ -1412,7 +1412,8 @@ match_charclass(const char *p, wchar_t c *end = NULL; p++; nameend = strstr(p, ":]"); - if (nameend == NULL || nameend - p >= sizeof(name) || nameend == p) + if (nameend == NULL || (size_t)(nameend - p) >= sizeof(name) || + nameend == p) return 0; memcpy(name, p, nameend - p); name[nameend - p] = '\0'; Modified: user/attilio/vmcontention/bin/sh/input.c ============================================================================== --- user/attilio/vmcontention/bin/sh/input.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/input.c Sat Apr 6 13:12:05 2013 (r249197) @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); struct strpush { struct strpush *prev; /* preceding string on stack */ - char *prevstring; + const char *prevstring; int prevnleft; int prevlleft; struct alias *ap; /* if push was associated with an alias */ @@ -83,7 +83,7 @@ struct parsefile { int fd; /* file descriptor (or -1 if string) */ int nleft; /* number of chars left in this line */ int lleft; /* number of lines left in this buffer */ - char *nextc; /* next char in buffer */ + const char *nextc; /* next char in buffer */ char *buf; /* input buffer */ struct strpush *strpush; /* for pushing strings at this level */ struct strpush basestrpush; /* so pushing one is fast */ @@ -93,7 +93,7 @@ struct parsefile { int plinno = 1; /* input line number */ int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ -char *parsenextc; /* copy of parsefile->nextc */ +const char *parsenextc; /* copy of parsefile->nextc */ static char basebuf[BUFSIZ + 1];/* buffer for top level input file */ static struct parsefile basepf = { /* top level input file */ .nextc = basebuf, @@ -185,7 +185,7 @@ retry: nr = el_len; if (nr > BUFSIZ) nr = BUFSIZ; - memcpy(parsenextc, rl_cp, nr); + memcpy(parsefile->buf, rl_cp, nr); if (nr != el_len) { el_len -= nr; rl_cp += nr; @@ -194,7 +194,7 @@ retry: } } else #endif - nr = read(parsefile->fd, parsenextc, BUFSIZ); + nr = read(parsefile->fd, parsefile->buf, BUFSIZ); if (nr <= 0) { if (nr < 0) { @@ -252,7 +252,7 @@ again: } } - q = p = parsenextc; + q = p = parsefile->buf + (parsenextc - parsefile->buf); /* delete nul characters */ something = 0; @@ -439,7 +439,7 @@ setinputfd(int fd, int push) */ void -setinputstring(char *string, int push) +setinputstring(const char *string, int push) { INTOFF; if (push) Modified: user/attilio/vmcontention/bin/sh/input.h ============================================================================== --- user/attilio/vmcontention/bin/sh/input.h Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/input.h Sat Apr 6 13:12:05 2013 (r249197) @@ -42,7 +42,7 @@ */ extern int plinno; extern int parsenleft; /* number of characters left in input buffer */ -extern char *parsenextc; /* next character in input buffer */ +extern const char *parsenextc; /* next character in input buffer */ struct alias; struct parsefile; @@ -55,7 +55,7 @@ void pungetc(void); void pushstring(char *, int, struct alias *); void setinputfile(const char *, int); void setinputfd(int, int); -void setinputstring(char *, int); +void setinputstring(const char *, int); void popfile(void); struct parsefile *getcurrentfile(void); void popfilesupto(struct parsefile *); Modified: user/attilio/vmcontention/bin/sh/jobs.c ============================================================================== --- user/attilio/vmcontention/bin/sh/jobs.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/jobs.c Sat Apr 6 13:12:05 2013 (r249197) @@ -668,7 +668,8 @@ makejob(union node *node __unused, int n jobtab = jp; } jp = jobtab + njobs; - for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0); + for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0) + ; INTON; break; } @@ -1005,7 +1006,7 @@ waitforjob(struct job *jp, int *origstat static void -dummy_handler(int sig) +dummy_handler(int sig __unused) { } Modified: user/attilio/vmcontention/bin/sh/main.c ============================================================================== --- user/attilio/vmcontention/bin/sh/main.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/main.c Sat Apr 6 13:12:05 2013 (r249197) @@ -80,7 +80,7 @@ struct jmploc main_handler; int localeisutf8, initial_localeisutf8; static void cmdloop(int); -static void read_profile(char *); +static void read_profile(const char *); static char *find_dot_file(char *); /* @@ -239,7 +239,7 @@ cmdloop(int top) */ static void -read_profile(char *name) +read_profile(const char *name) { int fd; const char *expandedname; Modified: user/attilio/vmcontention/bin/sh/memalloc.c ============================================================================== --- user/attilio/vmcontention/bin/sh/memalloc.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/memalloc.c Sat Apr 6 13:12:05 2013 (r249197) @@ -233,7 +233,8 @@ growstackblock(int min) if (min < stacknleft) min = stacknleft; - if (min >= INT_MAX / 2 - ALIGN(sizeof(struct stack_block))) + if ((unsigned int)min >= + INT_MAX / 2 - ALIGN(sizeof(struct stack_block))) error("Out of space"); min += stacknleft; min += ALIGN(sizeof(struct stack_block)); @@ -327,7 +328,7 @@ makestrspace(int min, char *p) char * -stputbin(const char *data, int len, char *p) +stputbin(const char *data, size_t len, char *p) { CHECKSTRSPACE(len, p); memcpy(p, data, len); Modified: user/attilio/vmcontention/bin/sh/memalloc.h ============================================================================== --- user/attilio/vmcontention/bin/sh/memalloc.h Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/memalloc.h Sat Apr 6 13:12:05 2013 (r249197) @@ -57,7 +57,7 @@ void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); char *makestrspace(int, char *); -char *stputbin(const char *data, int len, char *p); +char *stputbin(const char *data, size_t len, char *p); char *stputs(const char *data, char *p); @@ -67,7 +67,7 @@ char *stputs(const char *data, char *p); #define grabstackblock(n) stalloc(n) #define STARTSTACKSTR(p) p = stackblock() #define STPUTC(c, p) do { if (p == sstrend) p = growstackstr(); *p++ = (c); } while(0) -#define CHECKSTRSPACE(n, p) { if (sstrend - p < n) p = makestrspace(n, p); } +#define CHECKSTRSPACE(n, p) { if ((size_t)(sstrend - p) < n) p = makestrspace(n, p); } #define USTPUTC(c, p) (*p++ = (c)) /* * STACKSTRNUL's use is where we want to be able to turn a stack Modified: user/attilio/vmcontention/bin/sh/parser.c ============================================================================== --- user/attilio/vmcontention/bin/sh/parser.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/parser.c Sat Apr 6 13:12:05 2013 (r249197) @@ -119,7 +119,7 @@ static void parseheredoc(void); static int peektoken(void); static int readtoken(void); static int xxreadtoken(void); -static int readtoken1(int, char const *, char *, int); +static int readtoken1(int, const char *, const char *, int); static int noexpand(char *); static void synexpect(int) __dead2; static void synerror(const char *) __dead2; @@ -983,7 +983,7 @@ parsebackq(char *out, struct nodelist ** char *volatile str; struct jmploc jmploc; struct jmploc *const savehandler = handler; - int savelen; + size_t savelen; int saveprompt; const int bq_startlinno = plinno; char *volatile ostr = NULL; @@ -1300,7 +1300,8 @@ readcstyleesc(char *out) #define PARSEARITH() {goto parsearith; parsearith_return:;} static int -readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, const char *eofmark, + int striptabs) { int c = firstc; char *out; @@ -1521,7 +1522,7 @@ checkend: { } if (c == *eofmark) { if (pfgets(line, sizeof line) != NULL) { - char *p, *q; + const char *p, *q; p = line; for (q = eofmark + 1 ; *q && *p == *q ; p++, q++); @@ -2038,7 +2039,7 @@ getprompt(void *unused __unused) const char * -expandstr(char *ps) +expandstr(const char *ps) { union node n; struct jmploc jmploc; Modified: user/attilio/vmcontention/bin/sh/parser.h ============================================================================== --- user/attilio/vmcontention/bin/sh/parser.h Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/parser.h Sat Apr 6 13:12:05 2013 (r249197) @@ -82,4 +82,4 @@ void fixredir(union node *, const char * int goodname(const char *); int isassignment(const char *); char *getprompt(void *); -const char *expandstr(char *); +const char *expandstr(const char *); Modified: user/attilio/vmcontention/bin/sh/redir.c ============================================================================== --- user/attilio/vmcontention/bin/sh/redir.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/redir.c Sat Apr 6 13:12:05 2013 (r249197) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #define EMPTY -2 /* marks an unused slot in redirtab */ #define CLOSED -1 /* fd was not open before redir */ -#define PIPESIZE 4096 /* amount of buffering in a pipe */ MKINIT @@ -253,7 +252,9 @@ openhere(union node *redir) { char *p; int pip[2]; - int len = 0; + size_t len = 0; + int flags; + ssize_t written = 0; if (pipe(pip) < 0) error("Pipe call failed: %s", strerror(errno)); @@ -263,9 +264,16 @@ openhere(union node *redir) else p = redir->nhere.doc->narg.text; len = strlen(p); - if (len <= PIPESIZE) { - xwrite(pip[1], p, len); + if (len == 0) goto out; + flags = fcntl(pip[1], F_GETFL, 0); + if (flags != -1 && fcntl(pip[1], F_SETFL, flags | O_NONBLOCK) != -1) { + written = write(pip[1], p, len); + if (written < 0) + written = 0; + if ((size_t)written == len) + goto out; + fcntl(pip[1], F_SETFL, flags); } if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) { @@ -275,7 +283,7 @@ openhere(union node *redir) signal(SIGHUP, SIG_IGN); signal(SIGTSTP, SIG_IGN); signal(SIGPIPE, SIG_DFL); - xwrite(pip[1], p, len); + xwrite(pip[1], p + written, len - written); _exit(0); } out: Modified: user/attilio/vmcontention/bin/sh/trap.c ============================================================================== --- user/attilio/vmcontention/bin/sh/trap.c Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/bin/sh/trap.c Sat Apr 6 13:12:05 2013 (r249197) @@ -150,7 +150,7 @@ printsignals(void) * The trap builtin. */ int -trapcmd(int argc, char **argv) +trapcmd(int argc __unused, char **argv) { char *action; int signo; Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst Sat Apr 6 13:12:05 2013 (r249197) @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Exception list: names tests that are bypassed when running in Java # mode (relative to /opt/SUNWdtrt/tst) @@ -52,14 +51,17 @@ common/usdt/tst.enabled.ksh common/usdt/tst.enabled2.ksh common/usdt/tst.entryreturn.ksh common/usdt/tst.fork.ksh -common/usdt/tst.header.ksh common/usdt/tst.guess32.ksh common/usdt/tst.guess64.ksh +common/usdt/tst.header.ksh common/usdt/tst.linkpriv.ksh common/usdt/tst.linkunpriv.ksh common/usdt/tst.multiple.ksh common/usdt/tst.nodtrace.ksh +common/usdt/tst.noreap.ksh +common/usdt/tst.noreapring.ksh common/usdt/tst.onlyenabled.ksh +common/usdt/tst.reap.ksh common/usdt/tst.reeval.ksh common/usdt/tst.static.ksh common/usdt/tst.static2.ksh Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh (from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Sat Apr 6 13:12:05 2013 (r249197, copy of r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh) @@ -0,0 +1,128 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c < +#include + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d < 10/ + { + exit(0); + } +EOF +} + +script 2>&1 | tee test.out + +# +# It should be true that our probe was not reaped after the provider was made +# defunct: the speculative tracing action prevents reaping of any ECB in the +# enabling. +# +status=0 + +if grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 ; then + status=1 +else + grep D_PROC_GRAB test.out 2> /dev/null 1>&2 + status=$? +fi + +cd / +/usr/bin/rm -rf $DIR + +exit $status Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh (from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Sat Apr 6 13:12:05 2013 (r249197, copy of r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh) @@ -0,0 +1,124 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c < +#include + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d < 10/ + { + exit(0); + } +EOF +} + +$dtrace -x bufpolicy=ring -ZwqP test_prov\* > /dev/null 2>&1 & +background=$! +echo launched ring buffered enabling as pid $background +script 2>&1 | tee test.out + +# +# It should be true that our probe was not reaped after the provider was made +# defunct: the active ring buffer in the earlier enabling prevents reaping of +# any of the earlier enabling's ECBs. +# +status=0 + +if grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 ; then + status=1 +else + grep D_PROC_GRAB test.out 2> /dev/null 1>&2 + status=$? +fi + +kill $background +cd / +/usr/bin/rm -rf $DIR + +exit $status Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh (from r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Sat Apr 6 13:12:05 2013 (r249197, copy of r249196, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh) @@ -0,0 +1,115 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c < +#include + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d < 10/ + { + exit(0); + } +EOF +} + +script 2>&1 | tee test.out + +# +# It should be true that our probe was reaped over the course of the enabling, +# causing the embedded DTrace invocation to fail on an invalid probe (that is, +# D_PDESC_INVAL) instead of an inability to grab the underlying process +# (D_PROC_GRAB). +# +grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 +status=$? + +cd / +/usr/bin/rm -rf $DIR + +exit $status Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Apr 6 11:54:41 2013 (r249196) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Apr 6 13:12:05 2013 (r249197) @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ @@ -86,6 +87,9 @@ extern "C" { #include #include #include +#ifdef illumos +#include "zfs.h" +#endif #define ZFS_EXPORTS_PATH "/etc/zfs/exports" @@ -133,28 +137,64 @@ extern int aok; #ifdef DTRACE_PROBE #undef DTRACE_PROBE -#define DTRACE_PROBE(a) ((void)0) #endif /* DTRACE_PROBE */ +#ifdef illumos +#define DTRACE_PROBE(a) \ + ZFS_PROBE0(#a) +#endif #ifdef DTRACE_PROBE1 #undef DTRACE_PROBE1 -#define DTRACE_PROBE1(a, b, c) ((void)0) #endif /* DTRACE_PROBE1 */ +#ifdef illumos +#define DTRACE_PROBE1(a, b, c) \ + ZFS_PROBE1(#a, (unsigned long)c) +#endif #ifdef DTRACE_PROBE2 #undef DTRACE_PROBE2 -#define DTRACE_PROBE2(a, b, c, d, e) ((void)0) #endif /* DTRACE_PROBE2 */ +#ifdef illumos +#define DTRACE_PROBE2(a, b, c, d, e) \ + ZFS_PROBE2(#a, (unsigned long)c, (unsigned long)e) +#endif #ifdef DTRACE_PROBE3 #undef DTRACE_PROBE3 -#define DTRACE_PROBE3(a, b, c, d, e, f, g) ((void)0) #endif /* DTRACE_PROBE3 */ +#ifdef illumos +#define DTRACE_PROBE3(a, b, c, d, e, f, g) \ + ZFS_PROBE3(#a, (unsigned long)c, (unsigned long)e, (unsigned long)g) +#endif #ifdef DTRACE_PROBE4 #undef DTRACE_PROBE4 -#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0) #endif /* DTRACE_PROBE4 */ +#ifdef illumos +#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) \ + ZFS_PROBE4(#a, (unsigned long)c, (unsigned long)e, (unsigned long)g, \ + (unsigned long)i) +#endif + +#ifdef illumos +/* + * We use the comma operator so that this macro can be used without much + * additional code. For example, "return (EINVAL);" becomes + * "return (SET_ERROR(EINVAL));". Note that the argument will be evaluated + * twice, so it should not have side effects (e.g. something like: + * "return (SET_ERROR(log_error(EINVAL, info)));" would log the error twice). + */ +#define SET_ERROR(err) (ZFS_SET_ERROR(err), err) +#else /* !illumos */ + +#define DTRACE_PROBE(a) ((void)0) +#define DTRACE_PROBE1(a, b, c) ((void)0) +#define DTRACE_PROBE2(a, b, c, d, e) ((void)0) +#define DTRACE_PROBE3(a, b, c, d, e, f, g) ((void)0) +#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0) + +#define SET_ERROR(err) (err) +#endif /* !illumos */ /* * Threads Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d (from r249196, head/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d Sat Apr 6 13:12:05 2013 (r249197, copy of r249196, head/cddl/contrib/opensolaris/lib/libzpool/common/zfs.d) @@ -0,0 +1,36 @@ +/* + * CDDL HEADER START + * + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + * + * CDDL HEADER END + */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***