svn commit: r210849 - in projects/sv: bin/kill bin/ln bin/sh bin/sleep cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs cddl/contrib/opensola...

Wed Aug 4 14:59:00 UTC 2010

Author: attilio
Date: Wed Aug  4 14:58:59 2010
New Revision: 210849
URL: http://svn.freebsd.org/changeset/base/210849

Log:
  MFC

Added:
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/
     - copied from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/
     - copied from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.GetAggregate.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.GetAggregate.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/
     - copied from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithStddev.d
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithStddev.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh.out
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/
     - copied from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
     - copied unchanged from r210792, head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
  projects/sv/lib/libproc/proc_bkpt.c
     - copied unchanged from r210792, head/lib/libproc/proc_bkpt.c
  projects/sv/lib/libproc/proc_regs.c
     - copied unchanged from r210792, head/lib/libproc/proc_regs.c
  projects/sv/lib/libproc/proc_rtld.c
     - copied unchanged from r210792, head/lib/libproc/proc_rtld.c
  projects/sv/lib/libproc/test/
     - copied from r210792, head/lib/libproc/test/
  projects/sv/lib/librtld_db/
     - copied from r210792, head/lib/librtld_db/
  projects/sv/sys/boot/zfs/zfstest.c
     - copied unchanged from r210792, head/sys/boot/zfs/zfstest.c
  projects/sv/sys/powerpc/mambo/
     - copied from r210792, head/sys/powerpc/mambo/
  projects/sv/tools/regression/bin/sh/builtins/eval4.0
     - copied unchanged from r210792, head/tools/regression/bin/sh/builtins/eval4.0
  projects/sv/tools/regression/bin/sh/builtins/eval5.0
     - copied unchanged from r210846, head/tools/regression/bin/sh/builtins/eval5.0
  projects/sv/usr.bin/grep/nls/ja_JP.SJIS.msg
     - copied unchanged from r210792, head/usr.bin/grep/nls/ja_JP.SJIS.msg
  projects/sv/usr.bin/grep/nls/ja_JP.UTF-8.msg
     - copied unchanged from r210792, head/usr.bin/grep/nls/ja_JP.UTF-8.msg
  projects/sv/usr.bin/grep/nls/ja_JP.eucJP.msg
     - copied unchanged from r210792, head/usr.bin/grep/nls/ja_JP.eucJP.msg
  projects/sv/usr.bin/grep/nls/uk_UA.UTF-8.msg
     - copied unchanged from r210792, head/usr.bin/grep/nls/uk_UA.UTF-8.msg
