cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to iozone 3.48

Browse Source 
- adds a threads FLAVOR which has been tested and shown to work on
i386/sparc atleast.
- includes patches to simplify parts of iozone's Makefile and source code.
This commit is contained in:
brad 2000-11-11 21:37:20 +00:00
parent 7b416ba91c
commit 20d391b076
6 changed files with 267 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
benchmarks/iozone/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2000/10/22 15:41:32 espie Exp $
# $OpenBSD: Makefile,v 1.23 2000/11/11 21:37:20 brad Exp $
DISTNAME= iozone3_24
PKGNAME= iozone-3.24
DISTNAME= iozone3_48
PKGNAME= iozone-3.48
CATEGORIES= benchmarks
NEED_VERSION= 1.330
NEED_VERSION= 1.336
MASTER_SITES= http://www.iozone.org/src/current/
EXTRACT_SUFX= .tar
@ -14,8 +14,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAKE_FILE= makefile
FLAVORS= threads
FLAVOR?=
.if ${FLAVOR:L} == "threads"
ALL_TARGET= openbsd-threads
.else
ALL_TARGET= openbsd
.endif
MAKE_FILE= makefile
WRKDIST= ${WRKDIR}/src/current

6
benchmarks/iozone/files/md5
View File

@ -1,3 +1,3 @@
MD5 (iozone3_24.tar) = 43c6533aac57a3fb8f9c9a4f1a18cce9
RMD160 (iozone3_24.tar) = f26a8e4d907d77b408ef112fe6e90fe0b3b753eb
SHA1 (iozone3_24.tar) = fe4005a400fa077f00a2235eba3c5ee3d375943d
MD5 (iozone3_48.tar) = bc4b50265c21363db6add230be176af3
RMD160 (iozone3_48.tar) = f6ceb7b5b63e447de6c8d3e3a4f4934ede6a2bee
SHA1 (iozone3_48.tar) = 3884ddc247f3cc2c6cb80580255586f0d9718711

106
benchmarks/iozone/patches/patch-iozone.c Normal file
View File

@ -0,0 +1,106 @@
--- iozone.c.orig Sat Nov 11 15:13:49 2000
+++ iozone.c Sat Nov 11 15:51:04 2000
@@ -243,10 +243,8 @@
#ifdef unix
#include <sys/times.h>
-#endif
-
-#ifdef unix
#include <sys/file.h>
+
#ifndef NULL
#define NULL 0
#endif
@@ -274,6 +272,7 @@
#define CLK_TCK HZ
#endif
#endif
+
/* for systems with BSD style time, define BSDtime */
#ifdef bsd4_2
#define BSDtime
@@ -281,6 +280,7 @@
#ifdef bsd4_4
#define BSDtime
#endif
+
#ifdef BSDtime
#include <sys/time.h>
#else
@@ -291,70 +291,32 @@
#include <sys/shm.h>
#endif
-#ifdef Windows
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
-#endif
-
-#ifdef netbsd
-#define MAP_ANONYMOUS MAP_ANON
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
-#endif
-
#ifdef bsd4_2
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
#define MS_SYNC 0
#define MS_ASYNC 0
#endif
-#ifdef __bsdi__
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-
#ifdef bsd4_4
-#ifndef GOT_PAGESIZE
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
-#endif
+#define MAP_ANONYMOUS MAP_ANON
#endif
#ifdef SCO
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
#define AMAP_FILE (0)
#endif
#ifdef solaris
-long long page_size = 4096;
-#define GOT_PAGESIZE 1
#define MAP_FILE (0)
#endif
-#ifdef linux
-#ifndef GOT_PAGESIZE
-#include <asm/page.h>
-long long page_size = PAGE_SIZE;
-#define GOT_PAGESIZE 1
-#endif
-#endif
-
-#ifdef IRIX64
-long long page_size = 4096;
+#ifdef PAGESIZE
+long long page_size = PAGESIZE;
#define GOT_PAGESIZE 1
-#endif
-
-#ifdef IRIX
+#elif defined(IRIX) || defined(IRIX64) || defined(Windows) || defined(bsd4_2) || defined(bsd4_4) || defined(SCO) || defined(Solaris)
long long page_size = 4096;
#define GOT_PAGESIZE 1
-#endif
-
-#ifdef NBPG
-#ifndef GOT_PAGESIZE
+#elif defined(NBPG)
long long page_size = NBPG;
#define GOT_PAGESIZE 1
-#endif
#endif
#ifndef GOT_PAGESIZE

142
benchmarks/iozone/patches/patch-makefile Normal file
View File

