head 1.10; access; symbols pkgsrc-2014Q3:1.9.0.24 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.22 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.20 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.18 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.16 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.14 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.12 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.10 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.8 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.6 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.4 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.2 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.7.0.52 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.50 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.48 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.46 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.44 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.42 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.40 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.38 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.36 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.34 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.32 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.30 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.28 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.26 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.24 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.22 pkgsrc-2008Q1:1.7.0.20 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.18 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.16 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.14 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.12 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.10 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.8 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.6 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.4 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.2 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.10 date 2014.12.09.13.56.44; author mef; state dead; branches; next 1.9; commitid o93AuBwTSdyA3n1y; 1.9 date 2011.12.02.15.31.44; author hauke; state Exp; branches; next 1.8; 1.8 date 2011.11.24.20.40.12; author marino; state Exp; branches; next 1.7; 1.7 date 2005.10.19.15.27.19; author adam; state Exp; branches; next 1.6; 1.6 date 2004.11.10.14.13.21; author adam; state Exp; branches; next 1.5; 1.5 date 2004.05.05.00.43.10; author danw; state Exp; branches; next 1.4; 1.4 date 2003.03.11.12.42.05; author wiz; state dead; branches; next 1.3; 1.3 date 2003.03.10.11.06.50; author wiz; state Exp; branches; next 1.2; 1.2 date 2001.07.16.22.04.55; author garbled; state Exp; branches; next 1.1; 1.1 date 2000.05.02.15.17.47; author pooka; state Exp; branches; next ; desc @@ 1.10 log @Correction on PKGNAME, and deleting patch-aa for previous commit @ text @$NetBSD: patch-aa,v 1.9 2011/12/02 15:31:44 hauke Exp $ --- makefile.orig 2011-05-06 15:39:00.000000000 +0000 +++ makefile @@@@ -81,6 +81,7 @@@@ all: @@echo " -> UWIN (32bit) <-" @@echo " -> Windows (95/98/NT) (32bit) <-" @@echo "" + @@false clean: 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 +fileop_dragonfly.o: fileop.c + @@echo "" + @@echo "Building fileop for DragonFly" + @@echo "" + $(CC) -c -O $(CFLAGS) fileop.c -o fileop_dragonfly.o + fileop_freebsd.o: fileop.c @@echo "" @@echo "Building fileop for FreeBSD" @ 1.9 log @Update by a few dozen patch releases (3.308 -> 3.397). Install two report Perl scripts, example files, and more docs. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @benchmarks/iozone: Really add DragonFly support It appears that the authors of Iozone tried to add DragonFly support without actually building it. The configuration was broken, and the iozone.c was uncompilable. With the two modified patches, it will compile now, and a quick check using "iozone -a" seemed to work as expected. No PKGREVISION bump necessary. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2005/10/19 15:27:19 adam Exp $ d3 1 a3 1 --- makefile.orig 2008-07-17 15:07:10.000000000 +0000 d5 1 a5 1 @@@@ -75,6 +75,7 @@@@ all: d12 2 a13 2 rm -f *.o iozone fileop @@@@ -712,6 +713,12 @@@@ fileop_bsdi.o: fileop.c @ 1.7 log @Changes 3.248: * Improvements @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- makefile.orig 2005-09-13 17:26:54.000000000 +0000 d5 1 a5 1 @@@@ -69,6 +69,7 @@@@ all: d13 13 @ 1.6 log @Changes 3.218 Add label to Excel spreadsheet that describes the rows and columns. Add support for Solaris64 with VxFS. Add support for Linux-arm Changes 3.219 Add sleep to permit child to get connection up before master does connect. Changes 3.220 Improve master connect to child, without delays. Changes 3.221 Add -+B Mixed sequential testing. BlueArc request. Changes 3.222 Workaround for bug in Cygwin's sscanf Changes 3.223 Add transfer size to the output from -Q Changes 3.224 Work around for TCP_WAIT in Windows. Changes 3.225 Fix for broken rsh on Windows. Changes 3.226 Workaround for gcc 3.4. From the folks at Gentoo.org. @ text @d3 1 a3 1 --- makefile.orig 2004-10-29 15:11:36.000000000 +0000 d5 1 a5 1 @@@@ -67,6 +67,7 @@@@ all: d12 1 a12 1 rm -f *.o iozone @ 1.5 log @add an ALL_TARGET for darwin and patch the package Makefile so the build errors out if no platform-specific target is specified (so that pkgsrc will recognize that the build failed) @ text @d3 1 a3 1 --- makefile.orig Sun May 2 21:02:32 2004 d5 1 a5 1 @@@@ -59,6 +59,7 @@@@ all: @ 1.4 log @Update to 3.163: Fixup for systems that do not have O_DIRECT. Simplify the prototype for do_compute() @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2003/03/10 11:06:50 wiz Exp $ d3 10 a12 35 --- iozone.c.orig Mon Mar 3 20:44:39 2003 +++ iozone.c @@@@ -831,7 +831,7 @@@@ void purgeit(); /* Purge on chip cache void throughput_test(); /* Multi process throughput */ void multi_throughput_test(); /* Multi process throughput */ void prepage(); /* Pre-fault user buffer */ -#if defined(linux) || defined(solaris) || defined(__AIX__) || defined(OSFV5) || defined(UWIN) || defined(Windows) || defined(__APPLE__) || defined(OSFV4) || defined(IRIX) || defined(IRIX64) || defined(__FreeBSD__) +#ifdef HAVE_ANSIC_C float do_compute(float); /* compute cycle simulation */ #else float do_compute(); /* compute cycle simulation */ @@@@ -15024,6 +15024,7 @@@@ int flag, prot; * a file that is opened with O_DIRECT */ file_flags=fcntl(fd,F_GETFL); +#if 0 if((file_flags & O_DIRECT) !=0) { recs=filebytes/reclen; @@@@ -15038,6 +15039,7 @@@@ int flag, prot; } } else +#else { /* Save time, just seek out and touch at the end */ I_LSEEK(fd,(filebytes-reclen),SEEK_SET); @@@@ -15048,6 +15050,7 @@@@ int flag, prot; exit(181); } } +#endif free(stmp); I_LSEEK(fd,0,SEEK_SET); #endif @ 1.3 log @Update to 3.161. Extract of changes, excluding bug fixes and portability stuff: Added -z option. This is to be used with the -a option. It provides more complete testing for small record sizes when the file sizes are very large. Added -y and -q to set record size range Added command line to output Put auto cross over back to 16 Meg Add labels to the latency/offset output files. Prevent mixed modes. Auto and throughput. Added support for the Plus extended options. Added support for -+u option. Cpu utilization. Added network testing mode. -+m (Experimental) Tested: Linux, HP-UX Added -xflag support for distributed mode. Handle interrupts when in distributed mode. Disable CPU utilization in distributed mode. Add -+m cluster option to the help list and the list of options. Enable more options in Cluster mode. Add protocol version checking for distributed messages. Add -+d file I/O diagnostic mode. Fix some compiler warnings and implement the -+x option for setting the multiplier used for file and record size incrementing. Reduce the message traffic due to master's distribution of STOP. Only one STOP distribution is needed. More can lead to socket buffer overflows. Add -+p percentage read option. Improve the mixed mode distribution algorithm. Introduce -+r for O_RSYNC. Add speed check code. Increase maximum threads/procs to 256 Add contribs and -+t to help splash screen. Disable fread and fwrite testing if mmap or async is in use. Add pread/pwrite throughput testing Permit smaller values for -n and -g Make initial write in initfile() a page size request. Stop test if file can not be written. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update this pkg to 3.56. Changes are mostly bugfixes, available at: http://www.iozone.org/src/current/Changes.txt I have patched the source however, to allow use of the pread/prwite tests, via the -E extension mode. Also, the benchmark target has been fixed. @ text @d2 10 a11 31 --- iozone.c.orig Wed Jul 4 03:21:12 2001 +++ iozone.c Mon Jul 16 11:58:10 2001 @@@@ -307,9 +307,17 @@@@ #endif #ifdef HAVE_PREAD +#ifndef __NetBSD__ #include #define PVECMAX 16 struct piovec piov[PVECMAX]; +#else +#include +#define piov_base iov_base +#define piov_len iov_len +#define PVECMAX 16 +struct iovec piov[PVECMAX]; +#endif #endif struct child_stats { @@@@ -393,7 +401,11 @@@@ #ifdef HAVE_PREAD #include #define CONTROL_STRING1 "%16lld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%9ld%9ld%8ld%10ld%9ld%10ld%9ld%10ld%10ld%9ld\n" +#ifdef HAVE_PREADV #define CONTROL_STRING2 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s%8s%9s%7s%10s%10s%10s%9s%9s\n" +#else +#define CONTROL_STRING2 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s%8s%9s%7s%10s\n" +#endif #define CONTROL_STRING3 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s\n" #define CONTROL_STRING4 "%16s%8s%8s%8s%8s%10s\n" d13 13 a25 41 @@@@ -452,9 +464,11 @@@@ void read_stride_perf_test(); /* read with stride test */ #ifdef HAVE_PREAD void pread_perf_test(); /* pread/re-pread test */ -void preadv_perf_test(); /* preadv/re-preadv test */ void pwrite_perf_test(); /* pwrite/re-pwrite test */ +#ifdef HAVE_PREADV +void preadv_perf_test(); /* preadv/re-preadv test */ void pwritev_perf_test(); /* pwritev/re-pwritev test */ +#endif #endif /* HAVE_PREAD */ void store_dvalue(); /* Store doubles array */ void dump_excel(); @@@@ -538,9 +552,12 @@@@ #ifdef HAVE_PREAD , pwrite_perf_test, - pread_perf_test, + pread_perf_test +#ifdef HAVE_PREADV + , pwritev_perf_test, preadv_perf_test +#endif #endif /* HAVE_PREAD */ }; @@@@ -5949,6 +5966,7 @@@@ #endif } +#ifdef HAVE_PREADV /************************************************************************/ /* pwritev_perf_test */ /* pwritev and re-pwritev test */ @@@@ -5965,7 +5983,11 @@@@ double starttime1; double pwritevtime[2]; double compute_val = (double)0; +#ifndef __NetBSD__ long long list_off[PVECMAX]; d27 5 a31 14 + off_t list_off[PVECMAX]; +#endif long long numvecs,j,xx; unsigned long long pwritevrate[2]; off64_t filebytes64,i; @@@@ -6091,8 +6113,8 @@@@ (caddr_t)(buffer+(xx * reclen)); if(verify) fill_buffer(piov[xx].piov_base,reclen,(long long)pattern,sverify); - piov[xx].piov_len = reclen; piov[xx].piov_offset = list_off[xx]; + piov[xx].piov_len = reclen; if(purge) purgeit(piov[xx].piov_base,reclen); d33 1 a33 20 @@@@ -6361,6 +6383,7 @@@@ fflush(stdout); #endif } +#endif /* PREADV */ /************************************************************************/ /* print_header() */ @@@@ -6419,11 +6442,14 @@@@ "pwrite", "repwrite", "pread", - "repread", + "repread" +#ifdef HAVE_PREADV + , "pwritev", "repwritev", "preadv", "repreadv" d35 2 a36 4 ); }else if(RWONLYflag){ /*kcollins 8-21-96*/ @@@@ -6779,7 +6805,11 @@@@ a37 10 exit(119); } +#ifndef __NetBSD__ addr = (char *)shmat(shmid, 0, SHM_W); +#else + addr = (char *)shmat(shmid, 0, 0); +#endif #ifdef __LP64__ if((long long)addr == (long long)-1) #else @ 1.1 log @Update iozone to lastest stable (3.09), addresses pkg/10020. The change-list is huge (src/Changes.txt in the distribution) and users probably should upgrade since the previous version was ancient. @ text @d2 4 a5 9 --- makefile.orig Wed Sep 15 00:38:17 1999 +++ makefile Tue May 2 17:11:25 2000 @@@@ -6,7 +6,7 @@@@ # # Supports: hpux, hpux_no_ansi, hpux-10.1, hpux_no_ansi-10.1, # sppux, sppux-10.1, ghpux, sppux, -# convex, FreeBSD, OpenBSD +# convex, FreeBSD, OpenBSD, NetBSD d7 13 d21 39 a59 39 all: @@@@ -29,6 +29,7 @@@@ @@echo "\t-> IRIX (32bit) <-" @@echo "\t-> IRIX64 (64bit) <-" @@echo "\t-> linux (32bit) <-" + @@echo "\t-> NetBSD (32bit) <-" @@echo "\t-> openbsd (32bit) <-" @@echo "\t-> OSFV3 (64bit) <-" @@echo "\t-> OSFV4 (64bit) <-" @@@@ -208,6 +209,15 @@@@ freebsd: iozone_freebsd.o libbif.o cc -O -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \ iozone_freebsd.o libbif.o -o iozone + +# +# GNU C compiler NetBSD build with no threads, no largefiles, no async I/O +# + +NetBSD: iozone_netbsd.o libbif.o + cc -O -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \ + iozone_netbsd.o libbif.o -o iozone + # # GNU C compiler OpenBSD build with no threads, no largefiles, no async I/O # @@@@ -459,6 +469,15 @@@@ cc -c -O -Dunix -Dbsd4_2 -DHAVE_ANSIC_C -DNO_THREADS \ -DSHARED_MEM iozone.c -o iozone_freebsd.o cc -c -O -Dunix -Dbsd4_2 -DHAVE_ANSIC_C -DNO_THREADS \ + -DSHARED_MEM libbif.c -o libbif.o + +iozone_netbsd.o: iozone.c libbif.c + @@echo "" + @@echo "Build Iozone for NetBSD" + @@echo "" + cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ + -DSHARED_MEM iozone.c -o iozone_netbsd.o + cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ -DSHARED_MEM libbif.c -o libbif.o d61 66 a126 1 iozone_openbsd.o: iozone.c libbif.c @