Modified:
  projects/sv/bin/kill/kill.c
  projects/sv/bin/ln/ln.1
  projects/sv/bin/sh/eval.c
  projects/sv/bin/sh/histedit.c
  projects/sv/bin/sleep/sleep.1
  projects/sv/bin/sleep/sleep.c
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.c
  projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i386/funcs/tst.badcopyin.d
  projects/sv/cddl/contrib/opensolaris/common/avl/avl.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c
  projects/sv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/sv/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c
  projects/sv/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
  projects/sv/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
  projects/sv/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h
  projects/sv/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
  projects/sv/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c
  projects/sv/cddl/lib/Makefile
  projects/sv/cddl/usr.sbin/Makefile
  projects/sv/cddl/usr.sbin/dtrace/Makefile
  projects/sv/cddl/usr.sbin/lockstat/Makefile
  projects/sv/contrib/file/apprentice.c
  projects/sv/contrib/file/magic.c
  projects/sv/contrib/tzdata/africa
  projects/sv/contrib/tzdata/australasia
  projects/sv/contrib/tzdata/backward
  projects/sv/contrib/tzdata/europe
  projects/sv/contrib/tzdata/leapseconds
  projects/sv/contrib/tzdata/northamerica
  projects/sv/contrib/tzdata/zone.tab
  projects/sv/etc/rc.d/ipmon
  projects/sv/games/fortune/datfiles/fortunes
  projects/sv/games/grdc/grdc.c
  projects/sv/games/pom/pom.6
  projects/sv/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
  projects/sv/gnu/usr.bin/groff/tmac/mdoc.local
  projects/sv/lib/Makefile
  projects/sv/lib/libarchive/libarchive_internals.3
  projects/sv/lib/libbluetooth/bluetooth.3
  projects/sv/lib/libc/Makefile
  projects/sv/lib/libc/gen/getutxent.3
  projects/sv/lib/libc/locale/isgraph.3
  projects/sv/lib/libc/locale/mbrtowc.3
  projects/sv/lib/libc/locale/setlocale.3
  projects/sv/lib/libc/net/sctp_getaddrlen.3
  projects/sv/lib/libc/net/sctp_send.3
  projects/sv/lib/libc/net/sctp_sendmsg.3
  projects/sv/lib/libc/posix1e/acl_strip_np.3
  projects/sv/lib/libc/posix1e/mac.3
  projects/sv/lib/libc/rpc/publickey.3
  projects/sv/lib/libc/stdlib/getopt.3
  projects/sv/lib/libc/sys/jail.2
  projects/sv/lib/libc/sys/sctp_peeloff.2
  projects/sv/lib/libdevstat/devstat.3
  projects/sv/lib/libefi/libefi.3
  projects/sv/lib/libelf/elf_strptr.3
  projects/sv/lib/libfetch/common.c
  projects/sv/lib/libfetch/http.c
  projects/sv/lib/libkvm/kvm_getloadavg.3
  projects/sv/lib/libmagic/Makefile
  projects/sv/lib/libmemstat/libmemstat.3
  projects/sv/lib/libpmc/pmc.corei7.3
  projects/sv/lib/libpmc/pmc.westmere.3
  projects/sv/lib/libpmc/pmc.xscale.3
  projects/sv/lib/libproc/Makefile
  projects/sv/lib/libproc/_libproc.h
  projects/sv/lib/libproc/libproc.h
  projects/sv/lib/libproc/proc_create.c
  projects/sv/lib/libproc/proc_sym.c
  projects/sv/lib/libproc/proc_util.c
  projects/sv/lib/librtld_db/librtld_db.3
  projects/sv/lib/libusb/libusb.3
  projects/sv/lib/libutil/kinfo_getfile.3
  projects/sv/lib/libutil/kinfo_getvmmap.3
  projects/sv/lib/libutil/property.3
  projects/sv/libexec/rtld-elf/mips/reloc.c
  projects/sv/libexec/rtld-elf/mips/rtld_start.S
  projects/sv/libexec/ypxfr/ypxfr.8
  projects/sv/sbin/camcontrol/camcontrol.8
  projects/sv/sbin/devd/devd.cc
  projects/sv/sbin/fsck_ffs/main.c
  projects/sv/sbin/geom/class/sched/gsched.8
  projects/sv/sbin/hastctl/hastctl.8
  projects/sv/sbin/hastd/hast.conf.5
  projects/sv/sbin/ifconfig/ifconfig.8
  projects/sv/sbin/iscontrol/iscsi.conf.5
  projects/sv/sbin/sunlabel/sunlabel.8
  projects/sv/secure/lib/libcrypto/opensslconf-mips.h
  projects/sv/share/man/man3/siginfo.3
  projects/sv/share/man/man4/ae.4
  projects/sv/share/man/man4/asmc.4
  projects/sv/share/man/man4/ata.4
  projects/sv/share/man/man4/blackhole.4
  projects/sv/share/man/man4/bpf.4
  projects/sv/share/man/man4/bridge.4
  projects/sv/share/man/man4/icmp6.4
  projects/sv/share/man/man4/isp.4
  projects/sv/share/man/man4/ksyms.4
  projects/sv/share/man/man4/net80211.4
  projects/sv/share/man/man4/pcm.4
  projects/sv/share/man/man4/snd_hda.4
  projects/sv/share/man/man4/uep.4
  projects/sv/share/man/man4/vpo.4
  projects/sv/share/man/man5/device.hints.5
  projects/sv/share/man/man5/rc.conf.5
  projects/sv/share/man/man9/DEVICE_PROBE.9
  projects/sv/share/man/man9/VFS_VGET.9
  projects/sv/share/man/man9/VOP_VPTOCNP.9
  projects/sv/share/man/man9/bios.9
  projects/sv/share/man/man9/kproc.9
  projects/sv/share/man/man9/locking.9
  projects/sv/share/man/man9/make_dev.9
  projects/sv/share/man/man9/netisr.9
  projects/sv/share/man/man9/sglist.9
  projects/sv/share/man/man9/taskqueue.9
  projects/sv/share/man/man9/timeout.9
  projects/sv/share/man/man9/usbdi.9
  projects/sv/share/misc/committers-ports.dot
  projects/sv/share/mk/bsd.lib.mk
  projects/sv/share/mk/bsd.libnames.mk
  projects/sv/share/mk/bsd.prog.mk
  projects/sv/share/mk/sys.mk
  projects/sv/sys/amd64/acpica/acpi_switch.S
  projects/sv/sys/amd64/acpica/acpi_wakecode.S
  projects/sv/sys/amd64/acpica/acpi_wakeup.c
  projects/sv/sys/amd64/amd64/cpu_switch.S
  projects/sv/sys/amd64/amd64/genassym.c
  projects/sv/sys/amd64/amd64/initcpu.c
  projects/sv/sys/amd64/amd64/mp_machdep.c
  projects/sv/sys/amd64/amd64/support.S
  projects/sv/sys/amd64/conf/GENERIC
  projects/sv/sys/amd64/include/pcb.h
  projects/sv/sys/amd64/include/pcpu.h
  projects/sv/sys/amd64/include/specialreg.h
  projects/sv/sys/boot/common/loader.8
  projects/sv/sys/cam/cam.c
  projects/sv/sys/cam/scsi/scsi_target.c
  projects/sv/sys/compat/freebsd32/freebsd32_misc.c
  projects/sv/sys/conf/NOTES
  projects/sv/sys/conf/files.powerpc
  projects/sv/sys/conf/files.sparc64
  projects/sv/sys/conf/files.sun4v
  projects/sv/sys/conf/options
  projects/sv/sys/conf/options.powerpc
  projects/sv/sys/dev/amr/amrvar.h
  projects/sv/sys/dev/coretemp/coretemp.c
  projects/sv/sys/dev/drm/drm_pciids.h
  projects/sv/sys/dev/e1000/e1000_osdep.h
  projects/sv/sys/dev/et/if_et.c
  projects/sv/sys/dev/et/if_etreg.h
  projects/sv/sys/dev/et/if_etvar.h
  projects/sv/sys/dev/hwpmc/hwpmc_core.c
  projects/sv/sys/dev/hwpmc/hwpmc_core.h
  projects/sv/sys/dev/ipmi/ipmi_smbios.c
  projects/sv/sys/dev/pci/pci.c
  projects/sv/sys/dev/pci/pci_user.c
  projects/sv/sys/dev/sound/pci/hda/hdac.c
  projects/sv/sys/dev/usb/quirk/usb_quirk.c
  projects/sv/sys/dev/usb/serial/uplcom.c
  projects/sv/sys/dev/usb/usbdevs
  projects/sv/sys/fs/nfs/nfs_var.h
  projects/sv/sys/fs/nfsclient/nfs_clstate.c
  projects/sv/sys/fs/nfsclient/nfs_clsubs.c
  projects/sv/sys/fs/nfsclient/nfs_clvnops.c
  projects/sv/sys/geom/part/g_part.c
  projects/sv/sys/geom/sched/g_sched.c
  projects/sv/sys/i386/conf/GENERIC
  projects/sv/sys/i386/i386/genassym.c
  projects/sv/sys/i386/i386/initcpu.c
  projects/sv/sys/i386/i386/swtch.s
  projects/sv/sys/i386/include/pcpu.h
  projects/sv/sys/i386/include/specialreg.h
  projects/sv/sys/ia64/conf/GENERIC
  projects/sv/sys/ia64/include/pcpu.h
  projects/sv/sys/kern/kern_malloc.c
  projects/sv/sys/kern/subr_witness.c
  projects/sv/sys/kern/vfs_subr.c
  projects/sv/sys/mips/include/_stdint.h
  projects/sv/sys/mips/include/param.h
  projects/sv/sys/mips/include/profile.h
  projects/sv/sys/mips/include/runq.h
  projects/sv/sys/mips/include/vmparam.h
  projects/sv/sys/mips/mips/exception.S
  projects/sv/sys/mips/mips/genassym.c
  projects/sv/sys/mips/mips/locore.S
  projects/sv/sys/mips/mips/pm_machdep.c
  projects/sv/sys/mips/mips/pmap.c
  projects/sv/sys/mips/mips/support.S
  projects/sv/sys/mips/mips/swtch.S
  projects/sv/sys/mips/mips/trap.c
  projects/sv/sys/mips/mips/vm_machdep.c
  projects/sv/sys/mips/rmi/dev/xlr/rge.c
  projects/sv/sys/mips/rmi/on_chip.c
  projects/sv/sys/modules/ata/atacore/Makefile
  projects/sv/sys/net/rtsock.c
  projects/sv/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
  projects/sv/sys/netinet/if_ether.c
  projects/sv/sys/netinet/in_rmx.c
  projects/sv/sys/netinet/sctp_indata.c
  projects/sv/sys/netinet/sctp_output.c
  projects/sv/sys/netinet/sctp_structs.h
  projects/sv/sys/netinet/sctp_timer.c
  projects/sv/sys/netinet/tcp_syncache.c
  projects/sv/sys/netinet6/nd6.c
  projects/sv/sys/nfsclient/nfs_node.c
  projects/sv/sys/nfsclient/nfs_vnops.c
  projects/sv/sys/opencrypto/cryptodev.c
  projects/sv/sys/pc98/conf/GENERIC
  projects/sv/sys/powerpc/aim/mmu_oea64.c
  projects/sv/sys/powerpc/aim/slb.c
  projects/sv/sys/powerpc/conf/GENERIC
  projects/sv/sys/powerpc/conf/GENERIC64
  projects/sv/sys/powerpc/conf/NOTES
  projects/sv/sys/powerpc/include/slb.h
  projects/sv/sys/sparc64/conf/GENERIC
  projects/sv/sys/sparc64/include/intr_machdep.h
  projects/sv/sys/sparc64/include/pcpu.h
  projects/sv/sys/sparc64/include/smp.h
  projects/sv/sys/sparc64/include/tick.h
  projects/sv/sys/sparc64/sparc64/clock.c
  projects/sv/sys/sparc64/sparc64/intr_machdep.c
  projects/sv/sys/sparc64/sparc64/mp_machdep.c
  projects/sv/sys/sparc64/sparc64/tick.c
  projects/sv/sys/sun4v/conf/GENERIC
  projects/sv/sys/sun4v/include/clock.h
  projects/sv/sys/sun4v/include/intr_machdep.h
  projects/sv/sys/sun4v/include/pcpu.h
  projects/sv/sys/sun4v/include/smp.h
  projects/sv/sys/sun4v/include/tick.h
  projects/sv/sys/sun4v/sun4v/clock.c
  projects/sv/sys/sun4v/sun4v/intr_machdep.c
  projects/sv/sys/sun4v/sun4v/mp_machdep.c
  projects/sv/sys/sun4v/sun4v/tick.c
  projects/sv/sys/sys/malloc.h
  projects/sv/sys/sys/param.h
  projects/sv/sys/x86/acpica/srat.c
  projects/sv/sys/x86/x86/mca.c
  projects/sv/tools/debugscripts/README
  projects/sv/usr.bin/ar/ar.1
  projects/sv/usr.bin/c89/c89.1
  projects/sv/usr.bin/c99/c99.1
  projects/sv/usr.bin/calendar/calendars/calendar.freebsd
  projects/sv/usr.bin/grep/fastgrep.c
  projects/sv/usr.bin/grep/grep.1
  projects/sv/usr.bin/grep/grep.c
  projects/sv/usr.bin/grep/grep.h
  projects/sv/usr.bin/grep/nls/C.msg
  projects/sv/usr.bin/grep/nls/Makefile.inc
  projects/sv/usr.bin/grep/nls/es_ES.ISO8859-1.msg
  projects/sv/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
  projects/sv/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
  projects/sv/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
  projects/sv/usr.bin/grep/nls/ru_RU.KOI8-R.msg
  projects/sv/usr.bin/grep/queue.c
  projects/sv/usr.bin/grep/util.c
  projects/sv/usr.bin/tar/bsdtar.1
  projects/sv/usr.bin/unifdef/unifdef.1
  projects/sv/usr.sbin/ancontrol/ancontrol.8
  projects/sv/usr.sbin/fwcontrol/fwcontrol.8
  projects/sv/usr.sbin/jail/jail.8
  projects/sv/usr.sbin/mfiutil/mfiutil.8
  projects/sv/usr.sbin/mptutil/mptutil.8
  projects/sv/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
  projects/sv/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  projects/sv/usr.sbin/pmcstat/pmcpl_calltree.c
  projects/sv/usr.sbin/pmcstat/pmcstat.c
  projects/sv/usr.sbin/pmcstat/pmcstat.h
  projects/sv/usr.sbin/pmcstat/pmcstat_log.c
  projects/sv/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
  projects/sv/usr.sbin/sysinstall/help/options.hlp
  projects/sv/usr.sbin/ugidfw/ugidfw.8
  projects/sv/usr.sbin/wpa/wpa_cli/wpa_cli.8
  projects/sv/usr.sbin/ypserv/ypinit.8
