diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-07-13 14:05:56 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-07-13 14:05:56 +0000 |
commit | 8ab736b8ee6dd0f6e7bea9a142e56f878b6e86cd (patch) | |
tree | b3b50ed275d6aa0a7edf82abc46ea4c4cdb49665 | |
parent | 4eacf0dc055f1d8951a5911094cddecd09c1a146 (diff) | |
download | pkgsrc-8ab736b8ee6dd0f6e7bea9a142e56f878b6e86cd.tar.gz |
Update to 3.430
* Enable async and thread options under NetBSD.
Changelog:
Revision 3.430
Adding -+b option for bursty operations.
Donated by: Avi Shchislowski <Avi.Shchislowski@sandisk.com>
-rw-r--r-- | benchmarks/iozone/Makefile | 11 | ||||
-rw-r--r-- | benchmarks/iozone/distinfo | 10 | ||||
-rw-r--r-- | benchmarks/iozone/patches/patch-libasync.c | 22 | ||||
-rw-r--r-- | benchmarks/iozone/patches/patch-makefile | 95 |
4 files changed, 130 insertions, 8 deletions
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index 14df5b24d28..abab5ef9d5d 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2015/06/12 10:48:25 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2015/07/13 14:05:56 ryoon Exp $ -DISTNAME= iozone3_429 +DISTNAME= iozone3_430 PKGNAME= ${DISTNAME:S/3_/-3./} -PKGREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= http://www.iozone.org/src/current/ EXTRACT_SUFX= .tar @@ -23,7 +22,11 @@ CPPFLAGS.SunOS+= -Dsolaris .include "../../mk/bsd.prefs.mk" -.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" +.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) +BUILD_TARGET= netbsd +.elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) +BUILD_TARGET= netbsd-AMD64 +.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" BUILD_TARGET= ${LOWER_OPSYS} .elif (${OPSYS} == "SunOS") BUILD_TARGET= Solaris diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo index ad14a91309f..f30ae80884a 100644 --- a/benchmarks/iozone/distinfo +++ b/benchmarks/iozone/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.21 2014/12/09 13:53:13 mef Exp $ +$NetBSD: distinfo,v 1.22 2015/07/13 14:05:56 ryoon Exp $ -SHA1 (iozone3_429.tar) = 13b74ba397530ff2f117bac3d1d7dec81dcc66d2 -RMD160 (iozone3_429.tar) = c945becef75f89eb7eba0e12e6959ae6dcdf6514 -Size (iozone3_429.tar) = 1832960 bytes +SHA1 (iozone3_430.tar) = de02b10fcde6bd60e0c805e3abfc0aed15e85ac1 +RMD160 (iozone3_430.tar) = 4b43f14268ebe3accf8cdc881c3f82430d649082 +Size (iozone3_430.tar) = 1832960 bytes SHA1 (patch-ab) = fdd36fead26811aa830df5fac35b79a9b62ed1f0 SHA1 (patch-ac) = 6a02e13f3441a76709fbe8ba064555b650f9bd1c +SHA1 (patch-libasync.c) = 2c1bebb4423ea84329511cc7fd32d093a6063bf9 +SHA1 (patch-makefile) = 0eb68d8838141e96b08a156f59ed197407eb95e9 diff --git a/benchmarks/iozone/patches/patch-libasync.c b/benchmarks/iozone/patches/patch-libasync.c new file mode 100644 index 00000000000..4416ff15f7f --- /dev/null +++ b/benchmarks/iozone/patches/patch-libasync.c @@ -0,0 +1,22 @@ +$NetBSD: patch-libasync.c,v 1.1 2015/07/13 14:05:56 ryoon Exp $ + +--- libasync.c.orig 2015-01-07 20:43:10.000000000 +0000 ++++ libasync.c +@@ -96,7 +96,7 @@ + + #include <sys/types.h> + #include <aio.h> +-#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) ++#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) || defined(__NetBSD__) + #else + #include <sys/timers.h> + #endif +@@ -119,7 +119,7 @@ + #include <stdlib.h> + #endif + +-#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD) ++#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD) || defined(__NetBSD__) + /* If we are building for 64-bit Solaris, all functions that return pointers + * must be declared before they are used; otherwise the compiler will assume + * that they return ints and the top 32 bits of the pointer will be lost, diff --git a/benchmarks/iozone/patches/patch-makefile b/benchmarks/iozone/patches/patch-makefile new file mode 100644 index 00000000000..c253cd08032 --- /dev/null +++ b/benchmarks/iozone/patches/patch-makefile @@ -0,0 +1,95 @@ +$NetBSD: patch-makefile,v 1.1 2015/07/13 14:05:56 ryoon Exp $ + +--- makefile.orig 2015-01-07 20:43:10.000000000 +0000 ++++ makefile +@@ -57,6 +57,7 @@ all: + @echo " -> linux-sparc (32bit) <-" + @echo " -> macosx (32bit) <-" + @echo " -> netbsd (32bit) <-" ++ @echo " -> netbsd-AMD64 (64bit) <-" + @echo " -> openbsd (32bit) <-" + @echo " -> openbsd-threads (32bit) <-" + @echo " -> OSFV3 (64bit) <-" +@@ -207,7 +208,7 @@ linux-powerpc64: iozone_linux-powerpc64. + -lrt $(FLAG64BIT) -o iozone + $(CC) -O3 -Dlinux fileop_linux-ppc64.o $(FLAG64BIT) -o fileop + $(CC) -O3 -Dlinux pit_server-linux-powerpc64.o $(FLAG64BIT) -o pit_server +- ++ + # + # GNU 'C' compiler Linux build with threads, largefiles, async I/O + # +@@ -587,15 +588,25 @@ SCO_Unixware_gcc: iozone_SCO_Unixware_gc + -lsocket -lthread -o iozone + + # +-# GNU C compiler NetBSD build with no threads, no largefiles, no async I/O ++# GNU C compiler NetBSD build with threads, no largefiles, async I/O + # + +-netbsd: iozone_netbsd.o libbif.o fileop_netbsd.o pit_server.o +- $(CC) -O $(LDFLAGS) iozone_netbsd.o libbif.o -o iozone ++netbsd: iozone_netbsd.o libbif.o libasync.o fileop_netbsd.o pit_server.o ++ $(CC) -O $(LDFLAGS) iozone_netbsd.o libbif.o libasync.o \ ++ -lrt -lpthread -o iozone + $(CC) -O fileop_netbsd.o -o fileop + $(CC) -O pit_server.o -o pit_server + + # ++# GNU C compiler NetBSD/amd64 build with threads, no largefiles, async I/O ++# ++netbsd-AMD64: iozone_netbsd-AMD64.o libbif.o libasync.o fileop_netbsd-AMD64.o pit_server.o ++ $(CC) -O $(LDFLAGS) iozone_netbsd-AMD64.o libbif.o libasync.o \ ++ -lrt -lpthread -o iozone ++ $(CC) -O fileop_netbsd-AMD64.o -o fileop ++ $(CC) -O pit_server.o -o pit_server ++ ++# + # + # Now for the machine specific stuff + # +@@ -777,7 +788,6 @@ iozone_linux-powerpc64.o: iozone.c libbi + -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c $(FLAG64BIT) -o libbif.o + $(CC) -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ + -D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c $(FLAG64BIT) -o libasync.o +- + + iozone_linux-sparc.o: iozone.c libbif.c libasync.c + @echo "" +@@ -851,6 +861,12 @@ fileop_netbsd.o: fileop.c + @echo "" + $(CC) -c -O $(CFLAGS) fileop.c -o fileop_netbsd.o + ++fileop_netbsd-AMD64.o: fileop.c ++ @echo "" ++ @echo "Building fileop for NetBSD/AMD64" ++ @echo "" ++ $(CC) -Wall -c -O $(CFLAGS) fileop.c -o fileop_netbsd-AMD64.o ++ + fileop_Solaris.o: fileop.c + @echo "" + @echo "Building fileop for Solaris" +@@ -1461,7 +1477,21 @@ iozone_netbsd.o: iozone.c libbif.c + @echo "" + @echo "Building iozone NetBSD " + @echo "" +- $(CC) -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ + -DNAME='"netbsd"' -DSHARED_MEM $(CFLAGS) iozone.c -o iozone_netbsd.o +- $(CC) -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ ++ -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CFLAGS) libasync.c -o libasync.o ++ ++iozone_netbsd-AMD64.o: iozone.c libbif.c libasync.c ++ @echo "" ++ @echo "Building iozone for NetBSD/amd64" ++ @echo "" ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DNAME='"netbsd-AMD64"' \ ++ -D__AMD64__ -DSHARED_MEM \ ++ -DHAVE_PREAD $(CFLAGS) iozone.c -o iozone_netbsd-AMD64.o ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ + -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o ++ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CFLAGS) libasync.c -o libasync.o |