CVS commit: pkgsrc/benchmarks/iozone

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 28 11:39:57 UTC 2022

Modified Files:
        pkgsrc/benchmarks/iozone: Makefile distinfo options.mk
Added Files:
        pkgsrc/benchmarks/iozone/patches: patch-iozone.c
Removed Files:
        pkgsrc/benchmarks/iozone/patches: patch-ab patch-ac patch-fileop.c
            patch-libasync.c patch-makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/benchmarks/iozone/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/benchmarks/iozone/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/benchmarks/iozone/options.mk
cvs rdiff -u -r1.12 -r0 pkgsrc/benchmarks/iozone/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/benchmarks/iozone/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/benchmarks/iozone/patches/patch-fileop.c \
    pkgsrc/benchmarks/iozone/patches/patch-libasync.c \
    pkgsrc/benchmarks/iozone/patches/patch-makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/benchmarks/iozone/patches/patch-iozone.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/iozone/Makefile
diff -u pkgsrc/benchmarks/iozone/Makefile:1.61 pkgsrc/benchmarks/iozone/Makefile:1.62
--- pkgsrc/benchmarks/iozone/Makefile:1.61      Mon May 24 19:49:09 2021
+++ pkgsrc/benchmarks/iozone/Makefile   Sat May 28 11:39:57 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.61 2021/05/24 19:49:09 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2022/05/28 11:39:57 adam Exp $
 
-DISTNAME=      iozone3_430
+DISTNAME=      iozone3_493
 PKGNAME=       ${DISTNAME:S/3_/-3./}
-PKGREVISION=   5
 CATEGORIES=    benchmarks
 MASTER_SITES=  http://www.iozone.org/src/current/
-EXTRACT_SUFX=  .tar
+EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.iozone.org/
@@ -17,7 +16,8 @@ NOT_FOR_PLATFORM=     Interix-*-* # has only
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=             makefile
-USE_TOOLS+=            tee perl
+USE_TOOLS+=            gmake perl tee
+MAKE_JOBS_SAFE=                no
 
 CPPFLAGS.SunOS+=       -Dsolaris
 
@@ -45,17 +45,12 @@ BUILD_TARGET=               generic
 .endif
 
 REPLACE_PERL=          iozone_visualizer.pl report.pl
-SUBST_CLASSES+=                crlf
-SUBST_MESSAGE.crlf=    Stripping EOL CR in ${REPLACE_PERL}
-SUBST_STAGE.crlf=      post-extract
-SUBST_FILES.crlf=      ${REPLACE_PERL}
-SUBST_FILTER_CMD.crlf= ${TR} -d '\r'
 
 EGDIR=                 share/examples/IOzone
 DOCDIR=                        share/doc/IOzone
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${EGDIR} ${DOCDIR}
 
-.include "options.mk"
+#.include "options.mk"
 
 IOZONE_TEST_ARGS=              -Ea
 .if !empty(PKG_OPTIONS:Mthreads)
@@ -83,7 +78,7 @@ do-install:
 .endfor
 
 benchmark:
-       cd ${WRKSRC}; ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out
+       cd ${WRKSRC} && ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out
 
 results:
        ${MKDIR} /tmp/benches/`domainname`

Index: pkgsrc/benchmarks/iozone/distinfo
diff -u pkgsrc/benchmarks/iozone/distinfo:1.26 pkgsrc/benchmarks/iozone/distinfo:1.27
--- pkgsrc/benchmarks/iozone/distinfo:1.26      Tue Oct 26 10:02:53 2021
+++ pkgsrc/benchmarks/iozone/distinfo   Sat May 28 11:39:57 2022
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 10:02:53 nia Exp $
+$NetBSD: distinfo,v 1.27 2022/05/28 11:39:57 adam Exp $
 