Directory Properties:
  projects/sv/   (props changed)
  projects/sv/cddl/contrib/opensolaris/   (props changed)
  projects/sv/contrib/bind9/   (props changed)
  projects/sv/contrib/ee/   (props changed)
  projects/sv/contrib/expat/   (props changed)
  projects/sv/contrib/file/   (props changed)
  projects/sv/contrib/gdb/   (props changed)
  projects/sv/contrib/gdtoa/   (props changed)
  projects/sv/contrib/gnu-sort/   (props changed)
  projects/sv/contrib/groff/   (props changed)
  projects/sv/contrib/less/   (props changed)
  projects/sv/contrib/libpcap/   (props changed)
  projects/sv/contrib/llvm/   (props changed)
  projects/sv/contrib/llvm/tools/clang/   (props changed)
  projects/sv/contrib/ncurses/   (props changed)
  projects/sv/contrib/netcat/   (props changed)
  projects/sv/contrib/ntp/   (props changed)
  projects/sv/contrib/one-true-awk/   (props changed)
  projects/sv/contrib/openbsm/   (props changed)
  projects/sv/contrib/openpam/   (props changed)
  projects/sv/contrib/pf/   (props changed)
  projects/sv/contrib/sendmail/   (props changed)
  projects/sv/contrib/tcpdump/   (props changed)
  projects/sv/contrib/tcsh/   (props changed)
  projects/sv/contrib/top/   (props changed)
  projects/sv/contrib/top/install-sh   (props changed)
  projects/sv/contrib/tzcode/stdtime/   (props changed)
  projects/sv/contrib/tzcode/zic/   (props changed)
  projects/sv/contrib/tzdata/   (props changed)
  projects/sv/contrib/wpa/   (props changed)
  projects/sv/crypto/openssh/   (props changed)
  projects/sv/crypto/openssl/   (props changed)
  projects/sv/lib/libc/   (props changed)
  projects/sv/lib/libc/stdtime/   (props changed)
  projects/sv/lib/libutil/   (props changed)
  projects/sv/lib/libz/   (props changed)
  projects/sv/sbin/   (props changed)
  projects/sv/sbin/ipfw/   (props changed)
  projects/sv/share/mk/bsd.arch.inc.mk   (props changed)
  projects/sv/share/zoneinfo/   (props changed)
  projects/sv/sys/   (props changed)
  projects/sv/sys/amd64/include/xen/   (props changed)
  projects/sv/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sv/sys/contrib/dev/acpica/   (props changed)
  projects/sv/sys/contrib/pf/   (props changed)
  projects/sv/sys/contrib/x86emu/   (props changed)
  projects/sv/sys/dev/xen/xenpci/   (props changed)
  projects/sv/usr.bin/csup/   (props changed)
  projects/sv/usr.bin/procstat/   (props changed)
  projects/sv/usr.sbin/zic/   (props changed)

