Merge from head@274682

5 files changed, 150 insertions, 8 deletions

diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile
index ba52997..328f806 100644
--- a/share/dtrace/Makefile
+++ b/share/dtrace/Makefile
@@ -12,7 +12,10 @@ SUBDIR= ${_toolkit}
 _toolkit=	toolkit
 .endif
 
-SCRIPTS=	nfsclienttime hotopen
+SCRIPTS=	disklatency \
+		disklatencycmd \
+		hotopen \
+		nfsclienttime
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace
 
diff --git a/share/dtrace/README b/share/dtrace/README
index e446cee..0540bad 100644
--- a/share/dtrace/README
+++ b/share/dtrace/README
@@ -1,11 +1,11 @@
 $FreeBSD$
 
 This directory contains scripts for use with the DTrace system.  The
-toolkit/ directory contains the latest vendor import of Brendan
-Gregg's DTraceToolkit while all the other files and directories
+toolkit/ directory installs the latest vendor import of Brendan
+Gregg's DTraceToolkit while the other files and directories
 contain code generated by the FreeBSD Project for use with DTrace on
 FreeBSD.
 
-NOTE: Do not add new scripts to the DTraceToolkit contained in this
-directory. New DTraceToolkit scripts should be send to the maintainer
-of the toolkit and then brought back into FreeBSD via future vendor imports.
+NOTE: Do not add new scripts to the toolkit directory. New DTraceToolkit
+scripts should be send to the maintainer of the toolkit and then brought
+back into FreeBSD via future vendor imports.
diff --git a/share/dtrace/disklatency b/share/dtrace/disklatency
new file mode 100755
index 0000000..97ef87a
--- /dev/null
+++ b/share/dtrace/disklatency
@@ -0,0 +1,67 @@
+#!/usr/sbin/dtrace -s
+/*-
+ * Copyright 2014 John-Mark Gurney.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ *
+ */
+
+#pragma D option quiet
+#pragma D option dynvarsize=16m
+
+dtrace:::BEGIN
+{
+	printf("Tracing... Hit Ctrl-C to end.\n");
+}
+
+io:::start
+{
+	start_time[arg0] = timestamp;
+}
+
+io:::done
+/this->start = start_time[arg0]/
+{
+	this->delta = (timestamp - this->start) / 1000;
+	@q[args[1]->device_name, args[1]->unit_number] =
+	    lquantize(this->delta, 4000, 80000, 4000);
+	@max[args[1]->device_name, args[1]->unit_number] = max(this->delta);
+	@avg[args[1]->device_name, args[1]->unit_number] = avg(this->delta);
+	@stddev[args[1]->device_name, args[1]->unit_number] = stddev(this->delta);
+	start_time[arg0] = 0;
+}
+
+tick-10s
+{
+	printa("   %s (%d), us:\n%@d\n", @q);
+	printa("max%s (%d), us:\n%@d\n", @max);
+	printa("avg%s (%d), us:\n%@d\n", @avg);
+	printa("stddev%s (%d), us:\n%@d\n", @stddev);
+
+	clear(@q);
+	clear(@max);
+	clear(@avg);
+	clear(@stddev);
+}
diff --git a/share/dtrace/disklatencycmd b/share/dtrace/disklatencycmd
new file mode 100755
index 0000000..95fa653
--- /dev/null
+++ b/share/dtrace/disklatencycmd
@@ -0,0 +1,72 @@
+#!/usr/sbin/dtrace -s
+/*-
+ * Copyright 2014 John-Mark Gurney.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ *
+ */
+
+#pragma D option quiet
+
+/* from http://www.mail-archive.com/dtrace-discuss@opensolaris.org/msg03755.html */
+#pragma D option aggsize=8m
+#pragma D option bufsize=16m
+#pragma D option dynvarsize=32m
+/*
+#pragma D option aggrate=0
+#pragma D option cleanrate=50Hz
+*/
+
+dtrace:::BEGIN
+{
+	printf("Tracing... Hit Ctrl-C to end.\n");
+	dstart = timestamp;
+}
+
+io:::start
+{
+	start_time[arg0] = timestamp;
+}
+
+io:::done
+/this->start = start_time[arg0]/
+{
+	this->delta = (timestamp - this->start) / 1000;
+	@q[args[1]->device_name, args[1]->unit_number] =
+	    lquantize(this->delta, 4000, 80000, 4000);
+	@max[args[1]->device_name, args[1]->unit_number] = max(this->delta);
+	@avg[args[1]->device_name, args[1]->unit_number] = avg(this->delta);
+	@stddev[args[1]->device_name, args[1]->unit_number] = stddev(this->delta);
+	start_time[arg0] = 0;
+}
+
+dtrace:::END
+{
+	printf("total time, us: %d\n", (timestamp - dstart) / 1000);
+	printa("   %s (%d), us:\n%@d\n", @q);
+	printa("max%s (%d), us: %@d\n", @max);
+	printa("avg%s (%d), us: %@d\n", @avg);
+	printa("stddev%s (%d), us: %@d\n", @stddev);
+}
diff --git a/share/dtrace/toolkit/Makefile b/share/dtrace/toolkit/Makefile
index a4716af..66dc3b8 100644
--- a/share/dtrace/toolkit/Makefile
+++ b/share/dtrace/toolkit/Makefile
@@ -5,10 +5,10 @@
 DTRACETOOLKIT= ../../../cddl/contrib/dtracetoolkit
 
 SCRIPTS=	${DTRACETOOLKIT}/execsnoop \
-		${DTRACETOOLKIT}/hotuser   \
 		${DTRACETOOLKIT}/hotkernel \
+		${DTRACETOOLKIT}/hotuser   \
 		${DTRACETOOLKIT}/opensnoop \
-		${DTRACETOOLKIT}/procsystime \
+		${DTRACETOOLKIT}/procsystime
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit