diff options
Diffstat (limited to 'benchmarks/bonnie')
| -rw-r--r-- | benchmarks/bonnie/Makefile | 15 | ||||
| -rw-r--r-- | benchmarks/bonnie/distinfo | 2 | ||||
| -rw-r--r-- | benchmarks/bonnie/files/patch-ab | 67 | ||||
| -rw-r--r-- | benchmarks/bonnie/files/patch-ac | 11 | ||||
| -rw-r--r-- | benchmarks/bonnie/pkg-descr | 2 |
5 files changed, 38 insertions, 59 deletions
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index 2b6eb1a..9524711 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -6,19 +6,20 @@ # PORTNAME= bonnie -PORTVERSION= 1.0 +PORTVERSION= 2.0.6 CATEGORIES= benchmarks -MASTER_SITES= ftp://ftp.sunet.se/pub/benchmark/Bonnie/ -DISTNAME= Bonnie -EXTRACT_SUFX= .tar.Z +MASTER_SITES= http://www.acnc.com/benchmarks/ \ + http://www.textuality.com/bonnie/ +DISTNAME= bonnie MAINTAINER= se@FreeBSD.org +NO_WRKSUBDIR= yes +#CFLAGS+= -static +MAKE_ARGS+= -e CFLAGS="${CFLAGS}" +ALL_TARGET= bsd MAN1= bonnie.1 -CFLAGS+= -static -MAKE_ARGS+= CFLAGS="${CFLAGS}" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Bonnie ${PREFIX}/bin/bonnie ${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${PREFIX}/man/man1 diff --git a/benchmarks/bonnie/distinfo b/benchmarks/bonnie/distinfo index a78cbe8..3752e39 100644 --- a/benchmarks/bonnie/distinfo +++ b/benchmarks/bonnie/distinfo @@ -1 +1 @@ -MD5 (Bonnie.tar.Z) = 23f73cd45caabb510b4f2bdc6dfa6ff0 +MD5 (bonnie.tar.gz) = f61cc061a418c3ae308ae362a1ae6490 diff --git a/benchmarks/bonnie/files/patch-ab b/benchmarks/bonnie/files/patch-ab index e598f7b..e71c6bd 100644 --- a/benchmarks/bonnie/files/patch-ab +++ b/benchmarks/bonnie/files/patch-ab @@ -1,73 +1,60 @@ ---- Bonnie.c~ Wed Aug 21 17:18:50 1991 -+++ Bonnie.c Thu Dec 30 17:49:15 1999 -@@ -162,7 +162,7 @@ - char seek_tickets[Seeks + SeekProcCount]; - double seeker_report[3]; -- int size; -+ quad_t size; - FILE * stream; -- int words; -+ off_t words; - - fd = -1; -@@ -195,5 +195,5 @@ - size *= (1024 * 1024); - sprintf(name, "%s/Bonnie.%d", dir, getpid()); -- fprintf(stderr, "File '%s', size: %d\n", name, size); -+ fprintf(stderr, "File '%s', size: %qd\n", name, size); - - /* Fill up a file, writing it a char at a time with the stdio putc() call */ -@@ -228,5 +228,5 @@ +--- Bonnie.c.orig Wed Aug 28 09:23:49 1996 ++++ Bonnie.c Fri Jun 28 23:40:56 2002 +@@ -179,7 +179,7 @@ + if (bufindex == Chunk / IntSize) bufindex = 0; buf[bufindex++]++; - if (lseek(fd, (off_t) -words, 1) == -1) + if (lseek(fd, -words, 1) == -1) io_error("relative lseek(2)"); if (write(fd, (char *) buf, words) == -1) -@@ -337,4 +337,5 @@ + io_error("re write(2)"); +@@ -288,6 +288,7 @@ + { /* child process */ /* set up and wait for the go-ahead */ + close(0); close(seek_feedback[0]); close(seek_control[1]); -@@ -352,5 +353,11 @@ + newfile(name, &fd, &stream, 0); +@@ -303,7 +304,12 @@ + /* loop until we read a 0 ticket back from our parent */ while(seek_tickets[0]) { /* until Mom says stop */ -- doseek((long) (random() % size), fd, -+ off_t seekto; -+ if (size < ((off_t)1 << 32)) -+ seekto = random() % size; -+ else -+ seekto = ((off_t)random() << 32 + random()) % size; -+ -+ doseek(seekto, fd, +- doseek((long) (random() % (size / Chunk)), fd, ++ off_t seekto; ++ if (size < ((off_t)1 << 32)) ++ seekto = random() % (size / Chunk); ++ else ++ seekto = ((off_t)random() << 32 + random()) % (size / Chunk); ++ doseek(seekto, fd, ((lseek_count++ % UpdateSeek) == 0)); if (read(seek_control[0], seek_tickets, 1) != 1) -@@ -422,5 +429,5 @@ - static void - report(size) -- int size; -+ quad_t size; - { - printf(" "); -@@ -434,5 +441,5 @@ + io_error("read ticket"); +@@ -413,7 +419,7 @@ + printf("K/sec %%CPU K/sec %%CPU K/sec %%CPU K/sec %%CPU K/sec "); printf("%%CPU /sec %%CPU\n"); - printf("%-8.8s %4d ", machine, size / (1024 * 1024)); + printf("%-8.8s %4qd ", machine, size / (1024 * 1024)); printf("%5d %4.1f %5d %4.1f %5d %4.1f ", (int) (((double) size) / (delta[(int) Putc][Elapsed] * 1024.0)), -@@ -551,5 +558,5 @@ + delta[(int) Putc][CPU] / delta[(int) Putc][Elapsed] * 100.0, +@@ -529,7 +535,7 @@ + { char buf[Chunk]; - sprintf(buf, "Bonnie: drastic I/O error (%s)", message); + sprintf(buf, "\nBonnie: drastic I/O error (%s)", message); perror(buf); exit(1); -@@ -593,5 +600,5 @@ + } +@@ -568,7 +574,7 @@ + /* touch a word */ buf[((int) random() % (size/IntSize - 2)) + 1]--; - if (lseek(fd, (long) probe, 0) != probe) + if (lseek(fd, probe, 0) != probe) io_error("lseek in doseek update"); if (write(fd, (char *) buf, size) == -1) + io_error("write in doseek"); diff --git a/benchmarks/bonnie/files/patch-ac b/benchmarks/bonnie/files/patch-ac deleted file mode 100644 index f19f9aa..0000000 --- a/benchmarks/bonnie/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Wed Aug 21 08:19:11 1991 -+++ Makefile Sun Jan 23 16:28:09 2000 -@@ -1,6 +1,6 @@ - --CC = cc --CFLAGS = -O2 -+CC ?= cc -+CFLAGS ?= -O2 - - all: Bonnie - diff --git a/benchmarks/bonnie/pkg-descr b/benchmarks/bonnie/pkg-descr index 0e90851..12448ec 100644 --- a/benchmarks/bonnie/pkg-descr +++ b/benchmarks/bonnie/pkg-descr @@ -17,3 +17,5 @@ buffer cache is 16MB and the Bonnie test file is 32MB in size, then the seek time will come out as half its real value. The seek time includes rotational delay, and will thus always come out higher than specified for a drive. + +WWW: http://www.textuality.com/bonnie/ |
