Fri Dec 2 15:31:44 2011 UTC ()
Update by a few dozen patch releases (3.308 -> 3.397).

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


(hauke)
diff -r1.41 -r1.42 pkgsrc/benchmarks/iozone/Makefile
diff -r1.3 -r1.4 pkgsrc/benchmarks/iozone/PLIST
diff -r1.17 -r1.18 pkgsrc/benchmarks/iozone/distinfo
diff -r1.8 -r1.9 pkgsrc/benchmarks/iozone/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/benchmarks/iozone/patches/patch-ab
diff -r0 -r1.1 pkgsrc/benchmarks/iozone/patches/patch-iozone_visualizer.pl
diff -r0 -r1.1 pkgsrc/benchmarks/iozone/patches/patch-report.pl
cvs diff -r1.41 -r1.42 pkgsrc/benchmarks/iozone/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/Makefile 2010/12/30 07:41:27 1.41
+++ pkgsrc/benchmarks/iozone/Makefile 2011/12/02 15:31:44 1.42
@@ -1,68 +1,84 @@ @@ -1,68 +1,84 @@
1# $NetBSD: Makefile,v 1.41 2010/12/30 07:41:27 obache Exp $ 1# $NetBSD: Makefile,v 1.42 2011/12/02 15:31:44 hauke Exp $
2 2
3DISTNAME= iozone3_308 3DISTNAME= iozone3_397
4PKGNAME= iozone-3.308 4PKGNAME= iozone-3.397
5CATEGORIES= benchmarks 5CATEGORIES= benchmarks
6MASTER_SITES= http://www.iozone.org/src/current/ 6MASTER_SITES= http://www.iozone.org/src/current/
7EXTRACT_SUFX= .tar 7EXTRACT_SUFX= .tar
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.iozone.org/ 10HOMEPAGE= http://www.iozone.org/
11COMMENT= Benchmark for file read and write speed 11COMMENT= Benchmark for file read and write speed
12# No derivative works 12# No derivative works
13LICENSE= iozone-license 13LICENSE= iozone-license
14 14
15NOT_FOR_PLATFORM= Interix-*-* # has only 32-bit off_t 15NOT_FOR_PLATFORM= Interix-*-* # has only 32-bit off_t
16 16
17PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20WRKSRC= ${WRKDIR}/${DISTNAME}/src/current 20WRKSRC= ${WRKDIR}/${DISTNAME}/src/current
21MAKE_FILE= makefile 21MAKE_FILE= makefile
22USE_TOOLS+= tee 22USE_TOOLS+= tee perl
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" 26.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
27BUILD_TARGET= ${LOWER_OPSYS} 27BUILD_TARGET= ${LOWER_OPSYS}
28.elif (${OPSYS} == "SunOS") 28.elif (${OPSYS} == "SunOS")
29BUILD_TARGET= Solaris 29BUILD_TARGET= Solaris
30.elif (${OPSYS} == "Darwin") 30.elif (${OPSYS} == "Darwin")
31BUILD_TARGET= macosx 31BUILD_TARGET= macosx
32.elif (${OPSYS} == "IRIX") 32.elif (${OPSYS} == "IRIX")
33BUILD_TARGET= ${OPSYS}${ABI:M64} 33BUILD_TARGET= ${OPSYS}${ABI:M64}
34.elif (${OPSYS} == "BSDOS") 34.elif (${OPSYS} == "BSDOS")
35BUILD_TARGET= bsdi 35BUILD_TARGET= bsdi
36.elif (${OPSYS} == "AIX") 36.elif (${OPSYS} == "AIX")
37BUILD_TARGET= ${OPSYS} 37BUILD_TARGET= ${OPSYS}
38.else 38.else
39# XXX: generic should work, but specific target would be better 39# XXX: generic should work, but specific target would be better
40BUILD_TARGET= generic 40BUILD_TARGET= generic
41.endif 41.endif
42 42
43INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 43REPLACE_PERL = iozone_visualizer.pl report.pl
 44
 45EGDIR = share/examples/IOzone
 46DOCDIR = share/doc/IOzone
 47INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR} ${DOCDIR}