Modified: projects/sv/bin/kill/kill.c
==============================================================================

--- projects/sv/bin/kill/kill.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/kill/kill.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -123,10 +123,9 @@ main(int argc, char *argv[])
 
 	for (errors = 0; argc; argc--, argv++) {
 		pid = strtol(*argv, &ep, 10);
-		if (!**argv || *ep) {
-			warnx("illegal process id: %s", *argv);
-			errors = 1;
-		} else if (kill(pid, numsig) == -1) {
+		if (!**argv || *ep)
+			errx(1, "illegal process id: %s", *argv);
+		else if (kill(pid, numsig) == -1) {
 			warn("%s", *argv);
 			errors = 1;
 		}

Modified: projects/sv/bin/ln/ln.1
==============================================================================
--- projects/sv/bin/ln/ln.1	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/ln/ln.1	Wed Aug  4 14:58:59 2010	(r210849)
@@ -229,7 +229,7 @@ The
 .Fl F
 option is
 .Fx
-extention and should not be used in portable scripts.
+extension and should not be used in portable scripts.
 .Sh SEE ALSO
 .Xr link 2 ,
 .Xr lstat 2 ,

Modified: projects/sv/bin/sh/eval.c
==============================================================================
--- projects/sv/bin/sh/eval.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/sh/eval.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -145,7 +145,8 @@ evalcmd(int argc, char **argv)
                         p = grabstackstr(concat);
                 }
                 evalstring(p, builtin_flags & EV_TESTED);
-        }
+        } else
+                exitstatus = 0;
         return exitstatus;
 }
 
@@ -160,9 +161,11 @@ evalstring(char *s, int flags)
 	union node *n;
 	struct stackmark smark;
 	int flags_exit;
+	int any;
 
 	flags_exit = flags & EV_EXIT;
 	flags &= ~EV_EXIT;
+	any = 0;
 	setstackmark(&smark);
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
@@ -171,11 +174,14 @@ evalstring(char *s, int flags)
 				evaltree(n, flags | EV_EXIT);
 			else
 				evaltree(n, flags);
