Date: Thu, 26 Jun 2014 13:02:21 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r267913 - in user/attilio/rm_vmobj_cache: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common con... Message-ID: <201406261302.s5QD2LeD082275@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu Jun 26 13:02:21 2014 New Revision: 267913 URL: http://svnweb.freebsd.org/changeset/base/267913 Log: Merge from head. Added: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out - copied unchanged from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out user/attilio/rm_vmobj_cache/contrib/file/config.guess - copied unchanged from r267912, head/contrib/file/config.guess user/attilio/rm_vmobj_cache/contrib/file/config.sub - copied unchanged from r267912, head/contrib/file/config.sub user/attilio/rm_vmobj_cache/contrib/file/depcomp - copied unchanged from r267912, head/contrib/file/depcomp user/attilio/rm_vmobj_cache/contrib/file/doc/ - copied from r267912, head/contrib/file/doc/ user/attilio/rm_vmobj_cache/contrib/file/ltmain.sh - copied unchanged from r267912, head/contrib/file/ltmain.sh user/attilio/rm_vmobj_cache/contrib/file/m4/ - copied from r267912, head/contrib/file/m4/ user/attilio/rm_vmobj_cache/contrib/file/magic/ - copied from r267912, head/contrib/file/magic/ user/attilio/rm_vmobj_cache/contrib/file/missing - copied unchanged from r267912, head/contrib/file/missing user/attilio/rm_vmobj_cache/contrib/file/python/ - copied from r267912, head/contrib/file/python/ user/attilio/rm_vmobj_cache/contrib/file/src/ - copied from r267912, head/contrib/file/src/ user/attilio/rm_vmobj_cache/contrib/file/tests/escapevel.result - copied unchanged from r267912, head/contrib/file/tests/escapevel.result user/attilio/rm_vmobj_cache/contrib/file/tests/escapevel.testfile - copied unchanged from r267912, head/contrib/file/tests/escapevel.testfile user/attilio/rm_vmobj_cache/contrib/file/tests/issue311docx.result - copied unchanged from r267912, head/contrib/file/tests/issue311docx.result user/attilio/rm_vmobj_cache/contrib/file/tests/issue311docx.testfile - copied unchanged from r267912, head/contrib/file/tests/issue311docx.testfile Deleted: user/attilio/rm_vmobj_cache/contrib/file/Header user/attilio/rm_vmobj_cache/contrib/file/Localstuff user/attilio/rm_vmobj_cache/contrib/file/Magdir/ user/attilio/rm_vmobj_cache/contrib/file/Makefile.am-src user/attilio/rm_vmobj_cache/contrib/file/apprentice.c user/attilio/rm_vmobj_cache/contrib/file/apptype.c user/attilio/rm_vmobj_cache/contrib/file/ascmagic.c user/attilio/rm_vmobj_cache/contrib/file/asprintf.c user/attilio/rm_vmobj_cache/contrib/file/cdf.c user/attilio/rm_vmobj_cache/contrib/file/cdf.h user/attilio/rm_vmobj_cache/contrib/file/cdf_time.c user/attilio/rm_vmobj_cache/contrib/file/compress.c user/attilio/rm_vmobj_cache/contrib/file/elfclass.h user/attilio/rm_vmobj_cache/contrib/file/encoding.c user/attilio/rm_vmobj_cache/contrib/file/file.c user/attilio/rm_vmobj_cache/contrib/file/file.h user/attilio/rm_vmobj_cache/contrib/file/file.man user/attilio/rm_vmobj_cache/contrib/file/file_opts.h user/attilio/rm_vmobj_cache/contrib/file/fsmagic.c user/attilio/rm_vmobj_cache/contrib/file/funcs.c user/attilio/rm_vmobj_cache/contrib/file/getline.c user/attilio/rm_vmobj_cache/contrib/file/getopt_long.c user/attilio/rm_vmobj_cache/contrib/file/is_tar.c user/attilio/rm_vmobj_cache/contrib/file/libmagic.man user/attilio/rm_vmobj_cache/contrib/file/magic.c user/attilio/rm_vmobj_cache/contrib/file/magic.h user/attilio/rm_vmobj_cache/contrib/file/magic.man user/attilio/rm_vmobj_cache/contrib/file/magic2mime user/attilio/rm_vmobj_cache/contrib/file/mygetopt.h user/attilio/rm_vmobj_cache/contrib/file/names.h user/attilio/rm_vmobj_cache/contrib/file/print.c user/attilio/rm_vmobj_cache/contrib/file/readcdf.c user/attilio/rm_vmobj_cache/contrib/file/readelf.c user/attilio/rm_vmobj_cache/contrib/file/readelf.h user/attilio/rm_vmobj_cache/contrib/file/softmagic.c user/attilio/rm_vmobj_cache/contrib/file/strlcat.c user/attilio/rm_vmobj_cache/contrib/file/strlcpy.c user/attilio/rm_vmobj_cache/contrib/file/tar.h user/attilio/rm_vmobj_cache/contrib/file/tests/gedcom.magic user/attilio/rm_vmobj_cache/contrib/file/vasprintf.c user/attilio/rm_vmobj_cache/share/examples/cvsup/ user/attilio/rm_vmobj_cache/sys/cddl/dev/dtrace/dtrace_clone.c user/attilio/rm_vmobj_cache/usr.bin/csup/ user/attilio/rm_vmobj_cache/usr.sbin/ctm/mkCTM/ctm_conf.gnats Modified: user/attilio/rm_vmobj_cache/ObsoleteFiles.inc user/attilio/rm_vmobj_cache/UPDATING user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool.8 user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h user/attilio/rm_vmobj_cache/contrib/file/ChangeLog user/attilio/rm_vmobj_cache/contrib/file/Makefile.am user/attilio/rm_vmobj_cache/contrib/file/Makefile.in user/attilio/rm_vmobj_cache/contrib/file/README user/attilio/rm_vmobj_cache/contrib/file/TODO user/attilio/rm_vmobj_cache/contrib/file/aclocal.m4 user/attilio/rm_vmobj_cache/contrib/file/compile user/attilio/rm_vmobj_cache/contrib/file/config.h.in user/attilio/rm_vmobj_cache/contrib/file/configure user/attilio/rm_vmobj_cache/contrib/file/configure.ac user/attilio/rm_vmobj_cache/contrib/file/install-sh user/attilio/rm_vmobj_cache/contrib/file/tests/Makefile.am user/attilio/rm_vmobj_cache/contrib/file/tests/Makefile.in user/attilio/rm_vmobj_cache/contrib/file/tests/README user/attilio/rm_vmobj_cache/contrib/file/tests/gedcom.result user/attilio/rm_vmobj_cache/etc/mtree/BSD.tests.dist user/attilio/rm_vmobj_cache/etc/mtree/BSD.usr.dist user/attilio/rm_vmobj_cache/etc/network.subr user/attilio/rm_vmobj_cache/gnu/lib/csu/Makefile user/attilio/rm_vmobj_cache/gnu/lib/libgcc/Makefile user/attilio/rm_vmobj_cache/gnu/lib/libgcov/Makefile user/attilio/rm_vmobj_cache/lib/libc/net/getaddrinfo.c user/attilio/rm_vmobj_cache/lib/libc/sys/bind.2 user/attilio/rm_vmobj_cache/lib/libc/sys/connect.2 user/attilio/rm_vmobj_cache/lib/libc/sys/intro.2 user/attilio/rm_vmobj_cache/lib/libc/sys/socket.2 user/attilio/rm_vmobj_cache/lib/libcuse/cuse.3 user/attilio/rm_vmobj_cache/lib/libmagic/Makefile user/attilio/rm_vmobj_cache/lib/libmagic/config.h user/attilio/rm_vmobj_cache/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 user/attilio/rm_vmobj_cache/lib/libpmc/pmc.k8.3 user/attilio/rm_vmobj_cache/lib/libpmc/pmc.p4.3 user/attilio/rm_vmobj_cache/lib/libutil/fparseln.3 user/attilio/rm_vmobj_cache/lib/libutil/login_class.3 user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.c user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.h user/attilio/rm_vmobj_cache/libexec/rtld-elf/rtld.1 user/attilio/rm_vmobj_cache/release/scripts/mm-mtree.sh user/attilio/rm_vmobj_cache/sbin/ifconfig/ifconfig.8 user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw.8 user/attilio/rm_vmobj_cache/sbin/mount_fusefs/mount_fusefs.8 user/attilio/rm_vmobj_cache/sbin/natd/natd.8 user/attilio/rm_vmobj_cache/sbin/pfctl/pfctl.8 user/attilio/rm_vmobj_cache/share/examples/Makefile user/attilio/rm_vmobj_cache/share/examples/etc/make.conf user/attilio/rm_vmobj_cache/share/man/man4/acpi.4 user/attilio/rm_vmobj_cache/share/man/man4/est.4 user/attilio/rm_vmobj_cache/share/man/man4/iic.4 user/attilio/rm_vmobj_cache/share/man/man4/iicbus.4 user/attilio/rm_vmobj_cache/share/man/man4/mxge.4 user/attilio/rm_vmobj_cache/share/man/man4/ng_async.4 user/attilio/rm_vmobj_cache/share/man/man4/ng_ccatm.4 user/attilio/rm_vmobj_cache/share/man/man4/sysmouse.4 user/attilio/rm_vmobj_cache/share/man/man4/tty.4 user/attilio/rm_vmobj_cache/share/man/man4/vale.4 user/attilio/rm_vmobj_cache/share/man/man7/build.7 user/attilio/rm_vmobj_cache/share/man/man9/Makefile user/attilio/rm_vmobj_cache/share/man/man9/fpu_kern.9 user/attilio/rm_vmobj_cache/share/man/man9/ifnet.9 user/attilio/rm_vmobj_cache/share/misc/committers-ports.dot user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm.c user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm_stat.c user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm_stat.h user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.c user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.h user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_block.c user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_ramdisk.c user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_cmd_table.c user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_iscsi.c user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_io.h user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_private.h user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_all.h user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/attilio/rm_vmobj_cache/sys/cddl/dev/dtrace/dtrace_ioctl.c user/attilio/rm_vmobj_cache/sys/cddl/dev/dtrace/dtrace_load.c user/attilio/rm_vmobj_cache/sys/cddl/dev/dtrace/dtrace_unload.c user/attilio/rm_vmobj_cache/sys/crypto/aesni/aesni.c user/attilio/rm_vmobj_cache/sys/crypto/aesni/aesni.h user/attilio/rm_vmobj_cache/sys/crypto/aesni/aesni_wrap.c user/attilio/rm_vmobj_cache/sys/dev/acpica/acpi.c user/attilio/rm_vmobj_cache/sys/dev/acpica/acpi_powerres.c user/attilio/rm_vmobj_cache/sys/dev/cpuctl/cpuctl.c user/attilio/rm_vmobj_cache/sys/dev/glxiic/glxiic.c user/attilio/rm_vmobj_cache/sys/dev/mrsas/mrsas_fp.c user/attilio/rm_vmobj_cache/sys/dev/oce/oce_hw.c user/attilio/rm_vmobj_cache/sys/dev/oce/oce_hw.h user/attilio/rm_vmobj_cache/sys/dev/oce/oce_if.c user/attilio/rm_vmobj_cache/sys/dev/oce/oce_if.h user/attilio/rm_vmobj_cache/sys/dev/oce/oce_mbox.c user/attilio/rm_vmobj_cache/sys/dev/virtio/balloon/virtio_balloon.c user/attilio/rm_vmobj_cache/sys/dev/xen/balloon/balloon.c user/attilio/rm_vmobj_cache/sys/fs/cuse/cuse.c user/attilio/rm_vmobj_cache/sys/kern/subr_sleepqueue.c user/attilio/rm_vmobj_cache/sys/modules/dtrace/fasttrap/Makefile user/attilio/rm_vmobj_cache/sys/netinet/in.h user/attilio/rm_vmobj_cache/sys/netinet/in_rss.c user/attilio/rm_vmobj_cache/sys/netinet/in_rss.h user/attilio/rm_vmobj_cache/sys/netinet/ip_output.c user/attilio/rm_vmobj_cache/sys/netinet6/nd6.c user/attilio/rm_vmobj_cache/sys/sys/time.h user/attilio/rm_vmobj_cache/sys/vm/vm_map.c user/attilio/rm_vmobj_cache/tools/ifnet/convert_drvapi.sh user/attilio/rm_vmobj_cache/usr.bin/Makefile user/attilio/rm_vmobj_cache/usr.bin/file/Makefile user/attilio/rm_vmobj_cache/usr.bin/gzip/zuncompress.c user/attilio/rm_vmobj_cache/usr.bin/procstat/procstat_files.c user/attilio/rm_vmobj_cache/usr.bin/whois/whois.c user/attilio/rm_vmobj_cache/usr.sbin/bhyve/pci_emul.c user/attilio/rm_vmobj_cache/usr.sbin/bhyve/rtc.c user/attilio/rm_vmobj_cache/usr.sbin/bhyve/smbiostbl.c user/attilio/rm_vmobj_cache/usr.sbin/bhyveload/bhyveload.c user/attilio/rm_vmobj_cache/usr.sbin/ctld/parse.y user/attilio/rm_vmobj_cache/usr.sbin/ctld/token.l Directory Properties: user/attilio/rm_vmobj_cache/ (props changed) user/attilio/rm_vmobj_cache/cddl/ (props changed) user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/ (props changed) user/attilio/rm_vmobj_cache/contrib/file/ (props changed) user/attilio/rm_vmobj_cache/etc/ (props changed) user/attilio/rm_vmobj_cache/gnu/lib/ (props changed) user/attilio/rm_vmobj_cache/lib/libc/ (props changed) user/attilio/rm_vmobj_cache/lib/libutil/ (props changed) user/attilio/rm_vmobj_cache/lib/libvmmapi/ (props changed) user/attilio/rm_vmobj_cache/sbin/ (props changed) user/attilio/rm_vmobj_cache/sbin/ipfw/ (props changed) user/attilio/rm_vmobj_cache/share/ (props changed) user/attilio/rm_vmobj_cache/share/man/man4/ (props changed) user/attilio/rm_vmobj_cache/sys/ (props changed) user/attilio/rm_vmobj_cache/sys/amd64/vmm/ (props changed) user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/rm_vmobj_cache/usr.bin/procstat/ (props changed) user/attilio/rm_vmobj_cache/usr.sbin/bhyve/ (props changed) user/attilio/rm_vmobj_cache/usr.sbin/bhyveload/ (props changed) Modified: user/attilio/rm_vmobj_cache/ObsoleteFiles.inc ============================================================================== --- user/attilio/rm_vmobj_cache/ObsoleteFiles.inc Thu Jun 26 12:12:18 2014 (r267912) +++ user/attilio/rm_vmobj_cache/ObsoleteFiles.inc Thu Jun 26 13:02:21 2014 (r267913) @@ -38,7 +38,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20140625: csup removal +OLD_FILES+=usr/bin/csup +OLD_FILES+=usr/bin/cpasswd +OLD_FILES+=usr/share/man/man1/csup.1.gz +OLD_FILES+=usr/share/man/man1/cpasswd.1.gz +OLD_FILES+=usr/share/examples/cvsup/README +OLD_FILES+=usr/share/examples/cvsup/cvs-supfile +OLD_FILES+=usr/share/examples/cvsup/stable-supfile +OLD_FILES+=usr/share/examples/cvsup/standard-supfile +OLD_DIRS+=usr/share/examples/cvsup # 20140614: send-pr removal +OLD_FILES+=usr/share/info/send-pr.info.gz OLD_FILES+=usr/share/man/man1/send-pr.1.gz OLD_FILES+=etc/gnats/freefall OLD_DIRS+=etc/gnats Modified: user/attilio/rm_vmobj_cache/UPDATING ============================================================================== --- user/attilio/rm_vmobj_cache/UPDATING Thu Jun 26 12:12:18 2014 (r267912) +++ user/attilio/rm_vmobj_cache/UPDATING Thu Jun 26 13:02:21 2014 (r267913) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140619: + Maximal length of the serial number in CTL was increased from 16 to + 64 chars, that breaks ABI. All CTL-related tools, such as ctladm + and ctld, need to be rebuilt to work with a new kernel. + 20140606: The libatf-c and libatf-c++ major versions were downgraded to 0 and 1 respectively to match the upstream numbers. They were out of @@ -67,11 +72,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 behavior back, you can .include /etc/src.conf from /etc/make.conf (which is still global and isn't changed). This also changes the behavior of incremental builds inside the tree of individual - directories. Set MAKESYSPATH to "/usr/src/share/mk" to do that. + directories. Set MAKESYSPATH to ".../share/mk" to do that. Although this has survived make universe and some upgrade scenarios, other upgrade scenarios may have broken. At least one form of temporary breakage was fixed with MAKESYSPATH settings for buildworld - as well... + as well... In cases where MAKESYSPATH isn't working with this + setting, you'll need to set it to the full path to your tree. One side effect of all this cleaning up is that bsd.compiler.mk is no longer implicitly included by bsd.own.mk. If you wish to Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d) @@ -0,0 +1,32 @@ +/* + * 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 +#pragma D option encoding=utf8 +#pragma D option aggzoom + +tick-1ms +/i++ < 320/ +{ + @ = lquantize(i, 0, 640, 1, i); + @ = lquantize(641 - i, 0, 640, 1, i); +} + +tick-1ms +/i == 320/ +{ + printa(@); + exit(0); +} Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out) ============================================================================== Binary file (source and/or target). No diff available. Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d) @@ -0,0 +1,46 @@ +/* + * 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 agghist +#pragma D option quiet + +BEGIN +{ + @["demerit"] = sum(-10); + @["wtf"] = sum(10); + @["bot"] = sum(20); + + @bagnoogle["SOAP/XML"] = sum(1); + @bagnoogle["XACML store"] = sum(5); + @bagnoogle["SAML token"] = sum(6); + + @stalloogle["breakfast"] = sum(-5); + @stalloogle["non-diet pepsi"] = sum(-20); + @stalloogle["parrot"] = sum(-100); + + printa(@); + printa(@bagnoogle); + printa(@stalloogle); + + printf("\nzoomed:"); + + setopt("aggzoom"); + printa(@); + printa(@bagnoogle); + printa(@stalloogle); + + exit(0); +} + Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out) @@ -0,0 +1,38 @@ + + + key ------------- Distribution ------------- count + demerit @@@@@| -10 + wtf |@@@@@ 10 + bot |@@@@@@@@@@ 20 + + + key ------------- Distribution ------------- count + SOAP/XML |@@@ 1 + XACML store |@@@@@@@@@@@@@@@@@ 5 + SAML token |@@@@@@@@@@@@@@@@@@@@ 6 + + + key ------------- Distribution ------------- count + parrot @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@| -100 + non-diet pepsi @@@@@@| -20 + breakfast @@| -5 + +zoomed: + + key ------------- Distribution ------------- count + demerit @@@@@@@@@@| -10 + wtf |@@@@@@@@@@ 10 + bot |@@@@@@@@@@@@@@@@@@@ 20 + + + key ------------- Distribution ------------- count + SOAP/XML |@@@@@@@ 1 + XACML store |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5 + SAML token |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6 + + + key ------------- Distribution ------------- count + parrot @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@| -100 + non-diet pepsi @@@@@@@@| -20 + breakfast @@| -5 + Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d) @@ -0,0 +1,53 @@ +/* + * 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 aggpack +#pragma D option encoding=ascii +#pragma D option quiet + +BEGIN +{ + @x = quantize(1 << 32); + @y[1] = quantize(1); + @z["mumble"] = quantize(1); + @xx["foo", (char)1, (short)2, (long)3] = quantize(1); + + @neg = lquantize(-10, -10, 20, 1, -1); + @neg = lquantize(-5, -10, 20, 1, 1); + @neg = lquantize(0, -10, 20, 1, 1); + + i = 0; +} + +tick-1ms +{ + @a[i] = quantize(0, i); + @a[i] = quantize(1, 100 - i); + i++; +} + +tick-1ms +/i > 100/ +{ + exit(0); +} + +END +{ + setopt("aggzoom", "true"); + printa(@neg); + setopt("aggzoom", "false"); + printa(@neg); +} Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out) @@ -0,0 +1,124 @@ + + + min .--------------------------------. max | count + < -10 : V X X : >= 20 | 1 + + + min .--------------------------------. max | count + < -10 : v x x : >= 20 | 1 + + + min .---. max | count + 2147483648 : X : 8589934592 | 1 + + key min .---. max | count + 1 0 : X : 2 | 1 + + key min .---. max | count + mumble 0 : X : 2 | 1 + + key min .---. max | count + foo 1 2 3 0 : X : 2 | 1 + + key min .---. max | count + 100 0 :X : 2 | 100 + 99 0 :X_ : 2 | 100 + 98 0 :X_ : 2 | 100 + 97 0 :X_ : 2 | 100 + 96 0 :X_ : 2 | 100 + 95 0 :X_ : 2 | 100 + 94 0 :X_ : 2 | 100 + 93 0 :X_ : 2 | 100 + 92 0 :X_ : 2 | 100 + 91 0 :X_ : 2 | 100 + 90 0 :X_ : 2 | 100 + 89 0 :X_ : 2 | 100 + 88 0 :X_ : 2 | 100 + 87 0 :X_ : 2 | 100 + 86 0 :X_ : 2 | 100 + 85 0 :X_ : 2 | 100 + 84 0 :X_ : 2 | 100 + 83 0 :X_ : 2 | 100 + 82 0 :X_ : 2 | 100 + 81 0 :X_ : 2 | 100 + 80 0 :X_ : 2 | 100 + 79 0 :X_ : 2 | 100 + 78 0 :xx : 2 | 100 + 77 0 :xx : 2 | 100 + 76 0 :xx : 2 | 100 + 75 0 :xx : 2 | 100 + 74 0 :xx : 2 | 100 + 73 0 :xx : 2 | 100 + 72 0 :xx : 2 | 100 + 71 0 :xx : 2 | 100 + 70 0 :xx : 2 | 100 + 69 0 :xx : 2 | 100 + 68 0 :xx : 2 | 100 + 67 0 :xx : 2 | 100 + 66 0 :xx : 2 | 100 + 65 0 :xx : 2 | 100 + 64 0 :xx : 2 | 100 + 63 0 :xx : 2 | 100 + 62 0 :xx : 2 | 100 + 61 0 :xx : 2 | 100 + 60 0 :xx : 2 | 100 + 59 0 :xx : 2 | 100 + 58 0 :xx : 2 | 100 + 57 0 :xx : 2 | 100 + 56 0 :xx : 2 | 100 + 55 0 :xx : 2 | 100 + 54 0 :xx : 2 | 100 + 53 0 :xx : 2 | 100 + 52 0 :xx : 2 | 100 + 51 0 :xx : 2 | 100 + 50 0 :xx : 2 | 100 + 49 0 :xx : 2 | 100 + 48 0 :xx : 2 | 100 + 47 0 :xx : 2 | 100 + 46 0 :xx : 2 | 100 + 45 0 :xx : 2 | 100 + 44 0 :xx : 2 | 100 + 43 0 :xx : 2 | 100 + 42 0 :xx : 2 | 100 + 41 0 :xx : 2 | 100 + 40 0 :xx : 2 | 100 + 39 0 :xx : 2 | 100 + 38 0 :xx : 2 | 100 + 37 0 :xx : 2 | 100 + 36 0 :xx : 2 | 100 + 35 0 :xx : 2 | 100 + 34 0 :xx : 2 | 100 + 33 0 :xx : 2 | 100 + 32 0 :xx : 2 | 100 + 31 0 :xx : 2 | 100 + 30 0 :xx : 2 | 100 + 29 0 :xx : 2 | 100 + 28 0 :xx : 2 | 100 + 27 0 :xx : 2 | 100 + 26 0 :xx : 2 | 100 + 25 0 :xx : 2 | 100 + 24 0 :xx : 2 | 100 + 23 0 :xx : 2 | 100 + 22 0 :xx : 2 | 100 + 21 0 :_X : 2 | 100 + 20 0 :_X : 2 | 100 + 19 0 :_X : 2 | 100 + 18 0 :_X : 2 | 100 + 17 0 :_X : 2 | 100 + 16 0 :_X : 2 | 100 + 15 0 :_X : 2 | 100 + 14 0 :_X : 2 | 100 + 13 0 :_X : 2 | 100 + 12 0 :_X : 2 | 100 + 11 0 :_X : 2 | 100 + 10 0 :_X : 2 | 100 + 9 0 :_X : 2 | 100 + 8 0 :_X : 2 | 100 + 7 0 :_X : 2 | 100 + 6 0 :_X : 2 | 100 + 5 0 :_X : 2 | 100 + 4 0 :_X : 2 | 100 + 3 0 :_X : 2 | 100 + 2 0 :_X : 2 | 100 + 1 0 :_X : 2 | 100 + 0 0 : X : 2 | 100 Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh) @@ -0,0 +1,75 @@ +# +# 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. +# + +let width=8 + +function outputchar +{ + banner $3 | awk -v line=$1 -v pos=$2 -v width=$width '{ \ + for (i = 1; i <= length($0); i++) { \ + if (substr($0, i, 1) == " ") \ + continue; \ + printf("\t@letter%d[%d] = lquantize(%d, 0, 40, 1);\n", \ + line, NR, i + (pos * width)); + } \ + }' +} + +function outputstr +{ + let pos=0; + let line=0 + + printf "#pragma D option aggpack\n#pragma D option aggsortkey\n" + + printf "BEGIN\n{\n" + for c in `echo "$1" | awk '{ \ + for (i = 1; i <= length($0); i++) { \ + c = substr($0, i, 1); \ + printf("%s\n", c == " " ? "space" : \ + c == "\n" ? "newline" : c); \ + } \ + }'`; do + if [[ "$c" == "space" ]]; then + let line=line+1 + let pos=0 + continue + fi + + outputchar $line $pos $c + let pos=pos+1 + done + + let i=0 + + while [[ $i -le $line ]]; do + printf "\tprinta(@letter%d);\n" $i + let i=i+1 + done + printf "\texit(0);\n}\n" +} + +dtrace -qs /dev/stdin -x encoding=utf8 <<EOF +`outputstr "why must i do this"` +EOF + +dtrace -qs /dev/stdin -x encoding=ascii -x aggzoom <<EOF +`outputstr "i am not well"` +EOF + +dtrace -qs /dev/stdin -x encoding=utf8 -x aggzoom <<EOF +`outputstr "send help"` +EOF + Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out) @@ -0,0 +1,102 @@ + + + key min .------------------------------------------. max | count + 2 < 0 : ▂ ▂ ▂ ▂ ▂ ▂ : >= 40 | 6 + 3 < 0 : ▂ ▂ ▂ ▂ ▂ ▂ : >= 40 | 6 + 4 < 0 : ▂ ▂ ▂▂▂▂▂▂ ▂ : >= 40 | 9 + 5 < 0 : ▂ ▂▂ ▂ ▂ ▂ ▂ : >= 40 | 7 + 6 < 0 : ▂▂ ▂▂ ▂ ▂ ▂ : >= 40 | 7 + 7 < 0 : ▂ ▂ ▂ ▂ ▂ : >= 40 | 5 + + + key min .------------------------------------------. max | count + 2 < 0 : ▂ ▂ ▂ ▂ ▂▂▂▂ ▂▂▂▂▂ : >= 40 | 13 + 3 < 0 : ▂▂ ▂▂ ▂ ▂ ▂ ▂ : >= 40 | 8 + 4 < 0 : ▂ ▂▂ ▂ ▂ ▂ ▂▂▂▂ ▂ : >= 40 | 11 + 5 < 0 : ▂ ▂ ▂ ▂ ▂ ▂ : >= 40 | 6 + 6 < 0 : ▂ ▂ ▂ ▂ ▂ ▂ ▂ : >= 40 | 7 + 7 < 0 : ▂ ▂ ▂▂▂▂ ▂▂▂▂ ▂ : >= 40 | 11 + + + key min .------------------------------------------. max | count + 2 < 0 : █ : >= 40 | 1 + 3 < 0 : █ : >= 40 | 1 + 4 < 0 : █ : >= 40 | 1 + 5 < 0 : █ : >= 40 | 1 + 6 < 0 : █ : >= 40 | 1 + 7 < 0 : █ : >= 40 | 1 + + + key min .------------------------------------------. max | count + 2 < 0 : ▂▂▂▂▂ ▂▂▂▂ : >= 40 | 9 + 3 < 0 : ▃ ▃ ▃ ▃ : >= 40 | 4 + 4 < 0 : ▃ ▃ ▃ ▃ : >= 40 | 4 + 5 < 0 : ▃ ▃ ▃ ▃ : >= 40 | 4 + 6 < 0 : ▃ ▃ ▃ ▃ : >= 40 | 4 + 7 < 0 : ▂▂▂▂▂ ▂▂▂▂ : >= 40 | 9 + + + key min .------------------------------------------. max | count + 2 < 0 : ▂▂▂▂▂ ▂ ▂ ▂ ▂▂▂▂ : >= 40 | 12 + 3 < 0 : ▂ ▂ ▂ ▂ ▂ : >= 40 | 5 + 4 < 0 : ▂ ▂▂▂▂▂▂ ▂ ▂▂▂▂ : >= 40 | 12 + 5 < 0 : ▂ ▂ ▂ ▂ ▂ : >= 40 | 5 + 6 < 0 : ▂ ▂ ▂ ▂ ▂ ▂ : >= 40 | 6 + 7 < 0 : ▂ ▂ ▂ ▂ ▂▂▂▂ : >= 40 | 8 + + + + key min .------------------------------------------. max | count + 2 < 0 : X : >= 40 | 1 + 3 < 0 : X : >= 40 | 1 + 4 < 0 : X : >= 40 | 1 + 5 < 0 : X : >= 40 | 1 + 6 < 0 : X : >= 40 | 1 + 7 < 0 : X : >= 40 | 1 + + + key min .------------------------------------------. max | count + 2 < 0 : XX X X : >= 40 | 4 + 3 < 0 : X X XX XX : >= 40 | 6 + 4 < 0 : X X X XX X : >= 40 | 6 + 5 < 0 : XXXXXX X X : >= 40 | 8 + 6 < 0 : X X X X : >= 40 | 4 + 7 < 0 : X X X X : >= 40 | 4 + + + key min .------------------------------------------. max | count + 2 < 0 : X X XXXX XXXXX : >= 40 | 11 + 3 < 0 : XX X X X X : >= 40 | 6 + 4 < 0 : X X X X X X : >= 40 | 6 + 5 < 0 : X X X X X X : >= 40 | 6 + 6 < 0 : X XX X X X : >= 40 | 6 + 7 < 0 : X X XXXX X : >= 40 | 7 + + + key min .------------------------------------------. max | count + 2 < 0 : X X XXXXXX X X : >= 40 | 10 + 3 < 0 : X X X X X : >= 40 | 5 + 4 < 0 : X X XXXXX X X : >= 40 | 9 + 5 < 0 : X XX X X X X : >= 40 | 7 + 6 < 0 : XX XX X X X : >= 40 | 7 + 7 < 0 : X X XXXXXX XXXXXX XXXXXX : >= 40 | 20 + + + + key min .------------------------------------------. max | count + 2 < 0 : ████ ██████ █ █ █████ : >= 40 | 17 + 3 < 0 : █ █ ██ █ █ █ : >= 40 | 7 + 4 < 0 : ████ █████ █ █ █ █ █ : >= 40 | 14 + 5 < 0 : █ █ █ █ █ █ █ : >= 40 | 7 + 6 < 0 : █ █ █ █ ██ █ █ : >= 40 | 8 + 7 < 0 : ████ ██████ █ █ █████ : >= 40 | 17 + + + key min .------------------------------------------. max | count + 2 < 0 : █ █ ██████ █ █████ : >= 40 | 14 + 3 < 0 : █ █ █ █ █ █ : >= 40 | 6 + 4 < 0 : ██████ █████ █ █ █ : >= 40 | 14 + 5 < 0 : █ █ █ █ █████ : >= 40 | 9 + 6 < 0 : █ █ █ █ █ : >= 40 | 5 + 7 < 0 : █ █ ██████ ██████ █ : >= 40 | 15 + Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d) @@ -0,0 +1,42 @@ +/* + * 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 + +tick-1ms +/i++ < 30/ +{ + @[1] = lquantize(i, 0, 40, 1, 1000); + @[2] = lquantize(i, 0, 40, 1, 1000); + @[3] = lquantize(i, 0, 40, 1, 1000); +} + +tick-1ms +/i == 40/ +{ + @[1] = lquantize(0, 0, 40, 1, 1); + @[1] = lquantize(i, 0, 40, 1, 2000); + @[2] = lquantize(0, 0, 40, 1, 1); + @[2] = lquantize(i, 0, 40, 1, 2000); + @[3] = lquantize(0, 0, 40, 1, 1); + @[3] = lquantize(i, 0, 40, 1, 2000); + + printa(@); + setopt("aggpack"); + printa(@); + setopt("aggzoom"); + printa(@); + exit(0); +} Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out) @@ -0,0 +1,149 @@ + + 1 + value ------------- Distribution ------------- count + < 0 | 0 + 0 | 1 + 1 |@ 1000 + 2 |@ 1000 + 3 |@ 1000 + 4 |@ 1000 + 5 |@ 1000 + 6 |@ 1000 + 7 |@ 1000 + 8 |@ 1000 + 9 |@ 1000 + 10 |@ 1000 + 11 |@ 1000 + 12 |@ 1000 + 13 |@ 1000 + 14 |@ 1000 + 15 |@ 1000 + 16 |@ 1000 + 17 |@ 1000 + 18 |@ 1000 + 19 |@ 1000 + 20 |@ 1000 + 21 |@ 1000 + 22 |@ 1000 + 23 |@ 1000 + 24 |@ 1000 + 25 |@ 1000 + 26 |@ 1000 + 27 |@ 1000 + 28 |@ 1000 + 29 |@ 1000 + 30 |@ 1000 + 31 | 0 + 32 | 0 + 33 | 0 + 34 | 0 + 35 | 0 + 36 | 0 + 37 | 0 + 38 | 0 + 39 | 0 + >= 40 |@@ 2000 + + 2 + value ------------- Distribution ------------- count + < 0 | 0 + 0 | 1 + 1 |@ 1000 + 2 |@ 1000 + 3 |@ 1000 + 4 |@ 1000 + 5 |@ 1000 + 6 |@ 1000 + 7 |@ 1000 + 8 |@ 1000 + 9 |@ 1000 + 10 |@ 1000 + 11 |@ 1000 + 12 |@ 1000 + 13 |@ 1000 + 14 |@ 1000 + 15 |@ 1000 + 16 |@ 1000 + 17 |@ 1000 + 18 |@ 1000 + 19 |@ 1000 + 20 |@ 1000 + 21 |@ 1000 + 22 |@ 1000 + 23 |@ 1000 + 24 |@ 1000 + 25 |@ 1000 + 26 |@ 1000 + 27 |@ 1000 + 28 |@ 1000 + 29 |@ 1000 + 30 |@ 1000 + 31 | 0 + 32 | 0 + 33 | 0 + 34 | 0 + 35 | 0 + 36 | 0 + 37 | 0 + 38 | 0 + 39 | 0 + >= 40 |@@ 2000 + + 3 + value ------------- Distribution ------------- count + < 0 | 0 + 0 | 1 + 1 |@ 1000 + 2 |@ 1000 + 3 |@ 1000 + 4 |@ 1000 + 5 |@ 1000 + 6 |@ 1000 + 7 |@ 1000 + 8 |@ 1000 + 9 |@ 1000 + 10 |@ 1000 + 11 |@ 1000 + 12 |@ 1000 + 13 |@ 1000 + 14 |@ 1000 + 15 |@ 1000 + 16 |@ 1000 + 17 |@ 1000 + 18 |@ 1000 + 19 |@ 1000 + 20 |@ 1000 + 21 |@ 1000 + 22 |@ 1000 + 23 |@ 1000 + 24 |@ 1000 + 25 |@ 1000 + 26 |@ 1000 + 27 |@ 1000 + 28 |@ 1000 + 29 |@ 1000 + 30 |@ 1000 + 31 | 0 + 32 | 0 + 33 | 0 + 34 | 0 + 35 | 0 + 36 | 0 + 37 | 0 + 38 | 0 + 39 | 0 + >= 40 |@@ 2000 + + + + key min .------------------------------------------. max | count + 1 < 0 : ▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁ ▁: >= 40 | 32001 + 2 < 0 : ▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁ ▁: >= 40 | 32001 + 3 < 0 : ▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁ ▁: >= 40 | 32001 + + + key min .------------------------------------------. max | count + 1 < 0 : ▁▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ █: >= 40 | 32001 + 2 < 0 : ▁▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ █: >= 40 | 32001 + 3 < 0 : ▁▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ █: >= 40 | 32001 + Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d) @@ -0,0 +1,34 @@ +/* + * 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 + +tick-1ms +/i++ < 90/ +{ + @ = lquantize(i, 0, 100, 1, 1000); +} + +tick-1ms +/i == 100/ +{ + @ = lquantize(i++, 0, 100, 1, 2000); + @ = lquantize(i++, 0, 100, 1, 3000); + + printa(@); + setopt("aggzoom"); + printa(@); + exit(0); +} Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out (from r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out Thu Jun 26 13:02:21 2014 (r267913, copy of r267912, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out) @@ -0,0 +1,211 @@ + + + value ------------- Distribution ------------- count + 0 | 0 + 1 | 1000 + 2 | 1000 + 3 | 1000 + 4 | 1000 + 5 | 1000 + 6 | 1000 + 7 | 1000 + 8 | 1000 + 9 | 1000 + 10 | 1000 + 11 | 1000 + 12 | 1000 + 13 | 1000 + 14 | 1000 + 15 | 1000 + 16 | 1000 + 17 | 1000 + 18 | 1000 + 19 | 1000 + 20 | 1000 + 21 | 1000 + 22 | 1000 + 23 | 1000 + 24 | 1000 + 25 | 1000 + 26 | 1000 + 27 | 1000 + 28 | 1000 + 29 | 1000 + 30 | 1000 + 31 | 1000 + 32 | 1000 + 33 | 1000 + 34 | 1000 + 35 | 1000 + 36 | 1000 + 37 | 1000 + 38 | 1000 + 39 | 1000 + 40 | 1000 + 41 | 1000 + 42 | 1000 + 43 | 1000 + 44 | 1000 + 45 | 1000 + 46 | 1000 + 47 | 1000 + 48 | 1000 + 49 | 1000 + 50 | 1000 + 51 | 1000 + 52 | 1000 + 53 | 1000 + 54 | 1000 + 55 | 1000 + 56 | 1000 + 57 | 1000 + 58 | 1000 + 59 | 1000 + 60 | 1000 + 61 | 1000 + 62 | 1000 + 63 | 1000 + 64 | 1000 + 65 | 1000 + 66 | 1000 + 67 | 1000 + 68 | 1000 + 69 | 1000 + 70 | 1000 + 71 | 1000 + 72 | 1000 + 73 | 1000 + 74 | 1000 + 75 | 1000 + 76 | 1000 + 77 | 1000 + 78 | 1000 + 79 | 1000 + 80 | 1000 + 81 | 1000 + 82 | 1000 + 83 | 1000 + 84 | 1000 + 85 | 1000 + 86 | 1000 + 87 | 1000 + 88 | 1000 + 89 | 1000 + 90 | 1000 + 91 | 0 + 92 | 0 + 93 | 0 + 94 | 0 + 95 | 0 + 96 | 0 + 97 | 0 + 98 | 0 + 99 | 0 + >= 100 |@@ 5000 + + + + value ------------- Distribution ------------- count + 0 | 0 + 1 |@@@@@@@@ 1000 + 2 |@@@@@@@@ 1000 + 3 |@@@@@@@@ 1000 + 4 |@@@@@@@@ 1000 + 5 |@@@@@@@@ 1000 + 6 |@@@@@@@@ 1000 + 7 |@@@@@@@@ 1000 + 8 |@@@@@@@@ 1000 + 9 |@@@@@@@@ 1000 + 10 |@@@@@@@@ 1000 + 11 |@@@@@@@@ 1000 + 12 |@@@@@@@@ 1000 + 13 |@@@@@@@@ 1000 + 14 |@@@@@@@@ 1000 + 15 |@@@@@@@@ 1000 + 16 |@@@@@@@@ 1000 + 17 |@@@@@@@@ 1000 + 18 |@@@@@@@@ 1000 + 19 |@@@@@@@@ 1000 + 20 |@@@@@@@@ 1000 + 21 |@@@@@@@@ 1000 + 22 |@@@@@@@@ 1000 + 23 |@@@@@@@@ 1000 + 24 |@@@@@@@@ 1000 + 25 |@@@@@@@@ 1000 + 26 |@@@@@@@@ 1000 + 27 |@@@@@@@@ 1000 + 28 |@@@@@@@@ 1000 + 29 |@@@@@@@@ 1000 + 30 |@@@@@@@@ 1000 + 31 |@@@@@@@@ 1000 + 32 |@@@@@@@@ 1000 + 33 |@@@@@@@@ 1000 + 34 |@@@@@@@@ 1000 + 35 |@@@@@@@@ 1000 + 36 |@@@@@@@@ 1000 + 37 |@@@@@@@@ 1000 + 38 |@@@@@@@@ 1000 + 39 |@@@@@@@@ 1000 + 40 |@@@@@@@@ 1000 + 41 |@@@@@@@@ 1000 + 42 |@@@@@@@@ 1000 + 43 |@@@@@@@@ 1000 + 44 |@@@@@@@@ 1000 + 45 |@@@@@@@@ 1000 + 46 |@@@@@@@@ 1000 + 47 |@@@@@@@@ 1000 + 48 |@@@@@@@@ 1000 + 49 |@@@@@@@@ 1000 + 50 |@@@@@@@@ 1000 + 51 |@@@@@@@@ 1000 + 52 |@@@@@@@@ 1000 + 53 |@@@@@@@@ 1000 + 54 |@@@@@@@@ 1000 + 55 |@@@@@@@@ 1000 + 56 |@@@@@@@@ 1000 + 57 |@@@@@@@@ 1000 + 58 |@@@@@@@@ 1000 + 59 |@@@@@@@@ 1000 + 60 |@@@@@@@@ 1000 + 61 |@@@@@@@@ 1000 + 62 |@@@@@@@@ 1000 + 63 |@@@@@@@@ 1000 + 64 |@@@@@@@@ 1000 + 65 |@@@@@@@@ 1000 + 66 |@@@@@@@@ 1000 + 67 |@@@@@@@@ 1000 + 68 |@@@@@@@@ 1000 + 69 |@@@@@@@@ 1000 + 70 |@@@@@@@@ 1000 + 71 |@@@@@@@@ 1000 + 72 |@@@@@@@@ 1000 + 73 |@@@@@@@@ 1000 + 74 |@@@@@@@@ 1000 + 75 |@@@@@@@@ 1000 + 76 |@@@@@@@@ 1000 + 77 |@@@@@@@@ 1000 + 78 |@@@@@@@@ 1000 + 79 |@@@@@@@@ 1000 + 80 |@@@@@@@@ 1000 + 81 |@@@@@@@@ 1000 + 82 |@@@@@@@@ 1000 + 83 |@@@@@@@@ 1000 + 84 |@@@@@@@@ 1000 + 85 |@@@@@@@@ 1000 + 86 |@@@@@@@@ 1000 + 87 |@@@@@@@@ 1000 + 88 |@@@@@@@@ 1000 + 89 |@@@@@@@@ 1000 + 90 |@@@@@@@@ 1000 + 91 | 0 + 92 | 0 + 93 | 0 + 94 | 0 + 95 | 0 + 96 | 0 + 97 | 0 + 98 | 0 + 99 | 0 + >= 100 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5000 + + Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Thu Jun 26 12:12:18 2014 (r267912) +++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Thu Jun 26 13:02:21 2014 (r267913) @@ -1041,7 +1041,6 @@ the following fields: See the .Qq Sx Properties section for more information on the available pool properties. -.Pp .It Fl H Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space. Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c ============================================================================== --- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Thu Jun 26 12:12:18 2014 (r267912) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406261302.s5QD2LeD082275>