44 48
45.include "options.mk" 49.include "options.mk"
46 50
47IOZONE_TEST_ARGS= -Ea 51IOZONE_TEST_ARGS= -Ea
48.if !empty(PKG_OPTIONS:Mthreads) 52.if !empty(PKG_OPTIONS:Mthreads)
49IOZONE_TEST_ARGS+= -T -t4 53IOZONE_TEST_ARGS+= -T -t4
50.endif 54.endif
51 55
52do-install: 56do-install:
53 ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${DESTDIR}${PREFIX}/bin 57.for bb in fileop iozone pit_server
 58 ${INSTALL_PROGRAM} ${WRKSRC}/${bb} ${DESTDIR}${PREFIX}/bin
 59.endfor
 60 ${INSTALL_SCRIPT} ${WRKSRC}/iozone_visualizer.pl \
 61 ${DESTDIR}${PREFIX}/bin/iozone_visualizer
 62 ${INSTALL_SCRIPT} ${WRKSRC}/report.pl \
 63 ${DESTDIR}${PREFIX}/bin/iozone_report
54 ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \ 64 ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
55 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
56 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/IOzone 66.for dd in IOzone_msword_98.pdf Iozone_ps.gz Run_rules.doc
57 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \ 67 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${dd} \
58 ${DESTDIR}${PREFIX}/share/doc/IOzone 68 ${DESTDIR}${PREFIX}/${DOCDIR}/
 69.endfor
 70.for ee in Generate_Graphs Gnuplot.txt client_list gengnuplot.sh \
 71 gnu3d.dem gnuplot.dem gnuplotps.dem read_telemetry write_telemetry
 72 ${INSTALL_DATA} ${WRKSRC}/${ee} \
 73 ${DESTDIR}${PREFIX}/${EGDIR}/
 74.endfor