+			any = 1;
 		}
 		popstackmark(&smark);
 	}
 	popfile();
 	popstackmark(&smark);
+	if (!any)
+		exitstatus = 0;
 	if (flags_exit)
 		exitshell(exitstatus);
 }

Modified: projects/sv/bin/sh/histedit.c
==============================================================================
--- projects/sv/bin/sh/histedit.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/sh/histedit.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -168,6 +168,7 @@ sethistsize(hs)
 		   (histsize = atoi(hs)) < 0)
 			histsize = 100;
 		history(hist, &he, H_SETSIZE, histsize);
+		history(hist, &he, H_SETUNIQUE, 1);
 	}
 }
 

Modified: projects/sv/bin/sleep/sleep.1
==============================================================================
--- projects/sv/bin/sleep/sleep.1	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/sleep/sleep.1	Wed Aug  4 14:58:59 2010	(r210849)
@@ -51,6 +51,10 @@ suspends execution for a minimum of
 If the
 .Nm
 command receives a signal, it takes the standard action.
+When the
+.Dv SIGINFO
+signal is received, the estimate of the amount of seconds left to
+sleep is printed on the standard output.
 .Sh IMPLEMENTATION NOTES
 The
 .Dv SIGALRM
@@ -58,14 +62,11 @@ signal is not handled specially by this 
 .Pp
 The
 .Nm
-command will accept and honor a non-integer number of specified seconds
-(with a
-.Ql .\&
-character as a decimal point).
-.Bf Sy
+command allows and honors a non-integer number of seconds to sleep
+in any form acceptable by
+.Xr strtod 3 .
 This is a non-portable extension, and its use will nearly guarantee that
 a shell script will not execute properly on another system.
-.Ef
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES

Modified: projects/sv/bin/sleep/sleep.c
==============================================================================
--- projects/sv/bin/sleep/sleep.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/bin/sleep/sleep.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -42,84 +42,61 @@ static char sccsid[] = "@(#)sleep.c	8.3 
 __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
+#include <err.h>
 #include <limits.h>
+#include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <unistd.h>
 
-void usage(void);
+static void usage(void);
+
+static volatile sig_atomic_t report_requested;
+static void
+report_request(int signo __unused)
+{
+
+	report_requested = 1;
+}
 
 int
 main(int argc, char *argv[])
 {
 	struct timespec time_to_sleep;
-	long l;
-	int neg;
-	char *p;
+	double d;
+	time_t original;
+	char buf[2];
 
-	if (argc != 2) {
+	if (argc != 2)
 		usage();
-		return(1);
-	}
-
-	p = argv[1];
 
-	/* Skip over leading whitespaces. */
-	while (isspace((unsigned char)*p))
-		++p;
-
-	/* Check for optional `+' or `-' sign. */
-	neg = 0;
-	if (*p == '-') {
-		neg = 1;
-		++p;
-		if (!isdigit((unsigned char)*p) && *p != '.') {
-			usage();
-			return(1);
-		}
-	}
-	else if (*p == '+')
-		++p;
-
-	/* Calculate seconds. */
-	if (isdigit((unsigned char)*p)) {
-		l = strtol(p, &p, 10);
-		if (l > INT_MAX) {
-			/*
-			 * Avoid overflow when `seconds' is huge.  This assumes
-			 * that the maximum value for a time_t is <= INT_MAX.
-			 */
-			l = INT_MAX;
-		}
-	} else
-		l = 0;
-	time_to_sleep.tv_sec = (time_t)l;
-
-	/* Calculate nanoseconds. */
-	time_to_sleep.tv_nsec = 0;
-
-	if (*p == '.') {		/* Decimal point. */
-		l = 100000000L;
-		do {
-			if (isdigit((unsigned char)*++p))
-				time_to_sleep.tv_nsec += (*p - '0') * l;
-			else
-				break;
-			l /= 10;
-		} while (l);
+	if (sscanf(argv[1], "%lf%1s", &d, buf) != 1)
+		usage();
+	if (d > INT_MAX)
+		usage();
+	if (d <= 0)
+		return (0);
+	original = time_to_sleep.tv_sec = (time_t)d;
+	time_to_sleep.tv_nsec = 1e9 * (d - time_to_sleep.tv_sec);
+
+	signal(SIGINFO, report_request);
+	while (nanosleep(&time_to_sleep, &time_to_sleep) != 0) {
+		if (report_requested) {
+			/* Reporting does not bother with nanoseconds. */
+			warnx("about %d second(s) left out of the original %d",
+			    (int)time_to_sleep.tv_sec, (int)original);
+			report_requested = 0;
+		} else
+			break;
 	}
-
-	if (!neg && (time_to_sleep.tv_sec > 0 || time_to_sleep.tv_nsec > 0))
-		(void)nanosleep(&time_to_sleep, (struct timespec *)NULL);
-
-	return(0);
+	return (0);
 }
 
-void
+static void
 usage(void)
 {
-	const char msg[] = "usage: sleep seconds\n";
 
-	write(STDERR_FILENO, msg, sizeof(msg) - 1);
+	fprintf(stderr, "usage: sleep seconds\n");
+	exit(1);
 }

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,12 +20,10 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -162,7 +160,7 @@ main(int argc, char **argv)
 	FILE *fp;
 	unsigned char *dof, *copy;
 
-	if (argc < 1)
+	if (argc < 2)
 		fatal("expected D script as argument\n");
 
 	if ((fp = fopen(filename, "r")) == NULL)

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,12 +20,10 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <strings.h>
 #include <unistd.h>
 #include <dtrace.h>
@@ -35,6 +33,7 @@ static int g_errs;
 static int g_fd;
 static int g_verbose;
 static int g_errexit;
+static char *g_progname;
 
 static int
 probe(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *data)
@@ -91,9 +90,11 @@ main(int argc, char *argv[])
 	int err, c;
 	char *p;
 
+	g_progname = argv[0];
+
 	if ((dtp = dtrace_open(DTRACE_VERSION, 0, &err)) == NULL) {
 		(void) fprintf(stderr, "%s: failed to open dtrace: %s\n",
-		    argv[0], dtrace_errmsg(dtp, err));
+		    g_progname, dtrace_errmsg(dtp, err));
 		return (1);
 	}
 