-BLAKE2s (iozone3_430.tar) = 9d7168632b5d43d559747b4552bef75937dd4c9b95fe6735c4638fb19a8165c8
-SHA512 (iozone3_430.tar) = f513c1a34bcdfadca0d01a942d55c7494e5646cf17384140df42643259456d41e40a54453ab3b9a1f1ebdeb456a9b4b1f836f979927cac57391b9a20ecdbcb55
-Size (iozone3_430.tar) = 1832960 bytes
-SHA1 (patch-ab) = fdd36fead26811aa830df5fac35b79a9b62ed1f0
-SHA1 (patch-ac) = 6a02e13f3441a76709fbe8ba064555b650f9bd1c
-SHA1 (patch-fileop.c) = 792dd0e3ad9de4313d34e367ea0c01d9be319229
-SHA1 (patch-libasync.c) = 2c1bebb4423ea84329511cc7fd32d093a6063bf9
-SHA1 (patch-makefile) = 0eb68d8838141e96b08a156f59ed197407eb95e9
+BLAKE2s (iozone3_493.tgz) = 61a972bf5a47566dbfd085480699960b59c3c91650aec1daccfee9a79400b8fa
+SHA512 (iozone3_493.tgz) = 8d132a5840e55ef57e77c889e15dc7095e1d778baec00626355bc6c228d5fb7985f30bbe24f4172f8811ab38f763ac33e9506f9b3e0e8d9b22f2224227022953
+Size (iozone3_493.tgz) = 831743 bytes
+SHA1 (patch-iozone.c) = ddc23f2bbf6ff1e084affc29917abcd6bf79be8d

Index: pkgsrc/benchmarks/iozone/options.mk
diff -u pkgsrc/benchmarks/iozone/options.mk:1.2 pkgsrc/benchmarks/iozone/options.mk:1.3
--- pkgsrc/benchmarks/iozone/options.mk:1.2     Sun Nov  3 11:55:29 2019
+++ pkgsrc/benchmarks/iozone/options.mk Sat May 28 11:39:57 2022
@@ -1,5 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/11/03 11:55:29 rillig Exp $
-#
+# $NetBSD: options.mk,v 1.3 2022/05/28 11:39:57 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.iozone
 PKG_SUPPORTED_OPTIONS= threads

Added files:

Index: pkgsrc/benchmarks/iozone/patches/patch-iozone.c
diff -u /dev/null pkgsrc/benchmarks/iozone/patches/patch-iozone.c:1.1
--- /dev/null   Sat May 28 11:39:57 2022
+++ pkgsrc/benchmarks/iozone/patches/patch-iozone.c     Sat May 28 11:39:57 2022
@@ -0,0 +1,53 @@
+$NetBSD: patch-iozone.c,v 1.1 2022/05/28 11:39:57 adam Exp $
+
+Support DragonFly.
+pthread_barrierattr_setpshared() is hidden on NetBSD.
+
+--- iozone.c.orig      2022-03-16 20:00:50.000000000 +0000
++++ iozone.c
+@@ -475,6 +475,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
+@@ -3971,13 +3974,17 @@ throughput_test()
+       if(use_thread)
+       {
+               barrier = (pthread_barrier_t*)alloc_mem(sizeof(pthread_barrier_t), 0); // Not shared
++#ifndef __NetBSD__
+               pthread_barrierattr_setpshared(&barrier_attr, PTHREAD_PROCESS_PRIVATE);
++#endif
+               pthread_barrier_init(barrier, &barrier_attr, num_child);
+       }
+       else
+       {
+               barrier = (pthread_barrier_t*)alloc_mem(sizeof(pthread_barrier_t), 1); // Shared
++#ifndef __NetBSD__
+               pthread_barrierattr_setpshared(&barrier_attr, PTHREAD_PROCESS_SHARED);
++#endif
+               pthread_barrier_init(barrier, &barrier_attr, num_child);
+       }
+ 
+@@ -11429,7 +11436,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))
+@@ -11759,7 +11766,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))