diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2006-10-15 12:53:04 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2006-10-15 12:53:04 +0000 |
commit | fcc5cc61991c8168ad6c1123bfd93207fb5b7428 (patch) | |
tree | 76c6de88ef9f8e1f37914d82eb6e88f39a62542a /benchmarks/blogbench | |
parent | 0f1c26c7a49e965a4a0d27ca403b10f41e5083dd (diff) | |
download | pkgsrc-fcc5cc61991c8168ad6c1123bfd93207fb5b7428.tar.gz |
Add patches to support a new flag:
--directio or -o (if enabled uses O_DIRECT in open(2)).
Useful to test performance of Direct I/O implementation on NetBSD.
Bump PKGREVISION.
Diffstat (limited to 'benchmarks/blogbench')
-rw-r--r-- | benchmarks/blogbench/Makefile | 3 | ||||
-rw-r--r-- | benchmarks/blogbench/distinfo | 8 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-aa | 12 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-ab | 21 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-ac | 22 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-ad | 20 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-ae | 13 | ||||
-rw-r--r-- | benchmarks/blogbench/patches/patch-af | 13 |
8 files changed, 110 insertions, 2 deletions
diff --git a/benchmarks/blogbench/Makefile b/benchmarks/blogbench/Makefile index 3d38007863c..5e1aec4d311 100644 --- a/benchmarks/blogbench/Makefile +++ b/benchmarks/blogbench/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/03/04 21:29:01 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2006/10/15 12:53:04 xtraeme Exp $ # DISTNAME= blogbench-1.0 +PKGREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= ftp://ftp.blogbench.pureftpd.org/blogbench/ EXTRACT_SUFX= .tar.bz2 diff --git a/benchmarks/blogbench/distinfo b/benchmarks/blogbench/distinfo index 62ab91ed7b4..d815ed1d525 100644 --- a/benchmarks/blogbench/distinfo +++ b/benchmarks/blogbench/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.2 2005/02/22 21:16:35 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/10/15 12:53:04 xtraeme Exp $ SHA1 (blogbench-1.0.tar.bz2) = 3e667bc9ebfee8751c28508a1840a10b9bdfc099 RMD160 (blogbench-1.0.tar.bz2) = b688e83c06d45986d592a4fc6a6f5f59ade3da7a Size (blogbench-1.0.tar.bz2) = 103355 bytes +SHA1 (patch-aa) = 77c48f0e50aeeec341d7d127564839f526a86e1f +SHA1 (patch-ab) = 9db1070408e2afd12272e01a62d5ea8f2802c1df +SHA1 (patch-ac) = 72ce26dc25b1c2adf9b6d8835852c6ff7ddc1d84 +SHA1 (patch-ad) = e353b458af302aa0f9afd8811d11aafb3ed19010 +SHA1 (patch-ae) = 01b8dcb0641941d70dd056ae2026b83fb16be954 +SHA1 (patch-af) = 8c16af43c281d28446dc2b976662c64b02cf3269 diff --git a/benchmarks/blogbench/patches/patch-aa b/benchmarks/blogbench/patches/patch-aa new file mode 100644 index 00000000000..04efc7e4000 --- /dev/null +++ b/benchmarks/blogbench/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/globals.h.orig 2006-10-15 13:01:57.000000000 +0200 ++++ src/globals.h 2006-10-15 13:02:42.000000000 +0200 +@@ -41,4 +41,7 @@ + GLOBAL(unsigned int sleep_stats, DEFAULT_SLEEP_STATS); + GLOBAL(unsigned int nb_writers, DEFAULT_NB_WRITERS); + ++/* O_DIRECT aka Direct I/O */ ++GLOBAL(unsigned int do_directio, DEFAULT_DIRECTIO); ++ + #endif diff --git a/benchmarks/blogbench/patches/patch-ab b/benchmarks/blogbench/patches/patch-ab new file mode 100644 index 00000000000..9a60f510634 --- /dev/null +++ b/benchmarks/blogbench/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/blogbench_p.h.orig 2006-10-15 13:08:03.000000000 +0200 ++++ src/blogbench_p.h 2006-10-15 13:08:32.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef __BLOGBENCH_P_H__ + #define __BLOGBENCH_P_H__ 1 + +-static const char *GETOPT_OPTIONS = "c:d:hi:r:W:s:w:"; ++static const char *GETOPT_OPTIONS = "c:d:hi:or:W:s:w:"; + + static struct option long_options[] = { + { "commenters", 1, NULL, 'c' }, +@@ -12,6 +12,7 @@ + { "rewriters", 0, NULL, 'W' }, + { "sleep", 1, NULL, 's' }, + { "writers", 1, NULL, 'w' }, ++ { "directio", 0, NULL, 'o' }, + { NULL, 0, NULL, 0 } + }; + diff --git a/benchmarks/blogbench/patches/patch-ac b/benchmarks/blogbench/patches/patch-ac new file mode 100644 index 00000000000..bcd1ba778bd --- /dev/null +++ b/benchmarks/blogbench/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/blogbench.c.orig 2006-10-15 13:09:33.000000000 +0200 ++++ src/blogbench.c 2006-10-15 13:10:39.000000000 +0200 +@@ -19,6 +19,7 @@ + "--rewriters=<n> (-W <n>): number of rewriters\n" + "--sleep=<secs> (-s <secs>): delay after every iteration\n" + "--writers=<n> (-w <n>): number of writers\n" ++ "--directio (-o): enable Direct I/O\n" + "\n" + "Sample usage:\n" + "\n" +@@ -56,6 +57,9 @@ + case 'i': + stats_iterations = (unsigned int) strtoul(optarg, NULL, 10); + break; ++ case 'o': ++ do_directio = 1; ++ break; + case 'r': + nb_readers = (unsigned int) strtoul(optarg, NULL, 10); + break; diff --git a/benchmarks/blogbench/patches/patch-ad b/benchmarks/blogbench/patches/patch-ad new file mode 100644 index 00000000000..1eea96cdcd5 --- /dev/null +++ b/benchmarks/blogbench/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/helpers.c.orig 2005-02-11 15:46:26.000000000 +0100 ++++ src/helpers.c 2006-10-15 13:25:58.000000000 +0200 +@@ -49,8 +49,13 @@ + ssize_t written; + int fd; + +- if ((fd = open(file_name, O_CREAT | O_TRUNC | O_WRONLY, +- (mode_t) 0600)) == -1) { ++ if (do_directio) ++ fd = open(file_name, O_CREAT|O_TRUNC|O_WRONLY|O_DIRECT, ++ (mode_t)0600); ++ else ++ fd = open(file_name, O_CREAT|O_TRUNC|O_WRONLY, (mode_t)0600); ++ ++ if (fd == -1) { + if (errno != ENOENT) { + reentrant_printf("open(\"%s\"): %s\n", + file_name, strerror(errno)); diff --git a/benchmarks/blogbench/patches/patch-ae b/benchmarks/blogbench/patches/patch-ae new file mode 100644 index 00000000000..177972210d0 --- /dev/null +++ b/benchmarks/blogbench/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/blogbench.h.orig 2006-10-15 13:18:13.000000000 +0200 ++++ src/blogbench.h 2006-10-15 13:18:27.000000000 +0200 +@@ -104,6 +104,8 @@ + #define DEFAULT_NB_READERS 100 + #define DEFAULT_NB_COMMENTERS 5 + ++#define DEFAULT_DIRECTIO 0 ++ + #define USLEEP_WRITERS 10000 + #define USLEEP_REWRITERS 1000000 + #define USLEEP_READERS 0 diff --git a/benchmarks/blogbench/patches/patch-af b/benchmarks/blogbench/patches/patch-af new file mode 100644 index 00000000000..524f20d6861 --- /dev/null +++ b/benchmarks/blogbench/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2006/10/15 12:53:04 xtraeme Exp $ + +--- src/process.c.orig 2005-02-11 22:32:46.000000000 +0100 ++++ src/process.c 2006-10-15 14:44:32.000000000 +0200 +@@ -138,6 +138,8 @@ + "Frequency = %u secs\n" + "Scratch dir = [%s]\n", + sleep_stats, scratch_dir); ++ reentrant_printf("Direct I/O: %s\n", do_directio ? "enabled" : "disabled"); ++ + if (chdir(scratch_dir) != 0) { + reentrant_printf("Unable to enter the scratch dir [%s]: [%s]\n", + scratch_dir, strerror(errno)); |