@@ -111,7 +112,7 @@ main(int argc, char *argv[])
 
 			if (dtrace_setopt(dtp, optarg, p) != 0) {
 				(void) fprintf(stderr, "%s: failed to set "
-				    "option -x %s: %s\n", argv[0], optarg,
+				    "option -x %s: %s\n", g_progname, optarg,
 				    dtrace_errmsg(dtp, dtrace_errno(dtp)));
 				return (2);
 			}
@@ -119,7 +120,7 @@ main(int argc, char *argv[])
 
 		default:
 			(void) fprintf(stderr, "Usage: %s [-ev] "
-			    "[-x opt[=arg]] [probedesc]\n", argv[0]);
+			    "[-x opt[=arg]] [probedesc]\n", g_progname);
 			return (2);
 		}
 	}
@@ -128,9 +129,9 @@ main(int argc, char *argv[])
 	argc -= optind;
 
 	if (argc > 0) {
-		if (dtrace_str2desc(dtp, DTRACE_PROBESPEC_NAME, argv[1], &pd)) {
+		if (dtrace_str2desc(dtp, DTRACE_PROBESPEC_NAME, argv[0], &pd)) {
 			(void) fprintf(stderr, "%s: invalid probe description "
-			    "%s: %s\n", argv[0], argv[1],
+			    "%s: %s\n", g_progname, argv[0],
 			    dtrace_errmsg(dtp, dtrace_errno(dtp)));
 			return (2);
 		}

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl	Wed Aug  4 14:58:59 2010	(r210849)
@@ -21,12 +21,11 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-require 5.6.1;
+require 5.8.4;
 
 $PNAME = $0;
 $PNAME =~ s:.*/::;

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Wed Aug  4 14:58:59 2010	(r210849)
@@ -24,9 +24,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
-require 5.6.1;
+require 5.8.4;
 
 use File::Find;
 use File::Basename;
@@ -40,6 +39,7 @@ $OPTSTR = 'abd:fghi:jlnqsx:';
 $USAGE = "Usage: $PNAME [-abfghjlnqs] [-d dir] [-i isa] "
     . "[-x opt[=arg]] [file | dir ...]\n";
 ($MACH = `uname -p`) =~ s/\W*\n//;
+($PLATFORM = `uname -i`) =~ s/\W*\n//;
 
 @dtrace_argv = ();
 
@@ -215,17 +215,17 @@ sub is_exception {
 }
 
 #
-# Iterate over the set of test files specified on the command-line or by
-# a find on "$defdir/common" and "$defdir/$MACH" and execute each one.
-# If the test file is executable, we fork and exec it. If the test is a
-# .ksh file, we run it with $ksh_path. Otherwise we run dtrace -s on it.
-# If the file is named tst.* we assume it should return exit status 0.
-# If the file is named err.* we assume it should return exit status 1.
-# If the file is named err.D_[A-Z0-9]+[.*].d we use dtrace -xerrtags and
-# examine stderr to ensure that a matching error tag was produced.
-# If the file is named drp.[A-Z0-9]+[.*].d we use dtrace -xdroptags and
-# examine stderr to ensure that a matching drop tag was produced.
-# If any *.out or *.err files are found we perform output comparisons.
+# Iterate over the set of test files specified on the command-line or by a find
+# on "$defdir/common", "$defdir/$MACH" and "$defdir/$PLATFORM" and execute each
+# one.  If the test file is executable, we fork and exec it. If the test is a
+# .ksh file, we run it with $ksh_path. Otherwise we run dtrace -s on it.  If
+# the file is named tst.* we assume it should return exit status 0.  If the
+# file is named err.* we assume it should return exit status 1.  If the file is
+# named err.D_[A-Z0-9]+[.*].d we use dtrace -xerrtags and examine stderr to
+# ensure that a matching error tag was produced.  If the file is named
+# drp.[A-Z0-9]+[.*].d we use dtrace -xdroptags and examine stderr to ensure
+# that a matching drop tag was produced.  If any *.out or *.err files are found
+# we perform output comparisons.
 #
 # run_tests takes two arguments: The first is the pathname of the dtrace
 # command to invoke when running the tests. The second is the pathname
@@ -548,6 +548,7 @@ $bindir = -d $dt_bin ? $dt_bin : '.';
 
 find(\&wanted, "$defdir/common") if (scalar(@ARGV) == 0);
 find(\&wanted, "$defdir/$MACH") if (scalar(@ARGV) == 0);
+find(\&wanted, "$defdir/$PLATFORM") if (scalar(@ARGV) == 0);
 die $USAGE if (scalar(@files) == 0);
 
 $dtrace_path = '/usr/sbin/dtrace';

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d)
@@ -0,0 +1,41 @@
+/*
+ * 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 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * ASSERTION:
+ *     stddev() should not accept a non-scalar value
+ *
+ * SECTION: Aggregations/Aggregations
+ *
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	@a[pid] = stddev(probefunc);
+}
+

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d)
@@ -0,0 +1,41 @@
+/*
+ * 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 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * ASSERTION:
+ *     stddev() should not accept a call with no arguments
+ *
+ * SECTION: Aggregations/Aggregations
+ *
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	@a[1] = stddev();
+}
+

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d)
@@ -0,0 +1,41 @@
+/*
+ * 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 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * ASSERTION:
+ *     stddev() should not have more than one argument
+ *
+ * SECTION: Aggregations/Aggregations
+ *
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	@a[1] = stddev(1, 2);
+}
+

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.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 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * ASSERTION:
+ *     Positive stddev() test
+ *
+ * SECTION: Aggregations/Aggregations
+ *
+ * NOTES:
+ *     Verifies that printing a clear()'d aggregation with an stddev()
+ *     aggregation function doesn't cause problems.
+ *
+ */
+
+#pragma D option quiet
+
+tick-10ms
+/i++ < 5/
+{
+	@a = stddev(timestamp);
+}
+
+tick-10ms
+/i == 5/
+{
+	exit(2);
+}
+
+END
+{
+	clear(@a);
+	exit(0);
+}

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out)
@@ -0,0 +1,2 @@
+
+                0

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,15 +20,13 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ASSERTION:
- * 	Multiple aggregates can be used within the same D script.
+ *     Multiple aggregates can be used within the same D script.
  *
  * SECTION: Aggregations/Aggregations
  *
@@ -52,9 +50,11 @@ tick-10ms
 	@c[pid] = avg(new_time);
 	@d[pid] = sum(new_time);
 	@e[pid] = quantize(new_time);
-	@f[timestamp] = max(new_time);
-	@g[timestamp] = quantize(new_time);
-	@h[timestamp] = lquantize(new_time, 0, 10000, 1000);
+	@f[pid] = stddev(new_time);
+	@g[timestamp] = max(new_time);
+	@h[timestamp] = quantize(new_time);
+	@i[timestamp] = lquantize(new_time, 0, 10000, 1000);
+
 	time_1 = time_2;
 	i++;
 }

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,18 +20,16 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ASSERTION:
- *   Test multiple aggregations and the default output order
+ *     Test multiple aggregations and the default output order
  *
  * SECTION: Aggregations/Aggregations;
- *	Aggregations/Output
+ *     Aggregations/Output
  *
  */
 
@@ -51,6 +49,7 @@ tick-10ms
 	@d = max(i);
 	@e = quantize(i);
 	@f = lquantize(i, 0, 1000, 100);
+	@g = stddev(i);
 
 	i += 100;
 }

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out	Wed Aug  4 14:58:59 2010	(r210849)
@@ -34,3 +34,4 @@
              900 |@@@@                                     1        
          >= 1000 |                                         0        
 
+              287

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,19 +20,17 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ASSERTION:
- *   Test multiple aggregations and overriding default order with
- *   printa() statements.
+ *     Test multiple aggregations and overriding default order with
+ *     printa() statements.
  *
  * SECTION: Aggregations/Aggregations;
- *	Aggregations/Output
+ *     Aggregations/Output
  *
  * NOTES: This is a simple verifiable test.
  *
@@ -55,6 +53,7 @@ tick-10ms
 	@e = max(i);
 	@f = quantize(i);
 	@g = lquantize(i, 0, 1000, 100);
+	@h = stddev(i);
 
 	i += 100;
 }
@@ -62,6 +61,7 @@ tick-10ms
 tick-10ms
 /i == 1000/
 {
+	printa("%@d\n", @h);
 	printa("%@d\n", @g);
 	printa("%@d\n", @f);
 	printa("%@d\n", @e);

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out	Wed Aug  4 14:58:59 2010	(r210849)
@@ -1,3 +1,4 @@
+287
 
            value  ------------- Distribution ------------- count    
              < 0 |                                         0        

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,20 +20,19 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-
 /*
  * ASSERTION:
- *      Positive stddev() test
+ *     Positive stddev() test
  *
  * SECTION: Aggregations/Aggregations
  *
  * NOTES: This is a simple verifiable positive test of the stddev() function.
+ *     printa() for one aggregation, default printing behavior for the other
+ *     so that we exercise both code paths.
  */
 
 #pragma D option quiet
@@ -60,5 +59,6 @@ BEGIN
 	@b = stddev(-5000000700);
 	@b = stddev(-5000000800);
 	@b = stddev(-5000000900);
+	printa("%@d\n", @a);
 	exit(0);
 }

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out	Wed Aug  4 14:58:59 2010	(r210849)
@@ -1,3 +1,3 @@
+287
 
               287
-              287

Modified: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java
==============================================================================
--- projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java	Wed Aug  4 14:38:20 2010	(r210848)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java	Wed Aug  4 14:58:59 2010	(r210849)
@@ -20,10 +20,8 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * ident	"%Z%%M%	%I%	%E% SMI"
  */
 
 import org.opensolaris.os.dtrace.*;
@@ -70,7 +68,7 @@ public class TestFunctionLookup {
 			    long addr = (Long)address;
 			    f = consumer.lookupKernelFunction(addr);
 			}
