head 1.13; access; symbols pkgsrc-2022Q1:1.12.0.60 pkgsrc-2022Q1-base:1.12 pkgsrc-2021Q4:1.12.0.58 pkgsrc-2021Q4-base:1.12 pkgsrc-2021Q3:1.12.0.56 pkgsrc-2021Q3-base:1.12 pkgsrc-2021Q2:1.12.0.54 pkgsrc-2021Q2-base:1.12 pkgsrc-2021Q1:1.12.0.52 pkgsrc-2021Q1-base:1.12 pkgsrc-2020Q4:1.12.0.50 pkgsrc-2020Q4-base:1.12 pkgsrc-2020Q3:1.12.0.48 pkgsrc-2020Q3-base:1.12 pkgsrc-2020Q2:1.12.0.44 pkgsrc-2020Q2-base:1.12 pkgsrc-2020Q1:1.12.0.24 pkgsrc-2020Q1-base:1.12 pkgsrc-2019Q4:1.12.0.46 pkgsrc-2019Q4-base:1.12 pkgsrc-2019Q3:1.12.0.42 pkgsrc-2019Q3-base:1.12 pkgsrc-2019Q2:1.12.0.40 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.12.0.38 pkgsrc-2019Q1-base:1.12 pkgsrc-2018Q4:1.12.0.36 pkgsrc-2018Q4-base:1.12 pkgsrc-2018Q3:1.12.0.34 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.32 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.30 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.28 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.26 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.22 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.20 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.18 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.16 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.14 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.12 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.10 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.8 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.6 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.4 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.2 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.11.0.20 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.18 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.16 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.14 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.12 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.10 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.8 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.6 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.4 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.2 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.10.0.2 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.9.0.2 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.7.0.28 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.26 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.24 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.22 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.20 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.18 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.16 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.14 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.12 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.10 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.8 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.6 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.4 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.2 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.6.0.18 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.16 pkgsrc-2008Q1:1.6.0.14 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.12 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.10 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.8 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.6 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.4 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.2 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.5.0.6 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 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.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.13 date 2022.05.28.11.39.57; author adam; state dead; branches; next 1.12; commitid lNMVSMmCxkMIDOFD; 1.12 date 2014.12.09.13.53.13; author mef; state Exp; branches; next 1.11; commitid B07jOSLrJ8H92n1y; 1.11 date 2012.06.07.15.57.20; author asau; state Exp; branches; next 1.10; 1.10 date 2012.01.24.23.45.00; author marino; state Exp; branches; next 1.9; 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 2008.08.25.19.35.30; author bjs; state Exp; branches; next 1.6; 1.6 date 2006.07.13.13.42.13; author adam; state Exp; branches; next 1.5; 1.5 date 2005.12.13.14.25.01; author joerg; state Exp; branches; next 1.4; 1.4 date 2003.03.10.11.06.51; author wiz; state dead; branches; next 1.3; 1.3 date 2001.07.16.22.04.55; author garbled; state Exp; branches; next 1.2; 1.2 date 2000.12.14.02.40.20; author wiz; state Exp; branches; next 1.1; 1.1 date 2000.05.02.15.17.47; author pooka; state Exp; branches; next ; desc @@ 1.13 log @iozone: updated to 3.493 Revision 3.432 Adding NetBSD 64 bit. Revision 3.434 Adding code from Alexey Skidanov. Pthread burst I/O. Revision 3.434 Convert calls from atoi() into atoll() for those things that are actually long longs. Revision 3.436 Code cleanup for casting consistency Revision 3.442 Code cleanup for casting consistency and *&(^&*( compiler warnings !!! Revision 3.443 Code cleanup for all of the un-needed void * maddness. Revision 3.444 Cleanup 64 bit compiles. Revision 3.445 Some BSD changes to avoid compiler complaints. Revision 3.446 Some BSD changes to avoid compiler complaints. Revision 3.447 Make sure we don't have missing prototypes. Revision 3.448 Add support for building targets with NO_SIGNAL, NO_FORK, NO_SOCKET Revision 3.449 Add support for building targets with NO_SIGNAL, NO_FORK, NO_SOCKET Revision 3.450 Fix missing typedef in FreeBSD. Revision 3.451 Fix typeoh in spelling of DragonFly. Revision 3.452 Make the sighandler_t change effective for all BSD derivatives. Revision 3.454 Make the my_sig_t change effective for all BSD derivatives. Revision 3.455 Unify the usage of __FreeBSD__ Revision 3.456 Build on BSD 10.3 without warnings. Clang compilers. Revision 3.457 Build on BSD 10.3 without warnings. Clang compilers. Revision 3.458 Make more friendly to build on Solaris. Revision 3.459 Make more friendly to build on Solaris. Revision 3.460 Make more friendly to build on Solaris. Revision 3.461 Make more friendly to build on Solaris. Revision 3.462 Make more friendly to build on Solaris. Revision 3.463 Make more friendly to build on Solaris. Revision 3.464 Make more friendly to build on Solaris. Revision 3.465 Make more friendly to build on Solaris. Revision 3.466 Fix error messages to use the correct file name from dummyfile[xx] instead of "filename" in the thread tests. Revision 3.467 Fix compiler warning from Clang on MacOS for mythread_create(). Prototype didn't match the formal function definition. Revision 3.469 Switch to IOZ_macosx everywhere for compatibility with Mountain Lion. Revision 3.470 Increase MAXSTREAMS to 1024. Systems have more power today than 20+ years ago. Revision 3.471 Make -+W -+C -+y use a flag instead of its option value to indiate its usage. Revision 3.472 Adding -+M (special dedupe layout) Adding -+a (set compression in special layout) Adding -+Q (set dedupe granule size in special layout) Revision 3.473 no change. Revision 3.474 Cleanup for Cygwin64 build. Revision 3.475 Cleanup for Cygwin64 build warnings. Revision 3.476 Cleanup compiler warnings. Revision 3.477 Bug fix code in special_gen_new_buf.. Revision 3.478 Bug fix code in special_gen_new_buf.. More copies of the other bug. Revision 3.479 Bug fix code in special_gen_new_buf.. needed (*op ==0) in one more line. Revision 3.480 Add -+R option to specify the file names are in a file. Revision 3.481 Adding new contributor Sudhir Kumar Revision 3.482 Fix help menu for -+R option. It does not also use -F Bug fix for case of -H where gcc seems to think the size of long long is != size of off64_t Bug fix for prototype mismatch in async_write_no_copy. Revision 3.483 Fix nesting of #ifdefs so that Windows lack of support for O_DIRECT presents splash indication. Enable O_DIRECT for Windows builds. Revision 3.485 Improvements for building under Android Revision 3.486 Fix compiler warning on Android. Revision 3.488 Improve the Yates/Knuth method for shuffle. Revision 3.489 Fix gcc-10 warning about no-common. Revision 3.490 Fix compiler warning when HAVE_ANSIC is not defined Revision 3.491 Fix CFLAGS issue from Fedora maintainer. Revision 3.492 Improve the -+M option's compression pattern so that the achieved compressibility is closer to the value specifed in the -+a option. Revision 3.493 Move memorey allocaiton of main buffer to after the getopt, else the -S can cause issues later. @ text @$NetBSD: patch-ab,v 1.12 2014/12/09 13:53:13 mef Exp $ Add NetBSD, DragonFly, including correction of typo --- iozone.c.orig 2012-05-10 05:14:12.000000000 +0000 +++ iozone.c @@@@ -70,7 +70,7 @@@@ #include #include #else -#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__) #include #else extern int errno; /* imported for errors */ @@@@ -288,7 +288,7 @@@@ THISVERSION, #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) #include #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) #include #include #endif @@@@ -299,7 +299,7 @@@@ THISVERSION, #endif #endif -#if defined (__FreeBSD__) || defined(__DSragonFly__) +#if defined (__FreeBSD__) || defined(__DragonFly__) #ifndef O_RSYNC #define O_RSYNC O_FSYNC #endif @@@@ -444,6 +444,9 @@@@ struct piovec piov[PVECMAX]; struct iovec piov[PVECMAX]; #define piov_base iov_base #define piov_len iov_len +#if defined (__DragonFly__) +#define DFLY_VECTOR_OFFSET +#endif #endif #endif @@@@ -7363,7 +7366,11 @@@@ 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(read_sync) file_flags |=O_RSYNC|O_SYNC; #endif @@@@ -10585,7 +10592,11 @@@@ long long *data1, *data2; open_flags |=O_DIRECTIO; #endif #endif -#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(read_sync) open_flags |=O_RSYNC|O_SYNC; #endif @@@@ -10941,7 +10952,7 @@@@ long long *data1,*data2; purgeit(piov[xx].piov_base,reclen); } if(pwritev(fd, piov,numvecs -#ifndef PER_VECTOR_OFFSET +#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET) , list_off[0] #endif ) != (reclen*numvecs)) @@@@ -11268,7 +11279,7 @@@@ long long *data1,*data2; purgeit(piov[xx].piov_base,reclen); } if(preadv(fd, piov, numvecs -#ifndef PER_VECTOR_OFFSET +#if defined(PER_VECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET) , list_off[0] #endif ) != (numvecs * reclen)) @ 1.12 log @Update 3.408 to 3.429 --------------------- Revision 3.409 Bug fix for using -m in combination with -+d Revision 3.410 Bug fix: Improve consistency of use_thread in thread_fread and thread_fwrite. Revision 3.411 Compat fix: Move from using macosx to IOZ_macosx, because APPLE started using macosx in Mountain Lion. Revision 3.412 Adding -+F flag for trunc before thread_write. Needed by Vangel for thread_mix_test. Revision 3.413 Bug fix for -+F flag. Revision 3.414 Add Vangel to the contributors list Revision 3.415 Minor bug fix for -J option (think time) in the thread_pread_test() Revision 3.417 Add -+J option. Include think time (-j #) in throughput calculation Revision 3.419 Add better handling of exit values. Revision 3.420 Add new contributor to list. Revision 3.421 Bug fix from Alp Aker: Patch for a minor issue in IOzone's signal_handler() function: the no_unlink option is respected only for the first member of the dummyfile[] array; the rest of the dummy files are unconditionally deleted, whether or not the '+w' flag has been passed to the program. Revision 3.422 Code cleanup. No functional changes. Revision 3.423 Improve consistency of Kbytes instead of kbytes, KBytes, kBytes... Revision 3.424 Fix for 64 bit and touch_dedup. Revision 3.425 Fix for 64 bit and gen_new_buf Revision 3.427 Adjust formatting so fields don't run together. Revision 3.428 Adjust formatting so fields don't run together. Revision 3.429 Add two more characters to array my_port_num. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2012/06/07 15:57:20 asau Exp $ @ 1.11 log @Update to IOzone 3.408 Changes since version 3.397: Revision 3.408 Bug fix for clobbering of buffer. "tfile" needed to be bigger, as its address was loaded into filearray[] and then that was overwritten by the mfflag causing parsed names to get loaded. Revision 3.407 Work around for cache_line_size suddenly becoming zero and breaking fetchit() Revision 3.406 Increase buffer size for configuration lines. They might be 700 chars long. Revision 3.405 Reduce CPU consumption in the op_rate control mechanism. Revision 3.404 Fix type-oh in usage message. Revision 3.403 Add -+W to permit chid_skew. This permits adding files, and continuing the proper sharing/dedup within each quadrant, within same seed group and with previously existing files that were created with a different number of threads. Revision 3.402 Mods for DragonFly support. Revision 3.401 bug fix for re-write rec. Revision 3.398 Adding thread_read_test and thread_write_test. @ text @d1 3 a3 1 $NetBSD$ d11 2 a12 2 -#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) @ 1.10 log @benchmarks/iozone: Unbreak DragonFly (again) The update from version 3.308 to 3.397 broke DragonFly 11 days after I fixed it due to missing a macro change. An integer redeclaration was also removed. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $ d3 1 a3 1 --- iozone.c.orig 2011-05-06 15:39:00.000000000 +0000 d9 2 a10 2 -#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__) d14 1 a14 1 @@@@ -285,7 +285,7 @@@@ THISVERSION, d23 10 a32 1 @@@@ -441,6 +441,9 @@@@ struct piovec piov[PVECMAX]; d42 1 a42 1 @@@@ -6876,7 +6879,11 @@@@ long long *data2; d55 1 a55 1 @@@@ -10098,7 +10105,11 @@@@ long long *data1, *data2; d68 1 a68 1 @@@@ -10454,7 +10465,7 @@@@ long long *data1,*data2; d77 1 a77 1 @@@@ -10781,7 +10792,7 @@@@ long long *data1,*data2; @ 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$ d33 1 a33 1 @@@@ -6876,6 +6879,10 @@@@ long long *data2; d37 1 d42 1 a42 1 #if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__) d45 1 d59 1 a59 9 @@@@ -10324,6 +10335,7 @@@@ long long *data1,*data2; off64_t filebytes64,i; off64_t numrecs64; int fd,ltest; + int wval; #if defined(VXFS) || defined(solaris) int test_foo = 0; #endif @@@@ -10454,7 +10466,7 @@@@ long long *data1,*data2; d68 1 a68 1 @@@@ -10781,7 +10793,7 @@@@ long long *data1,*data2; @ 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-ab,v 1.7 2008/08/25 19:35:30 bjs Exp $ d3 1 a3 1 --- iozone.c.orig 2008-07-17 15:07:10.000000000 +0000 d5 3 a7 3 @@@@ -57,7 +57,7 @@@@ #include int errno; d9 2 a10 2 -#if defined(linux) +#if defined(linux) || defined(__DragonFly__) d14 1 a14 1 @@@@ -263,7 +263,7 @@@@ THISVERSION, d23 1 a23 1 @@@@ -412,6 +412,9 @@@@ struct piovec piov[PVECMAX]; d33 1 a33 1 @@@@ -6534,7 +6537,11 @@@@ long long *data2; a36 1 -#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__) d41 1 a41 1 +#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) d44 1 a44 2 #endif @@@@ -9652,7 +9659,11 @@@@ long long *data1, *data2; d48 1 a48 1 -#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) || defined(__DragonFly__) d53 1 a53 1 +#if defined(_HPUX_SOURCE) || defined(linux) || defined(freebsd) d57 1 a57 1 @@@@ -9865,6 +9876,7 @@@@ long long *data1,*data2; d62 1 a62 1 #ifdef VXFS d65 1 a65 1 @@@@ -10007,7 +10019,7 @@@@ long long *data1,*data2; d69 1 a69 1 -#ifdef PER_VECTOR_OFFSET d74 1 a74 1 @@@@ -10310,7 +10322,7 @@@@ long long *data1,*data2; d78 2 a79 2 -#ifdef PERVECTOR_OFFSET +#if defined(PERVECTOR_OFFSET) || defined(DFLY_VECTOR_OFFSET) @ 1.7 log @Update to iozone 3.308. pkgsrc changes: - add 'tee' to USE_TOOLS. - support an optional build with threads support and also support this in the 'benchmark' target. Changes since version 2.263 -Bug fix for -k used in conjunction with -t and content validation. -Add DragonFly target. -Put PER_VECTOR_OFFSET in for HP-UX -Fix compiler warning messages -Enforce minimum file size of page_size -Minor fixes. -Check fsync and close for errors. -Adding support for testing block devices. Will be done is phases. This is phase 1. (Single threaded mode only) -Adding 4 token support to client_list. Each entry may now contain 4 tokens and the new one is the absolute path to the temp file for testing. -Add support for external monitor start & stop for throughput tests. -IMON_START and IMON_STOP environmental variables used. -Bug fix for systems without O_DIRECT. Fall through in switch statement. -Fix for -c -t over NFS and initial writer close() when told by another to stop -Add Benny Halevy to contributors list. -Fix for Cygwin environment. -Code cleanup, and add arg to external trigger. -Code fixes for macosx -Add support for building with Sun's Studio 11 compiler -Bug fix for fread/fwrite with > 2Gig files. -Add O_DIRECT for Windows -Add -+w dedup testing mode. -Make remaining non-dedup data unique. -Make non-dedupable more unique. -Bug fix for non-dedup. -Make random offsets unique, using Knuth shuffle. -free memory used for random offset uniqueness. -Make unique/random offsets 64bits. -Add fallback for random/unique. -Make non-dedup region more unique -Add -+y ## to set percentage of interior dedup. -Add -+y ## to set percentage of interior dedup. -Bug fixes for -+w and -+y -Minor fix for dedup -Adding -+C to set percent of dedupable within a file. -Add solaris to read sync O_RSYNC -Add space to avoid field output touching each other. -Add check for config file exceeding MAXSTREAMS. -Add new contributor's name. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- iozone.c.orig 2008-07-17 11:07:10.000000000 -0400 d5 9 d23 62 @ 1.6 log @Changes 3.263: * Change the default pattern. Samba is trying to cheat by special casing IOZONE.tmp, and the pattern of 0xA5. * Make the default pattern random, and based on Iozone version. This is to prevent the hack from Richard Sharpe (in Samba) from special casing Iozone, and lying to the user. * bug fix in pattern gen. * Add -+Z old data set mode. * Add -+X constant data for short circuit testing only. * Multi-node changes for new options. (-+Z and -+X) * Add -+K flag for Sony. * Move -+K outside of Windows only. * Simplify percentage calculation * Add error checking for -f and -F in the wrong modes. * Bug fix for pbuffer allocation on remote clients. * Check for max_rec_size when using ranges. -r -r -r * Fix for Debian user bug. -r 1m -n 1m -g 2m gave bogus error. * Bug fix for -k used in conjunction with -t and content validation. @ text @d3 1 a3 1 --- iozone.c.orig 2006-04-11 23:42:46.000000000 +0200 d5 2 a6 19 @@@@ -61,12 +61,7 @@@@ #include int errno; #else -#if defined(linux) #include -#else -extern int errno; /* imported for errors */ -extern int h_errno; /* imported for errors */ -#endif #endif @@@@ -257,15 +252,15 @@@@ THISVERSION, #include #include -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) d9 2 a10 2 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) a13 57 -#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) +#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__) #ifndef O_SYNC #define O_SYNC O_FSYNC #endif @@@@ -302,25 +297,18 @@@@ THISVERSION, #define MAP_FAILED -1 #endif -#ifdef generic +#if defined(__DragonFly__) +#define __off64_t_defined +typedef off_t off64_t; +#elif defined(generic) typedef long long off64_t; #endif -#ifndef solaris -#ifndef off64_t -#ifndef _OFF64_T -#ifndef __AIX__ -#ifndef __off64_t_defined -#ifndef SCO_Unixware_gcc -#ifndef UWIN +#if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && \ + !defined(__AIX__) && !defined(__off64_t_defined) && \ + !defined(SCO_Unixware_gcc) && !defined(UWIN) typedef long long off64_t; #endif -#endif -#endif -#endif -#endif -#endif -#endif #ifdef __AIX__ #include @@@@ -331,7 +319,7 @@@@ typedef long long off64_t; #endif #ifdef unix -#if defined (__APPLE__) || defined(__FreeBSD__) +#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) #include #endif #include @@@@ -363,7 +351,7 @@@@ typedef long long off64_t; #define MS_ASYNC 0 #endif -#ifdef bsd4_4 +#if defined(bsd4_4) || defined(__DragonFly__) #define MAP_ANONYMOUS MAP_ANON #endif @ 1.5 log @Add DragonFly support. Use errno.h on all platforms. Don't play stupid off64_t games on DragonFly, just use off_t. @ text @d3 1 a3 1 --- iozone.c.orig 2005-12-13 14:04:05.000000000 +0000 d18 1 a18 1 @@@@ -251,15 +246,15 @@@@ THISVERSION, d37 1 a37 1 @@@@ -296,25 +291,18 @@@@ THISVERSION, d70 1 a70 1 @@@@ -325,7 +313,7 @@@@ typedef long long off64_t; d79 1 a79 1 @@@@ -357,7 +345,7 @@@@ typedef long long off64_t; @ 1.4 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 87 a87 22 $NetBSD: patch-ab,v 1.3 2001/07/16 22:04:55 garbled Exp $ --- makefile.orig Mon Jul 16 02:00:14 2001 +++ makefile Mon Jul 16 02:01:06 2001 @@@@ -320,7 +320,7 @@@@ netbsd: iozone_netbsd.o libbif.o cc -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \ - iozone_netbsd.o libbif.o -o iozone + -DHAVE_PREAD iozone_netbsd.o libbif.o -o iozone # # @@@@ -656,7 +656,7 @@@@ @@echo "" @@echo "Building iozone NetBSD " @@echo "" - cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ + cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \ -DSHARED_MEM iozone.c -o iozone_netbsd.o - cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ + cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \ -DSHARED_MEM libbif.c -o libbif.o @ 1.3 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 @d1 1 a1 1 $NetBSD$ @ 1.2 log @Handle uname -a output better. Fixes pkg/11273. @ text @d2 21 a22 30 --- iozone.c.orig Tue Sep 14 23:38:16 1999 +++ iozone.c @@@@ -908,10 +908,10 @@@@ case 'M': /* Report machine name and OS */ pi=popen("uname -a", "r"); fread(reply,99,1,pi); - m=reply; - while(*m!='\n') /* Strip after new line */ - m++; - *m=0; + reply[98] = '\0'; + m=strchr(reply, '\n'); /* Strip after new line */ + if (m != NULL) + *m=0; printf("\n\tMachine = %s\n",reply); pclose(pi); break; @@@@ -6130,7 +6130,11 @@@@ #endif 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 @d3 17 a19 2 --- iozone.c.orig Wed Sep 15 00:38:16 1999 +++ iozone.c Tue May 2 17:23:53 2000 @