diff options
| author | marino <marino@pkgsrc.org> | 2012-01-24 23:45:00 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-01-24 23:45:00 +0000 |
| commit | d613e31217b2dd71c796f637271c25ed72fc4d85 (patch) | |
| tree | ab02a6b428e2bc2231f21498eeb2ea8986c17f9a /benchmarks | |
| parent | 131e39788140957992f8b7c81b491bd3823e93ca (diff) | |
| download | pkgsrc-d613e31217b2dd71c796f637271c25ed72fc4d85.tar.gz | |
benchmarks/iozone: Unbreak DragonFly (again)
The update from version 3.308 to 3.397 broke DragonFly 11 days after I
fixed it due to missing a macro change. An integer redeclaration was
also removed.
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/iozone/distinfo | 4 | ||||
| -rw-r--r-- | benchmarks/iozone/patches/patch-ab | 20 |
2 files changed, 9 insertions, 15 deletions
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo index 0360ec19bd7..9e1c8fae79b 100644 --- a/benchmarks/iozone/distinfo +++ b/benchmarks/iozone/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.18 2011/12/02 15:31:44 hauke Exp $ +$NetBSD: distinfo,v 1.19 2012/01/24 23:45:00 marino Exp $ SHA1 (iozone3_397.tar) = 6095a38542286376f6eb2a203f253dc4c31ddeda RMD160 (iozone3_397.tar) = b87e1732206eae0762d1e6bd552b33af8bdc045a Size (iozone3_397.tar) = 1679360 bytes SHA1 (patch-aa) = e209a364cdeca38c3995fbaebde3758bdd74e582 -SHA1 (patch-ab) = b3d2cbf160868ab2e81becc5d932c6459903c2dc +SHA1 (patch-ab) = 934e83868b1b23e951034484b2017b2cf4289441 SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2 SHA1 (patch-iozone_visualizer.pl) = cd5cd6ed4892bfae3ed7c48088ccdf5c9a5a53ee SHA1 (patch-report.pl) = 9101f79c78a55ca60993723923dd79dd51720490 diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab index 10c860b960f..dda308fbd25 100644 --- a/benchmarks/iozone/patches/patch-ab +++ b/benchmarks/iozone/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $ +$NetBSD: patch-ab,v 1.10 2012/01/24 23:45:00 marino Exp $ --- iozone.c.orig 2011-05-06 15:39:00.000000000 +0000 +++ iozone.c @@ -30,17 +30,19 @@ $NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $ #endif #endif -@@ -6876,6 +6879,10 @@ long long *data2; +@@ -6876,7 +6879,11 @@ long long *data2; if(odsync) file_flags |= O_DSYNC; #endif +-#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__) +#if defined (__DragonFly__) + if(read_sync) + file_flags |= O_SYNC; +#endif - #if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) || defined(__DragonFly__) ++#if defined(_HPUX_SOURCE) || defined(linux) || defined(__FreeBSD__) if(read_sync) file_flags |=O_RSYNC|O_SYNC; + #endif @@ -10098,7 +10105,11 @@ long long *data1, *data2; open_flags |=O_DIRECTIO; #endif @@ -54,15 +56,7 @@ $NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $ if(read_sync) open_flags |=O_RSYNC|O_SYNC; #endif -@@ -10324,6 +10335,7 @@ long long *data1,*data2; - off64_t filebytes64,i; - off64_t numrecs64; - int fd,ltest; -+ int wval; - #if defined(VXFS) || defined(solaris) - int test_foo = 0; - #endif -@@ -10454,7 +10466,7 @@ long long *data1,*data2; +@@ -10454,7 +10465,7 @@ long long *data1,*data2; purgeit(piov[xx].piov_base,reclen); } if(pwritev(fd, piov,numvecs @@ -71,7 +65,7 @@ $NetBSD: patch-ab,v 1.9 2011/12/02 15:31:44 hauke Exp $ , list_off[0] #endif ) != (reclen*numvecs)) -@@ -10781,7 +10793,7 @@ long long *data1,*data2; +@@ -10781,7 +10792,7 @@ long long *data1,*data2; purgeit(piov[xx].piov_base,reclen); } if(preadv(fd, piov, numvecs |