Update by a few dozen patch releases (3.308 -> 3.397).

Install two report Perl scripts, example files, and more docs.

7 files changed, 111 insertions, 44 deletions

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index d70a4f48a41..c860b4d1bce 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2010/12/30 07:41:27 obache Exp $
+# $NetBSD: Makefile,v 1.42 2011/12/02 15:31:44 hauke Exp $
 
-DISTNAME=	iozone3_308
-PKGNAME=	iozone-3.308
+DISTNAME=	iozone3_397
+PKGNAME=	iozone-3.397
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.iozone.org/src/current/
 EXTRACT_SUFX=	.tar
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=		makefile
-USE_TOOLS+=		tee
+USE_TOOLS+=		tee perl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,7 +40,11 @@ BUILD_TARGET=		${OPSYS}
 BUILD_TARGET=		generic
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+REPLACE_PERL =		iozone_visualizer.pl report.pl
+
+EGDIR =			share/examples/IOzone
+DOCDIR =		share/doc/IOzone
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR} ${DOCDIR}
 
 .include "options.mk"
 
@@ -50,12 +54,24 @@ IOZONE_TEST_ARGS+=		-T -t4
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${DESTDIR}${PREFIX}/bin
+.for bb in fileop iozone pit_server
+	${INSTALL_PROGRAM} ${WRKSRC}/${bb} ${DESTDIR}${PREFIX}/bin
+.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/iozone_visualizer.pl \
+		${DESTDIR}${PREFIX}/bin/iozone_visualizer
+	${INSTALL_SCRIPT} ${WRKSRC}/report.pl \
+		${DESTDIR}${PREFIX}/bin/iozone_report
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/IOzone
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \
-		${DESTDIR}${PREFIX}/share/doc/IOzone
+.for dd in IOzone_msword_98.pdf Iozone_ps.gz Run_rules.doc
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${dd} \
+		${DESTDIR}${PREFIX}/${DOCDIR}/
+.endfor
+.for ee in Generate_Graphs Gnuplot.txt client_list gengnuplot.sh \
+	gnu3d.dem gnuplot.dem gnuplotps.dem read_telemetry write_telemetry
+	${INSTALL_DATA} ${WRKSRC}/${ee} \
+		${DESTDIR}${PREFIX}/${EGDIR}/
+.endfor
 
 benchmark:
 	cd ${WRKSRC}; ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out
diff --git a/benchmarks/iozone/PLIST b/benchmarks/iozone/PLIST
index 5f7c8bfe61a..8fc1a56805f 100644
--- a/benchmarks/iozone/PLIST
+++ b/benchmarks/iozone/PLIST
@@ -1,4 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:33:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/12/02 15:31:44 hauke Exp $
+bin/fileop
 bin/iozone
+bin/iozone_report
+bin/iozone_visualizer
+bin/pit_server
 man/man1/iozone.1
+share/doc/IOzone/IOzone_msword_98.pdf
 share/doc/IOzone/Iozone_ps.gz
+share/doc/IOzone/Run_rules.doc
+share/examples/IOzone/Generate_Graphs
+share/examples/IOzone/Gnuplot.txt
+share/examples/IOzone/client_list
+share/examples/IOzone/gengnuplot.sh
+share/examples/IOzone/gnu3d.dem
+share/examples/IOzone/gnuplot.dem
+share/examples/IOzone/gnuplotps.dem
+share/examples/IOzone/read_telemetry
+share/examples/IOzone/write_telemetry
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo
index 3bc70e70fb1..0360ec19bd7 100644
--- a/benchmarks/iozone/distinfo
+++ b/benchmarks/iozone/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.17 2011/11/24 20:40:12 marino Exp $
+$NetBSD: distinfo,v 1.18 2011/12/02 15:31:44 hauke Exp $
 
