pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/benchmarks/iozone Update to iozone 3.308.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/94754d80e0fe
branches:  trunk
changeset: 546261:94754d80e0fe
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Mon Aug 25 19:35:30 2008 +0000

description:
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.

diffstat:

 benchmarks/iozone/Makefile         |  17 +++++-
 benchmarks/iozone/distinfo         |  11 ++--
 benchmarks/iozone/patches/patch-ab |  86 ++-----------------------------------
 benchmarks/iozone/patches/patch-ac |  18 +++++++
 4 files changed, 43 insertions(+), 89 deletions(-)

diffs (185 lines):

diff -r a827cc6fc18d -r 94754d80e0fe benchmarks/iozone/Makefile
--- a/benchmarks/iozone/Makefile        Mon Aug 25 18:19:22 2008 +0000
+++ b/benchmarks/iozone/Makefile        Mon Aug 25 19:35:30 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2008/03/03 00:51:44 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2008/08/25 19:35:30 bjs Exp $
 
-DISTNAME=      iozone3_263
-PKGNAME=       iozone-3.263
+DISTNAME=      iozone3_308
+PKGNAME=       iozone-3.308
 CATEGORIES=    benchmarks
 MASTER_SITES=  http://www.iozone.org/src/current/
 EXTRACT_SUFX=  .tar
@@ -20,6 +20,7 @@
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=             makefile
+USE_TOOLS+=            tee
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,6 +43,13 @@
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
+.include "options.mk"
+
+IOZONE_TEST_ARGS=              -Ea
+.if !empty(PKG_OPTIONS:Mthreads)
+IOZONE_TEST_ARGS+=             -T -t4
+.endif
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
@@ -51,10 +59,11 @@
                ${DESTDIR}${PREFIX}/share/doc/IOzone
 
 benchmark:
-       cd ${WRKSRC}; ./iozone -Ea | ${TEE} iozone.out
+       cd ${WRKSRC}; ./iozone ${IOZONE_TEST_ARGS} | ${TEE} iozone.out
 
 results:
        ${MKDIR} /tmp/benches/`domainname`
        ${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a827cc6fc18d -r 94754d80e0fe benchmarks/iozone/distinfo
--- a/benchmarks/iozone/distinfo        Mon Aug 25 18:19:22 2008 +0000
+++ b/benchmarks/iozone/distinfo        Mon Aug 25 19:35:30 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2006/07/13 13:42:12 adam Exp $
+$NetBSD: distinfo,v 1.16 2008/08/25 19:35:30 bjs Exp $
 
-SHA1 (iozone3_263.tar) = bc62e049f793da74b5c3776779b597aaeaddd30b
-RMD160 (iozone3_263.tar) = 5288c764c9ea09d8f8dbed47c4c9e2a5955b4bed
-Size (iozone3_263.tar) = 1505280 bytes
+SHA1 (iozone3_308.tar) = 7617d3d6db2f674cbd8e3a2dad3627e4dee7d821
+RMD160 (iozone3_308.tar) = f0c55ed2e6ab8ac205d6a93f37c32db7f7707a64
+Size (iozone3_308.tar) = 1556480 bytes
 SHA1 (patch-aa) = 1cdc9b4d965c7ee07fe0e5c64d7a2150a5beb8af
-SHA1 (patch-ab) = 05c28c7a99e4346a41542647b0bac9186b0e3c8f
+SHA1 (patch-ab) = 34bf46dfe0c9c63e8151f835fdb9a9ceae00eb38
+SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2
diff -r a827cc6fc18d -r 94754d80e0fe benchmarks/iozone/patches/patch-ab
--- a/benchmarks/iozone/patches/patch-ab        Mon Aug 25 18:19:22 2008 +0000
+++ b/benchmarks/iozone/patches/patch-ab        Mon Aug 25 19:35:30 2008 +0000
@@ -1,87 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2006/07/13 13:42:13 adam Exp $
+$NetBSD: patch-ab,v 1.7 2008/08/25 19:35:30 bjs Exp $
 
---- iozone.c.orig      2006-04-11 23:42:46.000000000 +0200
+--- iozone.c.orig      2008-07-17 11:07:10.000000000 -0400
 +++ iozone.c
-@@ -61,12 +61,7 @@
- #include <Windows.h>
- int errno;
- #else
--#if defined(linux)
- #include <errno.h>
--#else
--extern  int errno;   /* imported for errors */
--extern  int h_errno; /* imported for errors */
--#endif
- #endif
- 
- 
-@@ -257,15 +252,15 @@ THISVERSION,
- #include <unistd.h>
- 
- #include <fcntl.h>
--#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+@@ -263,7 +263,7 @@ THISVERSION,
+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
  #include <malloc.h>
  #endif
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__)
  #include <stdlib.h>
  #include <string.h>
  #endif
- 
--#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 <fcntl.h>
-@@ -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 <sys/time.h>
- #endif
- #include <sys/times.h>
-@@ -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
- 
diff -r a827cc6fc18d -r 94754d80e0fe benchmarks/iozone/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/iozone/patches/patch-ac        Mon Aug 25 19:35:30 2008 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2008/08/25 19:35:30 bjs Exp $
+
+--- libbif.c.orig      2008-07-17 11:07:10.000000000 -0400
++++ libbif.c
+@@ -20,11 +20,11 @@
+ #include <sys/fcntl.h>
+ #endif
+ 
+-#if defined(OSV5) || defined(linux) || defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
++#if defined(OSV5) || defined(linux) || defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__)
+ #include <string.h>
+ #endif
+ 
+-#if defined(linux) || defined(__DragonFly__) || defined(macosx)
++#if defined(linux) || defined(__DragonFly__) || defined(macosx) || defined(__NetBSD__)
+ #include <unistd.h>
+ #include <stdlib.h>
+ #endif



Home | Main Index | Thread Index | Old Index