@ -0,0 +1,142 @@
--- makefile.orig Mon Nov 6 16:24:51 2000
+++ makefile Sat Nov 11 16:08:55 2000
@@ -1,7 +1,7 @@
#
# Version $Revision: 1.1 $
#
-# The makefile for building all versions of Iozone for all supported
+# The makefile for building all versions of iozone for all supported
# platforms
#
# Supports: hpux, hpux_no_ansi, hpux-10.1, hpux_no_ansi-10.1,
@@ -34,6 +34,7 @@
@echo " -> linux-ia64 (32bit) <-"
@echo " -> netbsd (32bit) <-"
@echo " -> openbsd (32bit) <-"
+ @echo " -> openbsd-threads (32bit) <-"
@echo " -> OSFV3 (64bit) <-"
@echo " -> OSFV4 (64bit) <-"
@echo " -> OSFV5 (64bit) <-"
@@ -220,7 +221,7 @@
-DWindows iozone_windows.o libbif.o -o iozone
#
-# GNU C compiler BSDI build with threads, largefiles, no async I/O
+# GNU C compiler BSD/OS build with threads, largefiles, no async I/O
#
bsdi: iozone_bsdi.o libbif.o
@@ -239,10 +240,18 @@
#
openbsd: iozone_openbsd.o libbif.o
- cc -O -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
+ cc -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
iozone_openbsd.o libbif.o -o iozone
#
+# GNU C compiler OpenBSD build with threads, no largefiles, no async I/O
+#
+
+openbsd-threads: iozone_openbsd-threads.o libbif.o
+ cc -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \
+ iozone_openbsd-threads.o libbif.o -o iozone
+
+#
# GNU C compiler OSFV3 build
# Has threads and async I/O but no largefiles.
#
@@ -284,13 +293,12 @@
libbif.o -DNO_THREADS -o iozone
#
-# GNU Generic build with no threads, no largefiles, no async I/O
-# for NetBSD
+# GNU C compiler NetBSD build with no threads, no largefiles, no async I/O
#
netbsd: iozone_netbsd.o libbif.o
- gcc -O -Dnetbsd -Dunix -DHAVE_ANSIC_C iozone_netbsd.o \
- libbif.o -DNO_THREADS -o iozone
+ cc -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
+ iozone_netbsd.o libbif.o -o iozone
#
#
@@ -525,7 +533,7 @@
iozone_bsdi.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for BSDI"
+ @echo "Build iozone for BSD/OS"
@echo ""
cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \
iozone.c -o iozone_bsdi.o
@@ -534,7 +542,7 @@
iozone_freebsd.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for FreeBSD"
+ @echo "Build iozone for FreeBSD"
@echo ""
cc -c -O -Dunix -Dbsd4_2 -DHAVE_ANSIC_C -DNO_THREADS \
-DSHARED_MEM iozone.c -o iozone_freebsd.o
@@ -543,16 +551,25 @@
iozone_openbsd.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for OpenBSD"
+ @echo "Build iozone for OpenBSD"
@echo ""
cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
-DSHARED_MEM iozone.c -o iozone_openbsd.o
cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
-DSHARED_MEM libbif.c -o libbif.o
+iozone_openbsd-threads.o: iozone.c libbif.c
+ @echo ""
+ @echo "Build iozone for OpenBSD with threads"
+ @echo ""
+ cc -c -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \
+ iozone.c -o iozone_openbsd-threads.o
+ cc -c -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \
+ libbif.c -o libbif.o
+
iozone_OSFV3.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for OSFV3"
+ @echo "Build iozone for OSFV3"
@echo ""
cc -O -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DOSFV3 \
-DNO_PRINT_LLD -DOSF_64 iozone.c -o iozone_OSFV3.o
@@ -563,7 +580,7 @@
iozone_OSFV4.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for OSFV4"
+ @echo "Build iozone for OSFV4"
@echo ""
cc -O -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DOSFV4 \
-DNO_PRINT_LLD -DOSF_64 iozone.c -o iozone_OSFV4.o
@@ -574,7 +591,7 @@
iozone_OSFV5.o: iozone.c libbif.c
@echo ""
- @echo "Build Iozone for OSFV5"
+ @echo "Build iozone for OSFV5"
@echo ""
cc -O -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DOSFV5 \
-DNO_PRINT_LLD -DOSF_64 iozone.c -o iozone_OSFV5.o
@@ -596,8 +613,7 @@
@echo ""
@echo "Building iozone NetBSD "
@echo ""
- gcc -c -O -Dnetbsd -Dunix -DHAVE_ANSIC_C -DNO_THREADS \
- iozone.c -o iozone_netbsd.o
- gcc -c -O -Dnetbsd -Dunix -DHAVE_ANSIC_C -DNO_THREADS \
- libbif.c -o libbif.o
-
+ 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

4
benchmarks/iozone/pkg/DESCR
View File

@ -1,6 +1,6 @@
Iozone: 'IO Zone' Benchmark Program
iozone: 'IO Zone' Benchmark Program
Iozone tests the speed of sequential I/O to actual files. Therefore,
iozone tests the speed of sequential I/O to actual files. Therefore,
this measurement factors in the efficiency of you machines file
system, operating system, C compiler, and C runtime library. It
produces a measurement which is the number of bytes per second that

1
benchmarks/iozone/pkg/PLIST
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2000/11/11 21:37:21 brad Exp $
bin/iozone
man/man1/iozone.1