head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.102 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.100 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.98 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.96 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.94 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.92 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.90 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.88 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.86 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.84 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.82 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.80 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.78 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.76 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.74 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.72 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.70 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.68 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.66 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.64 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.62 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.60 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.58 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.54 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.34 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.56 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.52 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.50 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.48 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.46 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.44 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.42 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.40 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.38 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.36 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.32 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.30 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.28 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.26 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.24 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.22 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.20 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.18 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.16 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.14 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.12 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.10 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.8 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.6 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.4 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.2 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.5.0.16 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.14 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.12 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.10 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.8 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.6 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.6 date 2013.09.10.14.12.38; author joerg; state Exp; branches; next 1.5; commitid 3BgOTfcnLoEKLT4x; 1.5 date 2011.09.12.07.17.14; author dholland; state Exp; branches; next 1.4; 1.4 date 2011.08.14.08.35.35; author mrg; state Exp; branches; next 1.3; 1.3 date 2006.04.12.10.55.49; author drochner; state Exp; branches; next 1.2; 1.2 date 2005.03.03.08.58.27; author garbled; state Exp; branches 1.2.10.1; next 1.1; 1.1 date 2002.06.09.00.24.30; author grant; state Exp; branches 1.1.2.1; next ; 1.2.10.1 date 2006.05.02.15.54.56; author salo; state Exp; branches; next ; 1.1.2.1 date 2002.06.09.00.24.30; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.39.42; author jlam; state Exp; branches; next ; desc @@ 1.6 log @Fix operator precendence. Bump revision. @ text @$NetBSD: patch-ac,v 1.5 2011/09/12 07:17:14 dholland Exp $ - ... - cope with 64-bit off_t --- bonnie.c.orig 1996-08-28 16:23:49.000000000 +0000 +++ bonnie.c @@@@ -25,8 +25,10 @@@@ #include #include +#include #include #include +#include #include #include #if defined(SysV) @@@@ -34,6 +36,7 @@@@ #include #else #include +#include #endif #define IntSize (sizeof(int)) @@@@ -49,7 +52,8 @@@@ #define Seeks (4000) #define UpdateSeek (10) #define SeekProcCount (3) -#define Chunk (16384) + +unsigned int Chunk = 16384; /* labels for the tests, used as an array index */ typedef enum @@@@ -87,11 +91,12 @@@@ static double delta[(int) TestCount][2]; static double last_cpustamp = 0.0; /* for computing delta-t */ static double last_timestamp = 0.0; /* for computing delta-t */ +int main( int argc, char * argv[]) { - int buf[Chunk / IntSize]; + int *buf; int bufindex; int chars[256]; int child; @@@@ -122,6 +127,8 @@@@ main( for (next = 1; next < argc; next++) if (strcmp(argv[next], "-d") == 0) dir = argv[++next]; + else if (strcmp(argv[next], "-c") == 0) + Chunk = atoi(argv[++next]); else if (strcmp(argv[next], "-s") == 0) size = atol(argv[++next]); else if (strcmp(argv[next], "-m") == 0) @@@@ -146,7 +153,12 @@@@ main( /* size is in meg, rounded down to multiple of Chunk */ size *= (1024 * 1024); size = Chunk * (size / Chunk); - fprintf(stderr, "File '%s', size: %ld\n", name, size); + fprintf(stderr, "File '%s', size: %llu\n", name, (unsigned long long) size); + + if (!(buf = (int *) malloc(Chunk))) { + fprintf(stderr, "Error allocating buffer memory: %s\n", strerror(errno)); + exit(1); + } /* Fill up a file, writing it a char at a time with the stdio putc() call */ fprintf(stderr, "Writing with putc()..."); @@@@ -288,6 +300,7 @@@@ main( { /* child process */ /* set up and wait for the go-ahead */ + close(0); /* From FreeBSD */ close(seek_feedback[0]); close(seek_control[1]); newfile(name, &fd, &stream, 0); @@@@ -303,7 +316,13 @@@@ main( /* loop until we read a 0 ticket back from our parent */ while(seek_tickets[0]) { /* until Mom says stop */ - doseek((long) (random() % (size / Chunk)), fd, + off_t seekto; + + if (size < ((off_t)1 << 32)) /* From FreeBSD */ + 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) io_error("read ticket"); @@@@ -380,7 +399,7 @@@@ write_html( off_t size) { - printf("%s%d", machine, size / (1024 * 1024)); + printf("%s%lld", machine, (long long) (size / (1024 * 1024))); printf("%d%4.1f%d%4.1f%d%4.1f", (int) (((double) size) / (delta[(int) Putc][Elapsed] * 1024.0)), delta[(int) Putc][CPU] / delta[(int) Putc][Elapsed] * 100.0, @@@@ -413,7 +432,7 @@@@ report( 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 %4llu ", machine, (unsigned long long) size / (1024 * 1024)); printf("%5d %4.1f %5d %4.1f %5d %4.1f ", (int) (((double) size) / (delta[(int) Putc][Elapsed] * 1024.0)), delta[(int) Putc][CPU] / delta[(int) Putc][Elapsed] * 100.0, @@@@ -458,7 +477,7 @@@@ static void usage() { fprintf(stderr, - "usage: Bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); + "usage: bonnie [-c chunk-size] [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); exit(1); } @@@@ -529,7 +548,7 @@@@ io_error(char * message) { 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); } @@@@ -568,7 +587,7 @@@@ doseek( /* 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"); @ 1.5 log @Update the patch here to use %llu instead of %qu for 64-bit values, since clang objects to %qu. Also patch another format string that was previously missed @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2011/08/14 08:35:35 mrg Exp $ d92 1 a92 1 + seekto = ((off_t)random() << 32 + random()) % (size / Chunk); @ 1.4 log @fix build with GCC 4.5. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2006/04/12 10:55:49 drochner Exp $ d3 5 a7 2 --- bonnie.c.orig 1996-08-28 09:23:49.000000000 -0700 +++ bonnie.c 2011-08-14 01:33:38.000000000 -0700 d37 1 a37 1 @@@@ -87,11 +91,12 @@@@ d51 1 a51 1 @@@@ -122,6 +127,8 @@@@ d60 1 a60 1 @@@@ -146,7 +153,12 @@@@ d65 1 a65 1 + fprintf(stderr, "File '%s', size: %qu\n", name, (u_quad_t) size); d74 1 a74 1 @@@@ -288,6 +300,7 @@@@ d82 1 a82 1 @@@@ -303,7 +316,13 @@@@ d97 10 a106 1 @@@@ -413,7 +432,7 @@@@ d111 1 a111 1 + printf("%-8.8s %4qu ", machine, (u_quad_t) size / (1024 * 1024)); d115 1 a115 1 @@@@ -458,7 +477,7 @@@@ d124 1 a124 1 @@@@ -529,7 +548,7 @@@@ d133 1 a133 1 @@@@ -568,7 +587,7 @@@@ @ 1.3 log @The patch in PR pkg/21421 had a bug: The memory allocated for "Chunk" was too short. This made the program die from EFAULT randomly. Found by Konrad Schroder. Apply his fix that and bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2005/03/03 08:58:27 garbled Exp $ d3 3 a5 3 --- bonnie.c.orig Wed Aug 28 12:23:49 1996 +++ bonnie.c Tue Apr 29 23:22:39 2003 @@@@ -25,6 +25,7 @@@@ d12 1 d14 11 a24 1 @@@@ -49,7 +50,8 @@@@ d34 6 a39 1 @@@@ -91,7 +93,7 @@@@ d48 1 a48 1 @@@@ -122,6 +124,8 @@@@ d57 1 a57 1 @@@@ -146,7 +150,12 @@@@ d71 1 a71 1 @@@@ -288,6 +297,7 @@@@ d79 1 a79 1 @@@@ -303,7 +313,13 @@@@ d94 1 a94 1 @@@@ -413,7 +429,7 @@@@ d103 1 a103 1 @@@@ -458,7 +474,7 @@@@ d112 1 a112 1 @@@@ -529,7 +545,7 @@@@ d121 1 a121 1 @@@@ -568,7 +584,7 @@@@ @ 1.2 log @Apply patches to bonnie from PR 21421 by Greg Woods. Fixes a number of issues with the program. Bumping pkgrevsision to 1. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2002/06/09 00:24:30 grant Exp $ d48 1 a48 1 + if (!(buf = (int *) malloc(Chunk / IntSize))) { @ 1.2.10.1 log @Pullup ticket 1500 - requested by simonb bonnie runtime fix Revisions pulled up: - pkgsrc/benchmarks/bonnie/Makefile 1.27 - pkgsrc/benchmarks/bonnie/distinfo 1.7 - pkgsrc/benchmarks/bonnie/patches/patch-ac 1.3 Module Name: pkgsrc Committed By: drochner Date: Wed Apr 12 10:55:49 UTC 2006 Modified Files: pkgsrc/benchmarks/bonnie: Makefile distinfo pkgsrc/benchmarks/bonnie/patches: patch-ac Log Message: The patch in PR pkg/21421 had a bug: The memory allocated for "Chunk" was too short. This made the program die from EFAULT randomly. Found by Konrad Schroder. Apply his fix that and bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2006/04/12 10:55:49 drochner Exp $ d48 1 a48 1 + if (!(buf = (int *) malloc(Chunk))) { @ 1.1 log @we install `Bonnie' as `bonnie', update usage() accordingly. @ text @d1 1 a1 1 $NetBSD$ d3 85 a87 3 --- bonnie.c.orig Thu Aug 29 02:23:49 1996 +++ bonnie.c Sun Jun 9 10:20:02 2002 @@@@ -458,7 +458,7 @@@@ d92 11 a102 1 + "usage: bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); d105 1 d107 7 @ 1.1.2.1 log @file patch-ac was added on branch buildlink2 on 2002-06-23 18:39:42 +0000 @ text @d1 13 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 13 $NetBSD: patch-ac,v 1.1.2.1 2002/06/23 18:39:42 jlam Exp $ --- bonnie.c.orig Thu Aug 29 02:23:49 1996 +++ bonnie.c Sun Jun 9 10:20:02 2002 @@@@ -458,7 +458,7 @@@@ usage() { fprintf(stderr, - "usage: Bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); + "usage: bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); exit(1); } @