-SHA1 (iozone3_308.tar) = 7617d3d6db2f674cbd8e3a2dad3627e4dee7d821
-RMD160 (iozone3_308.tar) = f0c55ed2e6ab8ac205d6a93f37c32db7f7707a64
-Size (iozone3_308.tar) = 1556480 bytes
-SHA1 (patch-aa) = d4f1675067918241643d56a3bcb5f3b9adf38f0a
-SHA1 (patch-ab) = 29f750bd4610956be9886137bbf5c158247a7db1
+SHA1 (iozone3_397.tar) = 6095a38542286376f6eb2a203f253dc4c31ddeda
+RMD160 (iozone3_397.tar) = b87e1732206eae0762d1e6bd552b33af8bdc045a
+Size (iozone3_397.tar) = 1679360 bytes
+SHA1 (patch-aa) = e209a364cdeca38c3995fbaebde3758bdd74e582
+SHA1 (patch-ab) = b3d2cbf160868ab2e81becc5d932c6459903c2dc
 SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2
+SHA1 (patch-iozone_visualizer.pl) = cd5cd6ed4892bfae3ed7c48088ccdf5c9a5a53ee
+SHA1 (patch-report.pl) = 9101f79c78a55ca60993723923dd79dd51720490
diff --git a/benchmarks/iozone/patches/patch-aa b/benchmarks/iozone/patches/patch-aa
index 61ae5e5c0f4..0b5c9470fe5 100644
--- a/benchmarks/iozone/patches/patch-aa
+++ b/benchmarks/iozone/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.8 2011/11/24 20:40:12 marino Exp $
+$NetBSD: patch-aa,v 1.9 2011/12/02 15:31:44 hauke Exp $
 
---- makefile.orig	2008-07-17 15:07:10.000000000 +0000
+--- makefile.orig	2011-05-06 15:39:00.000000000 +0000
 +++ makefile
-@@ -75,6 +75,7 @@ all:
+@@ -81,6 +81,7 @@ all:  
  	@echo "        ->   UWIN                 (32bit)   <-"
  	@echo "        ->   Windows (95/98/NT)   (32bit)   <-"
  	@echo ""
 +	@false
  
  clean:
- 	rm -f *.o iozone fileop
-@@ -712,6 +713,12 @@ fileop_bsdi.o:	fileop.c
+ 	rm -f *.o iozone fileop pit_server
+@@ -792,6 +793,12 @@ fileop_bsdi.o:	fileop.c
  	@echo ""
  	$(CC) -c -O $(CFLAGS) fileop.c -o fileop_bsdi.o
  
diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab
index 46f1b6b017c..10c860b960f 100644
--- a/benchmarks/iozone/patches/patch-ab
+++ b/benchmarks/iozone/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2011/11/24 20:40:12 marino Exp $
+$NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $
 
---- iozone.c.orig	2008-07-17 15:07:10.000000000 +0000
+--- iozone.c.orig	2011-05-06 15:39:00.000000000 +0000
 +++ iozone.c
-@@ -57,7 +57,7 @@
- #include <Windows.h>
- int errno;
+@@ -70,7 +70,7 @@
+ #include <windows.h>
+ #include <errno.h>
  #else
--#if defined(linux)
-+#if defined(linux) || defined(__DragonFly__)
+-#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE)
++#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined (__NetBSD__) || defined(__DragonFly__)
  #include <errno.h>
  #else
  extern  int errno;   /* imported for errors */
-@@ -263,7 +263,7 @@ THISVERSION,
+@@ -285,7 +285,7 @@ THISVERSION,
  #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
  #include <malloc.h>
  #endif
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.8 2011/11/24 20:40:12 marino Exp $
  #include <stdlib.h>
  #include <string.h>
  #endif
-@@ -412,6 +412,9 @@ struct piovec piov[PVECMAX];
+@@ -441,6 +441,9 @@ struct piovec piov[PVECMAX];
  struct iovec piov[PVECMAX];
  #define piov_base iov_base
  #define piov_len iov_len
@@ -30,55 +30,53 @@ $NetBSD: patch-ab,v 1.8 2011/11/24 20:40:12 marino Exp $
  #endif
  
  #endif
-@@ -6534,7 +6537,11 @@ long long *data2;
+@@ -6876,6 +6879,10 @@ long long *data2;
  	if(odsync)
  		file_flags |= O_DSYNC;
  #endif
--#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__)
 +#if defined (__DragonFly__)
 +	if(read_sync)
 +		file_flags |= O_SYNC;
 +#endif