59 75
60benchmark: 76benchmark:
61 cd ${WRKSRC}; ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out 77 cd ${WRKSRC}; ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out
62 78
63results: 79results:
64 ${MKDIR} /tmp/benches/`domainname` 80 ${MKDIR} /tmp/benches/`domainname`
65 ${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname` 81 ${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
66 82
67.include "../../mk/pthread.buildlink3.mk" 83.include "../../mk/pthread.buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/benchmarks/iozone/PLIST (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/PLIST 2009/06/14 17:33:11 1.3
+++ pkgsrc/benchmarks/iozone/PLIST 2011/12/02 15:31:44 1.4
@@ -1,4 +1,19 @@ @@ -1,4 +1,19 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:33:11 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2011/12/02 15:31:44 hauke Exp $
 2bin/fileop
2bin/iozone 3bin/iozone
 4bin/iozone_report
 5bin/iozone_visualizer
 6bin/pit_server
3man/man1/iozone.1 7man/man1/iozone.1
 8share/doc/IOzone/IOzone_msword_98.pdf
4share/doc/IOzone/Iozone_ps.gz 9share/doc/IOzone/Iozone_ps.gz
 10share/doc/IOzone/Run_rules.doc
 11share/examples/IOzone/Generate_Graphs
 12share/examples/IOzone/Gnuplot.txt
 13share/examples/IOzone/client_list
 14share/examples/IOzone/gengnuplot.sh
 15share/examples/IOzone/gnu3d.dem
 16share/examples/IOzone/gnuplot.dem
 17share/examples/IOzone/gnuplotps.dem
 18share/examples/IOzone/read_telemetry
 19share/examples/IOzone/write_telemetry
cvs diff -r1.17 -r1.18 pkgsrc/benchmarks/iozone/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/distinfo 2011/11/24 20:40:12 1.17
+++ pkgsrc/benchmarks/iozone/distinfo 2011/12/02 15:31:44 1.18
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.17 2011/11/24 20:40:12 marino Exp $ 1$NetBSD: distinfo,v 1.18 2011/12/02 15:31:44 hauke Exp $
2 2
3SHA1 (iozone3_308.tar) = 7617d3d6db2f674cbd8e3a2dad3627e4dee7d821 3SHA1 (iozone3_397.tar) = 6095a38542286376f6eb2a203f253dc4c31ddeda
4RMD160 (iozone3_308.tar) = f0c55ed2e6ab8ac205d6a93f37c32db7f7707a64 4RMD160 (iozone3_397.tar) = b87e1732206eae0762d1e6bd552b33af8bdc045a
5Size (iozone3_308.tar) = 1556480 bytes 5Size (iozone3_397.tar) = 1679360 bytes
6SHA1 (patch-aa) = d4f1675067918241643d56a3bcb5f3b9adf38f0a 6SHA1 (patch-aa) = e209a364cdeca38c3995fbaebde3758bdd74e582
7SHA1 (patch-ab) = 29f750bd4610956be9886137bbf5c158247a7db1 7SHA1 (patch-ab) = b3d2cbf160868ab2e81becc5d932c6459903c2dc
8SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2 8SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2
 9SHA1 (patch-iozone_visualizer.pl) = cd5cd6ed4892bfae3ed7c48088ccdf5c9a5a53ee
 10SHA1 (patch-report.pl) = 9101f79c78a55ca60993723923dd79dd51720490
cvs diff -r1.8 -r1.9 pkgsrc/benchmarks/iozone/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/patches/Attic/patch-aa 2011/11/24 20:40:12 1.8
+++ pkgsrc/benchmarks/iozone/patches/Attic/patch-aa 2011/12/02 15:31:44 1.9
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-aa,v 1.8 2011/11/24 20:40:12 marino Exp $ 1$NetBSD: patch-aa,v 1.9 2011/12/02 15:31:44 hauke Exp $
2 2
3--- makefile.orig 2008-07-17 15:07:10.000000000 +0000 3--- makefile.orig 2011-05-06 15:39:00.000000000 +0000
4+++ makefile 4+++ makefile
5@@ -75,6 +75,7 @@ all: 5@@ -81,6 +81,7 @@ all:
6 @echo " -> UWIN (32bit) <-" 6 @echo " -> UWIN (32bit) <-"
7 @echo " -> Windows (95/98/NT) (32bit) <-" 7 @echo " -> Windows (95/98/NT) (32bit) <-"
8 @echo "" 8 @echo ""
9+ @false 9+ @false
10  10
11 clean: 11 clean:
12 rm -f *.o iozone fileop 12 rm -f *.o iozone fileop pit_server
13@@ -712,6 +713,12 @@ fileop_bsdi.o: fileop.c 13@@ -792,6 +793,12 @@ fileop_bsdi.o: fileop.c
14 @echo "" 14 @echo ""
15 $(CC) -c -O $(CFLAGS) fileop.c -o fileop_bsdi.o 15 $(CC) -c -O $(CFLAGS) fileop.c -o fileop_bsdi.o
16  16
17+fileop_dragonfly.o: fileop.c 17+fileop_dragonfly.o: fileop.c
18+ @echo "" 18+ @echo ""
19+ @echo "Building fileop for DragonFly" 19+ @echo "Building fileop for DragonFly"
20+ @echo "" 20+ @echo ""
21+ $(CC) -c -O $(CFLAGS) fileop.c -o fileop_dragonfly.o 21+ $(CC) -c -O $(CFLAGS) fileop.c -o fileop_dragonfly.o
22+ 22+
23 fileop_freebsd.o: fileop.c 23 fileop_freebsd.o: fileop.c
24 @echo "" 24 @echo ""
25 @echo "Building fileop for FreeBSD" 25 @echo "Building fileop for FreeBSD"
cvs diff -r1.8 -r1.9 pkgsrc/benchmarks/iozone/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/patches/Attic/patch-ab 2011/11/24 20:40:12 1.8
+++ pkgsrc/benchmarks/iozone/patches/Attic/patch-ab 2011/12/02 15:31:44 1.9
@@ -1,84 +1,82 @@ @@ -1,84 +1,82 @@
1$NetBSD: patch-ab,v 1.8 2011/11/24 20:40:12 marino Exp $ 1$NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $
2 2
3--- iozone.c.orig 2008-07-17 15:07:10.000000000 +0000 3--- iozone.c.orig 2011-05-06 15:39:00.000000000 +0000
4+++ iozone.c 4+++ iozone.c
5@@ -57,7 +57,7 @@ 5@@ -70,7 +70,7 @@
6 #include <Windows.h> 6 #include <windows.h>
7 int errno; 7 #include <errno.h>
8 #else 8 #else
9-#if defined(linux) 9-#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE)
10+#if defined(linux) || defined(__DragonFly__) 10+#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined (__NetBSD__) || defined(__DragonFly__)
11 #include <errno.h> 11 #include <errno.h>
12 #else 12 #else
13 extern int errno; /* imported for errors */ 13 extern int errno; /* imported for errors */
14@@ -263,7 +263,7 @@ THISVERSION, 14@@ -285,7 +285,7 @@ THISVERSION,
15 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) 15 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
16 #include <malloc.h> 16 #include <malloc.h>
17 #endif 17 #endif
18-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) 18-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
19+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) 19+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__)
20 #include <stdlib.h> 20 #include <stdlib.h>
21 #include <string.h> 21 #include <string.h>
22 #endif 22 #endif
23@@ -412,6 +412,9 @@ struct piovec piov[PVECMAX]; 23@@ -441,6 +441,9 @@ struct piovec piov[PVECMAX];
24 struct iovec piov[PVECMAX]; 24 struct iovec piov[PVECMAX];
25 #define piov_base iov_base 25 #define piov_base iov_base
26 #define piov_len iov_len 26 #define piov_len iov_len
27+#if defined (__DragonFly__) 27+#if defined (__DragonFly__)
28+#define DFLY_VECTOR_OFFSET 28+#define DFLY_VECTOR_OFFSET
29+#endif 29+#endif
30 #endif 30 #endif
31  31
32 #endif 32 #endif
33@@ -6534,7 +6537,11 @@ long long *data2; 33@@ -6876,6 +6879,10 @@ long long *data2;
34 if(odsync) 34 if(odsync)
35 file_flags |= O_DSYNC; 35 file_flags |= O_DSYNC;
36 #endif 36 #endif
37-#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__) 
38+#if defined (__DragonFly__) 37+#if defined (__DragonFly__)
39+ if(read_sync) 38+ if(read_sync)
40+ file_flags |= O_SYNC; 39+ file_flags |= O_SYNC;
41+#endif 40+#endif
42+#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) 41 #if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__)
43 if(read_sync) 42 if(read_sync)
44 file_flags |=O_RSYNC|O_SYNC; 43 file_flags |=O_RSYNC|O_SYNC;
45 #endif 44@@ -10098,7 +10105,11 @@ long long *data1, *data2;
46@@ -9652,7 +9659,11 @@ long long *data1, *data2; 
47 open_flags |=O_DIRECTIO; 45 open_flags |=O_DIRECTIO;
48 #endif 46 #endif
49 #endif 47 #endif
50-#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__) 48-#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__)
51+#if defined (__DragonFly__) 49+#if defined (__DragonFly__)
52+ if(read_sync) 50+ if(read_sync)
53+ open_flags |= O_SYNC; 51+ open_flags |= O_SYNC;
54+#endif 52+#endif
55+#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) 53+#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__)
56 if(read_sync) 54 if(read_sync)
57 open_flags |=O_RSYNC|O_SYNC; 55 open_flags |=O_RSYNC|O_SYNC;
58 #endif 56 #endif
59@@ -9865,6 +9876,7 @@ long long *data1,*data2; 57@@ -10324,6 +10335,7 @@ long long *data1,*data2;
60 off64_t filebytes64,i; 58 off64_t filebytes64,i;
61 off64_t numrecs64; 59 off64_t numrecs64;
62 int fd,ltest; 60 int fd,ltest;
63+ int wval; 61+ int wval;
64 #ifdef VXFS 62 #if defined(VXFS) || defined(solaris)
65 int test_foo = 0; 63 int test_foo = 0;
66 #endif 64 #endif
67@@ -10007,7 +10019,7 @@ long long *data1,*data2; 65@@ -10454,7 +10466,7 @@ long long *data1,*data2;
68 purgeit(piov[xx].piov_base,reclen); 66 purgeit(piov[xx].piov_base,reclen);
69 } 67 }
70 if(pwritev(fd, piov,numvecs 68 if(pwritev(fd, piov,numvecs
71-#ifdef PER_VECTOR_OFFSET 69-#ifndef PER_VECTOR_OFFSET
72+#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET) 70+#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET)
73 , list_off[0] 71 , list_off[0]
74 #endif 72 #endif
75 ) != (reclen*numvecs)) 73 ) != (reclen*numvecs))
76@@ -10310,7 +10322,7 @@ long long *data1,*data2; 74@@ -10781,7 +10793,7 @@ long long *data1,*data2;
77 purgeit(piov[xx].piov_base,reclen); 75 purgeit(piov[xx].piov_base,reclen);
78 } 76 }
79 if(preadv(fd, piov, numvecs 77 if(preadv(fd, piov, numvecs
80-#ifdef PERVECTOR_OFFSET 78-#ifndef PER_VECTOR_OFFSET
81+#if defined(PERVECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET) 79+#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET)
82 , list_off[0] 80 , list_off[0]
83 #endif 81 #endif
84 ) != (numvecs * reclen)) 82 ) != (numvecs * reclen))
File Added: pkgsrc/benchmarks/iozone/patches/Attic/patch-iozone_visualizer.pl
$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
File Added: pkgsrc/benchmarks/iozone/patches/Attic/patch-report.pl
$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