-			if (f.equals("genunix`setrun")) {
+			if (f.equals("genunix`cv_wakeup")) {
 			    System.out.println(f);
 			    done = true;
 			}

Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java (from r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java	Wed Aug  4 14:58:59 2010	(r210849, copy of r210792, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java)
@@ -0,0 +1,252 @@
+/*
+ * 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 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+import org.opensolaris.os.dtrace.*;
+import java.util.*;
+
+/**
+ * Assert getAggregate() can explicitly specify the anonymous aggregation.
+ */
+public class TestGetAggregate {
+    static final String programString =
+	    "profile:::tick-50ms" +
+	    "{" +
+	    "        @ = count();" +
+	    "        @a = count();" +
+	    "}";
+
+    static final String ANONYMOUS_AGGREGATION = "";
+    static final int TICK = 50;
+    static final int EXPECTED_TICKS = 3;
+    static final int INTERVALS = 4;
+
+    static void
+    testIncluded(Consumer consumer, String ... aggregationNames)
+	    throws DTraceException, InterruptedException
+    {
+	Aggregate aggregate;
+	Set <String> included = new HashSet <String> ();
+	int n = 1;
+
+	for (String name : aggregationNames) {
+	    included.add(name);
+	}
+
+	// Wait up to a full second to obtain aggregate data. Without a
+	// time limit, we'll loop forever if no aggregation was
+	// successfully included.
+	do {
+	    Thread.sleep(TICK);
+	    aggregate = consumer.getAggregate(included, null);
+	} while (aggregate.asMap().isEmpty() && n++ < (1000 / TICK));
+
+	for (String name : included) {
+	    if (aggregate.getAggregation(name) == null) {
+		throw new IllegalStateException("@" + name +
+			" was explicitly included but did not appear " +
+			"in the aggregate");
+	    }
+	}
+	for (Aggregation a : aggregate.getAggregations()) {
+	    if (!included.contains(a.getName())) {
+		throw new IllegalStateException("@" + a.getName() +
+			" was not explicitly included but appeared " +
+			"in the aggregate anyway");
+	    }
+	}
+
+	if (!consumer.isRunning()) {
+	    throw new IllegalStateException("consumer exited");
+	}
+    }
+
+    static void
+    testCleared(Consumer consumer, String ... aggregationNames)
+	    throws DTraceException, InterruptedException
+    {
+	Aggregate aggregate;
+	AggregationRecord rec;
+	long value;
+	Long firstValue;
+	int n = 1;
+	Map <String, Long> firstValues = new HashMap <String, Long> ();
+	Set <String> cleared = new HashSet <String> ();
+
+	for (String name : aggregationNames) {
+	    cleared.add(name);
+	}
+
+	do {
+	    Thread.sleep(TICK);
+	    aggregate = consumer.getAggregate(null, cleared);
+	} while (aggregate.asMap().isEmpty() && n++ < (1000 / TICK));
+	n = 1;
+
+	do {
+	    Thread.sleep(TICK * EXPECTED_TICKS);
+	    aggregate = consumer.getAggregate(null, cleared);
+
+	    for (Aggregation a : aggregate.getAggregations()) {
+		if (!firstValues.containsKey(a.getName())) {
+		    rec = a.getRecord(Tuple.EMPTY);
+		    value = rec.getValue().getValue().longValue();
+		    firstValues.put(a.getName(), value);
+		}
+	    }
+	} while (consumer.isRunning() && n++ < INTERVALS);
+
+	for (Aggregation a : aggregate.getAggregations()) {
+	    rec = a.getRecord(Tuple.EMPTY);
+	    value = rec.getValue().getValue().longValue();
+	    firstValue = firstValues.get(a.getName());
+
+	    if (cleared.contains(a.getName())) {
+		// last value should be about the same as first value
+		if (value > (firstValue * 2)) {
+		    throw new IllegalStateException(
+			    "@" + a.getName() + " should have " +
+			    "been cleared but instead grew from " +
+			    firstValue + " to " + value);
+		}
+	    } else {
+		// last value should be about (INTERVALS * firstValue)
+		if (value < (firstValue * 2)) {
+		    throw new IllegalStateException(
+			    "@" + a.getName() + " should have " +
+			    "accumulated a running total but " +
+			    "instead went from " +
+			    firstValue + " to " + value);
+		}
+	    }
+	}
+
+	if (!consumer.isRunning()) {
+	    throw new IllegalStateException("consumer exited");
+	}
+    }
+
+    static Integer includedStatus;
+    static Integer clearedStatus;
+
+    static void
+    startIncludedTest()
+    {
+	final Consumer consumer = new LocalConsumer();
+	consumer.addConsumerListener(new ConsumerAdapter() {
+	    public void consumerStarted(ConsumerEvent e) {
+		new Thread(new Runnable() {
+		    public void run() {
+			try {
+			    testIncluded(consumer, ANONYMOUS_AGGREGATION);
+			    includedStatus = 0;
+			} catch (Exception e) {
+			    includedStatus = 1;
+			    e.printStackTrace();
+			} finally {
+			    consumer.abort();
+			}
+		    }
+		}).start();
+	    }
+	});
+
+	try {
+	    consumer.open();
+	    consumer.setOption(Option.aggrate, Option.millis(TICK));
+	    consumer.compile(programString);
+	    consumer.enable();
+	    consumer.go();
+	} catch (Exception e) {
+	    includedStatus = 1;
+	    e.printStackTrace();
+	}
+    }
+
+    static void
+    startClearedTest()
+    {
+	final Consumer consumer = new LocalConsumer();
+	consumer.addConsumerListener(new ConsumerAdapter() {
+	    public void consumerStarted(ConsumerEvent e) {
+		new Thread(new Runnable() {
+		    public void run() {
+			try {
+			    testCleared(consumer, ANONYMOUS_AGGREGATION);
+			    clearedStatus = 0;
+			} catch (Exception e) {
+			    clearedStatus = 1;
+			    e.printStackTrace();
+			} finally {
+			    consumer.abort();
+			}
+		    }
+		}).start();
+	    }
+	});
+
+	try {
+	    consumer.open();
+	    consumer.setOption(Option.aggrate, Option.millis(TICK));
+	    consumer.compile(programString);
+	    consumer.enable();

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