-+#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd)
+ #if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__)
  	if(read_sync)
  		file_flags |=O_RSYNC|O_SYNC;
- #endif
-@@ -9652,7 +9659,11 @@ long long *data1, *data2;
+@@ -10098,7 +10105,11 @@ long long *data1, *data2;
  		open_flags |=O_DIRECTIO;
  #endif
  #endif
--#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__)
+-#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__)
 +#if defined (__DragonFly__)
 +	if(read_sync)
 +		open_flags |= O_SYNC;
 +#endif
-+#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd)
++#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__)
  	if(read_sync)
  		open_flags |=O_RSYNC|O_SYNC;
  #endif
-@@ -9865,6 +9876,7 @@ long long *data1,*data2;
+@@ -10324,6 +10335,7 @@ long long *data1,*data2;
  	off64_t filebytes64,i;
  	off64_t numrecs64;
  	int fd,ltest;
 +	int wval;
- #ifdef VXFS
+ #if defined(VXFS) || defined(solaris)
  	int test_foo = 0;
  #endif
-@@ -10007,7 +10019,7 @@ long long *data1,*data2;
+@@ -10454,7 +10466,7 @@ long long *data1,*data2;
  					purgeit(piov[xx].piov_base,reclen);
  			}
  			if(pwritev(fd, piov,numvecs
--#ifdef PER_VECTOR_OFFSET
+-#ifndef PER_VECTOR_OFFSET
 +#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET)
  				, list_off[0]
  #endif
  				) != (reclen*numvecs))
-@@ -10310,7 +10322,7 @@ long long *data1,*data2;
+@@ -10781,7 +10793,7 @@ long long *data1,*data2;
  				   purgeit(piov[xx].piov_base,reclen);
  			}
  			if(preadv(fd, piov, numvecs
--#ifdef PERVECTOR_OFFSET
-+#if defined(PERVECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET)
+-#ifndef PER_VECTOR_OFFSET
++#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET)
  				, list_off[0]
  #endif
  				) != (numvecs * reclen))
diff --git a/benchmarks/iozone/patches/patch-iozone_visualizer.pl b/benchmarks/iozone/patches/patch-iozone_visualizer.pl
new file mode 100644
index 00000000000..ecb55f9a8c7
--- /dev/null
+++ b/benchmarks/iozone/patches/patch-iozone_visualizer.pl
@@ -0,0 +1,18 @@
+$NetBSD: patch-iozone_visualizer.pl,v 1.1 2011/12/02 15:31:44 hauke Exp $
+
+--- iozone_visualizer.pl.orig	2011-12-02 13:57:45.000000000 +0000
++++ iozone_visualizer.pl
+@@ -190,11 +190,11 @@ set ytics $yoffset

+ set logscale x 2

+ set logscale y 2

+ set autoscale z

+-set xrange [2.**5:2.**24]

++#set xrange [2.**5:2.**24]

+ set xlabel "File size in KBytes" -2

+ set ylabel "Record size in Kbytes" 2

+ set zlabel "Kbytes/sec" 4,8 

+-set data style lines

++set style data lines

+ set dgrid3d 80,80,3

+ #set terminal png small picsize 900 700

+ set terminal png small size $size3d nocrop

diff --git a/benchmarks/iozone/patches/patch-report.pl b/benchmarks/iozone/patches/patch-report.pl
new file mode 100644
index 00000000000..f7781d35846
--- /dev/null
+++ b/benchmarks/iozone/patches/patch-report.pl
@@ -0,0 +1,18 @@
+$NetBSD: patch-report.pl,v 1.1 2011/12/02 15:31:44 hauke Exp $
+
+--- report.pl.orig	2011-12-02 13:57:45.000000000 +0000
++++ report.pl
+@@ -103,11 +103,11 @@ set ytics

+ set logscale x 2

+ set logscale y 2

+ set autoscale z

+-set xrange [2.**5:2.**24]

++#set xrange [2.**5:2.**24]

+ set xlabel "File size in KBytes"

+ set ylabel "Record size in Kbytes"

+ set zlabel "Kbytes/sec"

+-set data style lines

++set style data lines

+ set dgrid3d 80,80,3

+ #set terminal png small picsize 900 700

+ set terminal png small size 900 700