From owner-svn-src-user@FreeBSD.ORG Fri Apr 19 11:06:26 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E10D8740; Fri, 19 Apr 2013 11:06:26 +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 D0C38D6C; Fri, 19 Apr 2013 11:06:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3JB6QUF004571; Fri, 19 Apr 2013 11:06:26 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3JB6L6l003830; Fri, 19 Apr 2013 11:06:21 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201304191106.r3JB6L6l003830@svn.freebsd.org> From: Attilio Rao Date: Fri, 19 Apr 2013 11:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r249647 - in user/attilio/vmcontention: cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs... 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: Fri, 19 Apr 2013 11:06:27 -0000 Author: attilio Date: Fri Apr 19 11:06:20 2013 New Revision: 249647 URL: http://svnweb.freebsd.org/changeset/base/249647 Log: MFC Added: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d - copied unchanged from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d user/attilio/vmcontention/sys/fs/nfsserver/nfs_fha_new.c - copied unchanged from r249646, head/sys/fs/nfsserver/nfs_fha_new.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_fha_new.h - copied unchanged from r249646, head/sys/fs/nfsserver/nfs_fha_new.h user/attilio/vmcontention/sys/nfs/nfs_fha.c - copied unchanged from r249646, head/sys/nfs/nfs_fha.c user/attilio/vmcontention/sys/nfs/nfs_fha.h - copied unchanged from r249646, head/sys/nfs/nfs_fha.h user/attilio/vmcontention/sys/nfsserver/nfs_fha_old.c - copied unchanged from r249646, head/sys/nfsserver/nfs_fha_old.c user/attilio/vmcontention/sys/nfsserver/nfs_fha_old.h - copied unchanged from r249646, head/sys/nfsserver/nfs_fha_old.h Deleted: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cg/ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.assigncast1.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.assigncast2.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal3.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.h user/attilio/vmcontention/sys/nfsserver/nfs_fha.c user/attilio/vmcontention/sys/nfsserver/nfs_fha.h Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmcontention/cddl/lib/libdtrace/Makefile user/attilio/vmcontention/cddl/lib/libdtrace/nfs.d user/attilio/vmcontention/cddl/lib/libdtrace/nfssrv.d user/attilio/vmcontention/contrib/binutils/include/elf/common.h user/attilio/vmcontention/contrib/gdb/gdb/osabi.c user/attilio/vmcontention/etc/rc.d/sshd user/attilio/vmcontention/include/rpcsvc/ypxfrd.x user/attilio/vmcontention/lib/Makefile user/attilio/vmcontention/lib/libc/gen/pututxline.c user/attilio/vmcontention/lib/libc/gen/sem_wait.3 user/attilio/vmcontention/lib/libc/i386/string/memchr.S user/attilio/vmcontention/lib/libc/i386/string/strchr.S user/attilio/vmcontention/lib/libc/i386/string/strrchr.S user/attilio/vmcontention/lib/libc/stdlib/realpath.c user/attilio/vmcontention/lib/libstand/Makefile user/attilio/vmcontention/lib/libstand/mips/_setjmp.S user/attilio/vmcontention/lib/libthr/thread/thr_sig.c user/attilio/vmcontention/lib/libz/zlib.h user/attilio/vmcontention/share/i18n/csmapper/KAZAKH/KZ1048%UCS.src user/attilio/vmcontention/share/i18n/csmapper/KAZAKH/UCS%KZ1048.src user/attilio/vmcontention/share/man/man5/rc.conf.5 user/attilio/vmcontention/sys/amd64/amd64/identcpu.c user/attilio/vmcontention/sys/amd64/include/xen/xen-os.h user/attilio/vmcontention/sys/arm/include/sysarch.h user/attilio/vmcontention/sys/arm/ti/omap4/omap4_prcm_clks.c user/attilio/vmcontention/sys/arm/xscale/ixp425/ixp425_npe.c user/attilio/vmcontention/sys/cam/cam_periph.h user/attilio/vmcontention/sys/cam/scsi/scsi_pass.c user/attilio/vmcontention/sys/cam/scsi/scsi_target.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/dev/aic7xxx/ahc_isa.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_reset.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_beacon.c 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/ath/if_ath_tx_ht.c user/attilio/vmcontention/sys/dev/ath/if_athrate.h user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/bktr/CHANGELOG.TXT user/attilio/vmcontention/sys/dev/bktr/bktr_os.c user/attilio/vmcontention/sys/dev/cas/if_casvar.h user/attilio/vmcontention/sys/dev/cxgb/common/cxgb_t3_hw.c user/attilio/vmcontention/sys/dev/cxgbe/common/t4_hw.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/ips/ips.c user/attilio/vmcontention/sys/dev/isci/scil/scic_sds_phy.c user/attilio/vmcontention/sys/dev/isci/scil/scic_sds_port.c user/attilio/vmcontention/sys/dev/isci/scil/scic_sds_port_configuration_agent.c user/attilio/vmcontention/sys/dev/msk/if_msk.c user/attilio/vmcontention/sys/dev/mvs/mvs_pci.c user/attilio/vmcontention/sys/dev/mvs/mvs_soc.c user/attilio/vmcontention/sys/dev/mxge/if_mxge.c user/attilio/vmcontention/sys/dev/ppbus/ppbconf.c user/attilio/vmcontention/sys/dev/random/randomdev_soft.c user/attilio/vmcontention/sys/dev/rndtest/rndtest.c user/attilio/vmcontention/sys/dev/siis/siis.c user/attilio/vmcontention/sys/dev/sound/pci/emu10kx.c user/attilio/vmcontention/sys/dev/sound/pcm/dsp.c user/attilio/vmcontention/sys/dev/usb/wlan/if_zydreg.h user/attilio/vmcontention/sys/dev/xen/netback/netback.c user/attilio/vmcontention/sys/fs/devfs/devfs_devs.c user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_conv.c user/attilio/vmcontention/sys/fs/nfs/nfs_commonkrpc.c user/attilio/vmcontention/sys/fs/nfs/nfs_commonport.c user/attilio/vmcontention/sys/fs/nfs/nfs_commonsubs.c user/attilio/vmcontention/sys/fs/nfs/nfs_var.h user/attilio/vmcontention/sys/fs/nfs/nfsm_subs.h user/attilio/vmcontention/sys/fs/nfs/nfsport.h user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clkrpc.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clnfsiod.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvfsops.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdkrpc.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdsocket.c user/attilio/vmcontention/sys/geom/geom_flashmap.c user/attilio/vmcontention/sys/geom/label/g_label_disk_ident.c user/attilio/vmcontention/sys/i386/isa/spic.c user/attilio/vmcontention/sys/kern/imgact_elf.c user/attilio/vmcontention/sys/kern/imgact_gzip.c user/attilio/vmcontention/sys/kern/kern_environment.c user/attilio/vmcontention/sys/kern/kern_umtx.c user/attilio/vmcontention/sys/kern/subr_bus_dma.c user/attilio/vmcontention/sys/kern/subr_counter.c user/attilio/vmcontention/sys/kern/vfs_mount.c user/attilio/vmcontention/sys/kern/vfs_subr.c user/attilio/vmcontention/sys/libkern/arc4random.c user/attilio/vmcontention/sys/mips/include/regnum.h user/attilio/vmcontention/sys/mips/malta/malta_machdep.c user/attilio/vmcontention/sys/modules/geom/geom_label/Makefile user/attilio/vmcontention/sys/modules/nfsd/Makefile user/attilio/vmcontention/sys/modules/nfsserver/Makefile user/attilio/vmcontention/sys/modules/uart/Makefile user/attilio/vmcontention/sys/net/if_vlan.c user/attilio/vmcontention/sys/net80211/ieee80211_var.h user/attilio/vmcontention/sys/netgraph/ng_base.c user/attilio/vmcontention/sys/netinet/ip_mroute.c user/attilio/vmcontention/sys/netinet/tcp_subr.c user/attilio/vmcontention/sys/netinet6/in6_src.c user/attilio/vmcontention/sys/netinet6/ip6_input.c user/attilio/vmcontention/sys/netinet6/ip6_var.h user/attilio/vmcontention/sys/nfsclient/nfs_bio.c user/attilio/vmcontention/sys/nfsclient/nfs_nfsiod.c user/attilio/vmcontention/sys/nfsclient/nfs_vfsops.c user/attilio/vmcontention/sys/nfsserver/nfs_srvkrpc.c user/attilio/vmcontention/sys/pc98/pc98/canbus.c user/attilio/vmcontention/sys/pci/ncr.c user/attilio/vmcontention/sys/sys/elf_common.h user/attilio/vmcontention/sys/sys/libkern.h user/attilio/vmcontention/sys/ufs/ffs/ffs_balloc.c user/attilio/vmcontention/sys/vm/vm_radix.c user/attilio/vmcontention/sys/x86/include/specialreg.h user/attilio/vmcontention/sys/x86/x86/tsc.c user/attilio/vmcontention/tools/regression/pjdfstest/pjdfstest.c user/attilio/vmcontention/tools/regression/usr.bin/yacc/grammar.y user/attilio/vmcontention/tools/regression/usr.bin/yacc/regress.08.out user/attilio/vmcontention/tools/tools/notescheck/notescheck.py user/attilio/vmcontention/usr.bin/netstat/inet6.c user/attilio/vmcontention/usr.sbin/bhyve/pci_emul.c user/attilio/vmcontention/usr.sbin/nandsim/nandsim_cfgparse.c user/attilio/vmcontention/usr.sbin/ppp/command.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/lib/libz/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/amd64/include/xen/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/usr.sbin/bhyve/ (props changed) Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Fri Apr 19 11:06:20 2013 (r249647) @@ -23,9 +23,8 @@ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ + +#pragma ident "%Z%%M% %I% %E% SMI" #include #include @@ -1410,7 +1409,6 @@ main(int argc, char *argv[]) (void) dtrace_setopt(g_dtp, "bufsize", "4m"); (void) dtrace_setopt(g_dtp, "aggsize", "4m"); #endif - (void) dtrace_setopt(g_dtp, "temporal", "yes"); /* * If -G is specified, enable -xlink=dynamic and -xunodefs to permit Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Fri Apr 19 11:06:20 2013 (r249647) @@ -583,8 +583,6 @@ if ($opt_x) { die "$PNAME: failed to open $PNAME.$$.log: $!\n" unless (!$opt_l || open(LOG, ">$PNAME.$$.log")); -$ENV{'DTRACE_DEBUG_REGSET'} = 'true'; - if ($opt_g) { $ENV{'UMEM_DEBUG'} = 'default,verbose'; $ENV{'UMEM_LOGGING'} = 'fail,contents'; Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d) @@ -0,0 +1,57 @@ +/* + * 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 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "%Z%%M% %I% %E% SMI" + +/* + * ASSERTION: + * Complex expressions. + * Call complex expressions and make sure test succeeds. + * Match expected output in tst.complex.d.out + * + * SECTION: Types, Operators, and Expressions/Arithmetic Operators + * + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; + i = i++ + ++i; + printf("The value of i is %d\n", i); + i = i-- - --i; + printf("The value of i is %d\n", i); + i = i-- + ++i; + printf("The value of i is %d\n", i); + i += i++ + -- i + ++i - ++i * i ; + printf("The value of i is %d\n", i); + i -= i++ * 3; + printf("The value of i is %d\n", i); + i = i++/i--+i++-++i-++i; + printf("The value of i is %d\n", i); + exit (0); +} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d Fri Apr 19 11:06:20 2013 (r249647) @@ -23,29 +23,26 @@ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ + +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: * Positive test for fill buffer policy. * * SECTION: Buffers and Buffering/fill Policy; - * Buffers and Buffering/Buffer Sizes; + * Buffers and Buffering/Buffer Sizes; * Options and Tunables/bufsize; * Options and Tunables/bufpolicy; * Options and Tunables/statusrate */ /* - * This is a brute-force way of testing fill buffers. We assume that - * each printf() stores 16 bytes (4x 32-bit words for EPID, timestamp - * lo, timestamp hi, and the variable i). Because each fill buffer is - * per-CPU, we must fill up our buffer in one series of enablings on a - * single CPU. + * This is a brute-force way of testing fill buffers. We assume that each + * printf() stores 8 bytes. Because each fill buffer is per-CPU, we must + * fill up our buffer in one series of enablings on a single CPU. */ #pragma D option bufpolicy=fill -#pragma D option bufsize=128 +#pragma D option bufsize=64 #pragma D option statusrate=10ms #pragma D option quiet Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d Fri Apr 19 11:06:20 2013 (r249647) @@ -23,9 +23,8 @@ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ + +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: @@ -38,20 +37,19 @@ */ /* - * We make some regrettable assumptions about the implementation in this - * test. First, we assume that each entry for the printf() of an int - * takes _exactly_ 16 bytes (4 bytes for the EPID, 8 bytes for the - * timestamp, 4 bytes for the payload). Second, we assume that by - * allocating storage for n + 1 records, we will get exactly n. Here is - * why: the final predicate that evaluates to false will reserve space - * that it won't use. This act of reservation will advance the wrapped - * offset. That record won't be subsequently used, but the wrapped - * offset has advanced. (And in this case, that old record is clobbered - * by the exit() anyway.) Thirdly: we rely on t_cpu/cpu_id. Finally: - * we rely on being able to run on the CPU that we first ran on. + * We make some regrettable assumptions about the implementation in this test. + * First, we assume that each entry for the printf() of an int takes _exactly_ + * eight bytes (four bytes for the EPID, four bytes for the payload). Second, + * we assume that by allocating storage for n + 1 records, we will get exactly + * n. Here is why: the final predicate that evaluates to false will reserve + * space that it won't use. This act of reservation will advance the wrapped + * offset. That record won't be subsequently used, but the wrapped offset has + * advanced. (And in this case, that old record is clobbered by the exit() + * anyway.) Thirdly: we rely on t_cpu/cpu_id. Finally: we rely on being + * able to run on the CPU that we first ran on. */ #pragma D option bufpolicy=ring -#pragma D option bufsize=80 +#pragma D option bufsize=40 #pragma D option quiet int n; Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" #pragma D option quiet @@ -38,8 +36,3 @@ BEGIN printf("%s\n", strjoin("", "")); exit(0); } - -BEGIN -{ - exit(1); -} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # - -# -# Copyright (c) 2012 by Delphix. All rights reserved. +# ident "%Z%%M% %I% %E% SMI" # if [ $# != 1 ]; then @@ -51,13 +49,13 @@ tick-1s tick-1s /(i % 2) == 0/ { - system("dtrace -c date -n 'pid\$target::main:entry' >/dev/null"); + system("dtrace -c date -ln 'pid\$target::main:entry' >/dev/null"); } tick-1s /(i % 2) == 1/ { - system("dtrace -c date -n 'pid\$target::main:return' >/dev/null"); + system("dtrace -c date -ln 'pid\$target::main:return' >/dev/null"); } EOF Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: This test reproduces the alignment error. @@ -41,10 +39,9 @@ BEGIN { - x = (int *)64; + x = (int *) 64; y = *x; trace(y); - exit(0); } ERROR Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: D pointers do not allow invalid pointer accesses. @@ -46,7 +44,6 @@ BEGIN y = (int *) (x - 3300778156056); *y = 3; trace(*y); - exit(0); } ERROR Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: D pointers do not allow invalid pointer accesses. @@ -41,10 +39,9 @@ BEGIN { - y = (int *)-33007; + y = (int *) (-33007); *y = 3; trace(*y); - exit(0); } ERROR Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: Demonstrating valid memory access. @@ -42,11 +40,10 @@ BEGIN { x = (int *)alloca(sizeof (int)); - printf("Address x: %x\n", (int)x); - y = (int *)(x - 2); + printf("Address x: %x\n", (int) x); + y = (int *) (x - 2); *y = 3; - printf("Address y: %x\tValue: %d\n", (int)y, *y); - exit(0); + printf("Address y: %x\tValue: %d\n", (int) y, *y); } ERROR Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh) @@ -0,0 +1,197 @@ +# +# 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 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" + +unload() +{ + # + # Get the list of services whose processes have USDT probes. Ideally + # it would be possible to unload the fasttrap provider while USDT + # probes exist -- once that fix is integrated, this hack can go away + # We create two lists -- one of regular SMF services and one of legacy + # services -- since each must be enabled and disabled using a specific + # mechanism. + # + pids=$(dtrace -l | \ + perl -ne 'print "$1\n" if (/^\s*\S+\s+\S*\D(\d+)\s+/);' | \ + sort | uniq | tr '\n' ',') + + ctids=$(ps -p $pids -o ctid | tail +2 | sort | uniq) + svcs= + lrcs= + + for ct in $ctids + do + line=$(svcs -o fmri,ctid | grep " $ct\$") + svc=$(echo $line | cut -d' ' -f1) + + if [[ $(svcs -Ho STA $svc) == "LRC" ]]; then + lrc=$(svcs -Ho SVC $svc | tr _ '?') + lrcs="$lrcs $lrc" + else + svcs="$svcs $svc" + fi + done + + for svc in $svcs + do + svcadm disable -ts $svc + done + + for lrc in $lrcs + do + # + # Does it seem a little paternalistic that lsvcrun requires + # this environment variable to be set? I'd say so... + # + SMF_RESTARTER=svc:/system/svc/restarter:default \ + /lib/svc/bin/lsvcrun $lrc stop + done + + modunload -i 0 + modunload -i 0 + modunload -i 0 + modinfo | grep dtrace + success=$? + + for svc in $svcs + do + svcadm enable -ts $svc + done + + for lrc in $lrcs + do + SMF_RESTARTER=svc:/system/svc/restarter:default \ + /lib/svc/bin/lsvcrun $lrc start + done + + if [ ! $success ]; then + echo $tst: could not unload dtrace + exit 1 + fi +} + +script1() +{ + $dtrace -s /dev/stdin <' + exit 2 +fi + +ppid=$$ +dtrace=$1 + +unload +script1 & +child=$! + +let waited=0 + +while [ "$waited" -lt 5 ]; do + seconds=`date +%S` + + if [ "$seconds" -ne "$last" ]; then + last=$seconds + let waited=waited+1 + fi +done + +wait $child +status=$? + +if [ "$status" -ne 0 ]; then + echo $tst: first dtrace failed + exit $status +fi + +unload +script2 & +child=$! + +let waited=0 + +while [ "$waited" -lt 10 ]; do + seconds=`date +%S` + + if [ "$seconds" -ne "$last" ]; then + last=$seconds + let waited=waited+1 + fi +done + +wait $child +status=$? + +exit $status Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d) @@ -0,0 +1,29 @@ +/* + * 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 by Delphix. All rights reserved. + */ + +BEGIN +{ + print(*curpsinfo); +} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Fri Apr 19 11:06:20 2013 (r249647) @@ -20,15 +20,10 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ BEGIN { print((void)`p0); } - -BEGIN -{ - exit(0); -} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d Fri Apr 19 11:06:20 2013 (r249647) @@ -20,15 +20,10 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ BEGIN { print(); } - -BEGIN -{ - exit(0); -} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d) @@ -0,0 +1,33 @@ +/* + * 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. + */ +/* + * Copyright (c) 2013, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +enum simpson { + homer, + marge, + bart, + lisa, + maggie, + snowball_ii, + santas_little_helper +}; + +BEGIN +{ + print(bart); + print((enum simpson)4); + print(snowball_ii); + exit(0); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out) @@ -0,0 +1,4 @@ +enum simpson bart +enum simpson maggie +enum simpson snowball_ii + Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out Fri Apr 19 11:06:20 2013 (r249647) @@ -1,6 +1,6 @@ --17 --12817 +239 +52719 -1867788817 1311768467294899695 Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: @@ -41,7 +39,7 @@ */ -#pragma D option bufsize=32 +#pragma D option bufsize=16 #pragma D option bufpolicy=ring #pragma D option statusrate=1nsec Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,10 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ - +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: @@ -38,10 +35,17 @@ * * NOTES: This test behaves differently depending on the values * assigned to bufsize. + * 1. 0 > bufsize. + * 2. 0 == bufsize. + * 3. 0 < bufsize <= 7 + * 4. 8 <= bufsize <= 31 + * 5. 32 <= bufsize <= 47 + * 6. 48 <= bufsize <= 71 + * 7. 72 <= bufsize */ #pragma D option quiet -#pragma D option bufsize=49 +#pragma D option bufsize=41 BEGIN { Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,10 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ - +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: * Verify the behavior of speculations with changes in specsize. @@ -38,7 +35,7 @@ */ #pragma D option quiet -#pragma D option specsize=48 +#pragma D option specsize=40 BEGIN { Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,8 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" + /* * ASSERTION: @@ -40,8 +39,3 @@ BEGIN trace(); } - -BEGIN -{ - exit(0); -} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d Fri Apr 19 11:06:20 2013 (r249647) @@ -24,9 +24,7 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * ASSERTION: @@ -39,8 +37,3 @@ BEGIN { trace((void)`kmem_flags); } - -BEGIN -{ - exit(0); -} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d (from r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d Fri Apr 19 11:06:20 2013 (r249647, copy of r249646, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d) @@ -0,0 +1,61 @@ +/* + * 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 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "%Z%%M% %I% %E% SMI" + +/* + * ASSERTION: + * The D inline translation mechanism can be used to facilitate stable + * translations. + * + * SECTION: Translators/ Translator Declarations + * SECTION: Translators/ Translate Operator + * SECTION: Translators/Stable Translations + * + * NOTES: Uncomment the pragma that explicitly resets the attributes of + * myinfo identifier to Stable/Stable/Common from Private/Private/Unknown. + * Run the program with and without the comments as: + * /usr/sbin/dtrace -vs man.TestTransStability.d + */ + +#pragma D option quiet + +inline lwpsinfo_t *myinfo = xlate < lwpsinfo_t *> (curthread); + +/* +#pragma D attributes Stable/Stable/Common myinfo +*/ + +BEGIN +{ + trace(myinfo->pr_flag); + exit(0); +} + +ERROR +{ + exit(1); +} Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Apr 19 11:06:20 2013 (r249647) @@ -26,7 +26,6 @@ /* * Copyright (c) 2011, Joyent, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. */ #include @@ -895,14 +894,33 @@ dt_aggregate_valcmp(const void *lhs, con caddr_t rdata = rh->dtahe_data.dtada_data; dtrace_recdesc_t *lrec, *rrec; int64_t *laddr, *raddr; - int rval; + int rval, i; + + if ((rval = dt_aggregate_hashcmp(lhs, rhs)) != 0) + return (rval); + + if (lagg->dtagd_nrecs > ragg->dtagd_nrecs) + return (DT_GREATERTHAN); + + if (lagg->dtagd_nrecs < ragg->dtagd_nrecs) + return (DT_LESSTHAN); - assert(lagg->dtagd_nrecs == ragg->dtagd_nrecs); + for (i = 0; i < lagg->dtagd_nrecs; i++) { + lrec = &lagg->dtagd_rec[i]; + rrec = &ragg->dtagd_rec[i]; - lrec = &lagg->dtagd_rec[lagg->dtagd_nrecs - 1]; - rrec = &ragg->dtagd_rec[ragg->dtagd_nrecs - 1]; + if (lrec->dtrd_offset < rrec->dtrd_offset) + return (DT_LESSTHAN); + + if (lrec->dtrd_offset > rrec->dtrd_offset) + return (DT_GREATERTHAN); - assert(lrec->dtrd_action == rrec->dtrd_action); + if (lrec->dtrd_action < rrec->dtrd_action) + return (DT_LESSTHAN); + + if (lrec->dtrd_action > rrec->dtrd_action) + return (DT_GREATERTHAN); + } laddr = (int64_t *)(uintptr_t)(ldata + lrec->dtrd_offset); raddr = (int64_t *)(uintptr_t)(rdata + rrec->dtrd_offset); Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Apr 19 10:48:38 2013 (r249646) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Apr 19 11:06:20 2013 (r249647) @@ -22,7 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, Joyent Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ /* @@ -664,53 +664,62 @@ static void dt_action_trace(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp) { dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp); - boolean_t istrace = (dnp->dn_ident->di_id == DT_ACT_TRACE); - const char *act = istrace ? "trace" : "print"; if (dt_node_is_void(dnp->dn_args)) { - dnerror(dnp->dn_args, istrace ? D_TRACE_VOID : D_PRINT_VOID, - "%s( ) may not be applied to a void expression\n", act); + dnerror(dnp->dn_args, D_TRACE_VOID, + "trace( ) may not be applied to a void expression\n"); } - if (dt_node_resolve(dnp->dn_args, DT_IDENT_XLPTR) != NULL) { - dnerror(dnp->dn_args, istrace ? D_TRACE_DYN : D_PRINT_DYN, - "%s( ) may not be applied to a translated pointer\n", act); + if (dt_node_is_dynamic(dnp->dn_args)) { + dnerror(dnp->dn_args, D_TRACE_DYN, + "trace( ) may not be applied to a dynamic expression\n"); } - if (dnp->dn_args->dn_kind == DT_NODE_AGG) { - dnerror(dnp->dn_args, istrace ? D_TRACE_AGG : D_PRINT_AGG, - "%s( ) may not be applied to an aggregation%s\n", act, - istrace ? "" : " -- did you mean printa()?"); + dt_cg(yypcb, dnp->dn_args); + ap->dtad_difo = dt_as(yypcb); + ap->dtad_kind = DTRACEACT_DIFEXPR; +} + +/* + * The print() action behaves identically to trace(), except that it stores the + * CTF type of the argument (if present) within the DOF for the DIFEXPR action. + * To do this, we set the 'dtsd_strdata' to point to the fully-qualified CTF + * type ID for the result of the DIF action. We use the ID instead of the name + * to handles complex types like arrays and function pointers that can't be + * resolved by ctf_type_lookup(). This is later processed by + * dtrace_dof_create() and turned into a reference into the string table so + * that we can get the type information when we process the data after the + * fact. + */ +static void +dt_action_print(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp) +{ + dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp); + dt_node_t *dret; + size_t len; + dt_module_t *dmp; + + if (dt_node_is_void(dnp->dn_args)) { + dnerror(dnp->dn_args, D_PRINT_VOID, + "print( ) may not be applied to a void expression\n"); + } + + if (dt_node_is_dynamic(dnp->dn_args)) { + dnerror(dnp->dn_args, D_PRINT_DYN, + "print( ) may not be applied to a dynamic expression\n"); } dt_cg(yypcb, dnp->dn_args); - /* - * The print() action behaves identically to trace(), except that it - * stores the CTF type of the argument (if present) within the DOF for - * the DIFEXPR action. To do this, we set the 'dtsd_strdata' to point - * to the fully-qualified CTF type ID for the result of the DIF - * action. We use the ID instead of the name to handles complex types - * like arrays and function pointers that can't be resolved by - * ctf_type_lookup(). This is later processed by dtrace_dof_create() - * and turned into a reference into the string table so that we can - * get the type information when we process the data after the fact. - */ - if (dnp->dn_ident->di_id == DT_ACT_PRINT) { - dt_node_t *dret; - size_t n; - dt_module_t *dmp; - - dret = yypcb->pcb_dret; - dmp = dt_module_lookup_by_ctf(dtp, dret->dn_ctfp); - - n = snprintf(NULL, 0, "%s`%ld", dmp->dm_name, dret->dn_type) + 1; - sdp->dtsd_strdata = dt_alloc(dtp, n); - if (sdp->dtsd_strdata == NULL) - longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); - (void) snprintf(sdp->dtsd_strdata, n, "%s`%ld", dmp->dm_name, - dret->dn_type); - } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***