From 517b06393389c6c1762a1ddea837f59361947f92fab50e7b4d5077bde7d36aa5 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Sun, 20 Jan 2019 21:12:54 +0000 Subject: [PATCH 1/4] Accepting request 667059 from home:garloff:branches:benchmark - bonnie-fix-o_direct.diff: Don't use O_DIRECT for character input, as newer kernels don't allow this. - Update to bonnie-1.6: * Use 16 threads by default * Smaller 4k reads (seeking) * Larger blocks in intelligent read/write * Smaller I/O size for char in/out * More digits for formatting. OBS-URL: https://build.opensuse.org/request/show/667059 OBS-URL: https://build.opensuse.org/package/show/benchmark/bonnie?expand=0&rev=6 --- bonnie-1.5.tar.bz2 | 3 --- bonnie-1.6.tar.bz2 | 3 +++ bonnie-fix-o_direct.diff | 27 +++++++++++++++++++++++++++ bonnie.changes | 16 ++++++++++++++++ bonnie.spec | 8 +++++--- 5 files changed, 51 insertions(+), 6 deletions(-) delete mode 100644 bonnie-1.5.tar.bz2 create mode 100644 bonnie-1.6.tar.bz2 create mode 100644 bonnie-fix-o_direct.diff diff --git a/bonnie-1.5.tar.bz2 b/bonnie-1.5.tar.bz2 deleted file mode 100644 index 7c45900..0000000 --- a/bonnie-1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eae780a2025cda86809537d5be75988f082b99b55da7cec9342060ed4f2a9f5a -size 19689 diff --git a/bonnie-1.6.tar.bz2 b/bonnie-1.6.tar.bz2 new file mode 100644 index 0000000..52c206b --- /dev/null +++ b/bonnie-1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e44b0c44c7e80b57bfb29ff32815dfa76d11a18ca1d1dfa9887e754ba0fd1b87 +size 20239 diff --git a/bonnie-fix-o_direct.diff b/bonnie-fix-o_direct.diff new file mode 100644 index 0000000..7526f53 --- /dev/null +++ b/bonnie-fix-o_direct.diff @@ -0,0 +1,27 @@ +? bonnie2 +Index: Bonnie.c +=================================================================== +RCS file: /share/MD0_DATA/cvsroot/C/bonnie/Bonnie.c,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -p -r1.5 -r1.6 +--- Bonnie.c 17 Feb 2016 13:09:47 -0000 1.5 ++++ Bonnie.c 23 Nov 2018 09:45:08 -0000 1.6 +@@ -64,7 +64,7 @@ + * or consequential damage, loss, costs or fees or expenses of any + * nature or kind. + */ +-/* $Id: Bonnie.c,v 1.5 2016/02/17 13:09:47 garloff Exp $ */ ++/* $Id: Bonnie.c,v 1.6 2018/11/23 09:45:08 garloff Exp $ */ + + #include + #include +@@ -449,7 +449,7 @@ int main( + + /* read them all back with getc() */ + for(volcnt = 0; volcnt < volumes; volcnt++) +- newfile(name, &fd[volcnt], &stream[volcnt], 0, volcnt, o_direct); ++ newfile(name, &fd[volcnt], &stream[volcnt], 0, volcnt, 0/*+o_direct*/); + for (words = 0; words < 256; words++) + chars[words] = 0; + off_t gsz = size/8; diff --git a/bonnie.changes b/bonnie.changes index ea8aa46..a969c3d 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Jan 11 11:17:49 CET 2019 - kurt@garloff.de + +- bonnie-fix-o_direct.diff: Don't use O_DIRECT for character input, + as newer kernels don't allow this. + +------------------------------------------------------------------- +Fri Jan 11 11:17:02 CET 2019 - kurt@garloff.de + +- Update to bonnie-1.6: + * Use 16 threads by default + * Smaller 4k reads (seeking) + * Larger blocks in intelligent read/write + * Smaller I/O size for char in/out + * More digits for formatting. + ------------------------------------------------------------------- Thu Jun 30 13:21:33 UTC 2016 - mpluskal@suse.com diff --git a/bonnie.spec b/bonnie.spec index d278fe1..3ba2bdb 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -1,7 +1,7 @@ # # spec file for package bonnie # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: bonnie -Version: 1.5 +Version: 1.6 Release: 0 Summary: File System Benchmark -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Benchmark Url: https://code.google.com/p/bonnie-64/ Source0: https://fossies.org/linux/privat/old/%{name}-%{version}.tar.bz2 +Patch0: bonnie-fix-o_direct.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,6 +33,7 @@ of Unix file systems. %prep %setup -q -n %{name} +%patch0 -p0 %build make SYSFLAGS="%{optflags}" %{?_smp_mflags} From ea51a8dbfc733ad59c0edc4922c3955c74be9f6103cf6431ef9ec679c62982ed Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Oct 2019 15:06:28 +0000 Subject: [PATCH 2/4] Accepting request 740030 from home:RBrownSUSE:branches:benchmark Remove obsolete Groups tag (fate#326485) OBS-URL: https://build.opensuse.org/request/show/740030 OBS-URL: https://build.opensuse.org/package/show/benchmark/bonnie?expand=0&rev=7 --- bonnie.changes | 5 +++++ bonnie.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bonnie.changes b/bonnie.changes index a969c3d..e0d5022 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 14:50:53 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + ------------------------------------------------------------------- Fri Jan 11 11:17:49 CET 2019 - kurt@garloff.de diff --git a/bonnie.spec b/bonnie.spec index 3ba2bdb..f7ffe7a 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,6 @@ Version: 1.6 Release: 0 Summary: File System Benchmark License: GPL-2.0-or-later -Group: System/Benchmark Url: https://code.google.com/p/bonnie-64/ Source0: https://fossies.org/linux/privat/old/%{name}-%{version}.tar.bz2 Patch0: bonnie-fix-o_direct.diff From 3a6f51272abdebee0440275bfdb31e8992123627e4b0e94daf1426899af374e2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 5 Nov 2019 08:07:43 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/benchmark/bonnie?expand=0&rev=8 --- bonnie.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bonnie.spec b/bonnie.spec index f7ffe7a..48b651a 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -21,10 +21,9 @@ Version: 1.6 Release: 0 Summary: File System Benchmark License: GPL-2.0-or-later -Url: https://code.google.com/p/bonnie-64/ -Source0: https://fossies.org/linux/privat/old/%{name}-%{version}.tar.bz2 +URL: https://code.google.com/p/bonnie-64/ +Source0: %{name}-%{version}.tar.bz2 Patch0: bonnie-fix-o_direct.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bonnie is a popular performance benchmark that targets various aspects @@ -32,7 +31,7 @@ of Unix file systems. %prep %setup -q -n %{name} -%patch0 -p0 +%patch0 %build make SYSFLAGS="%{optflags}" %{?_smp_mflags} @@ -41,9 +40,8 @@ make SYSFLAGS="%{optflags}" %{?_smp_mflags} %make_install %files -%defattr(-, root, root) %doc bonnie.doc README %{_bindir}/bonnie -%{_mandir}/man1/bonnie.1%{ext_man} +%{_mandir}/man1/bonnie.1%{?ext_man} %changelog From e0fcd9539dc08d6b18fd1c977bdbdfd3215de49ae612f70882e184a6e9aa6786 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 5 Nov 2019 08:10:30 +0000 Subject: [PATCH 4/4] - Do not use download url anymore OBS-URL: https://build.opensuse.org/package/show/benchmark/bonnie?expand=0&rev=9 --- bonnie.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bonnie.changes b/bonnie.changes index e0d5022..4b9cd70 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 08:10:10 UTC 2019 - Martin Pluskal + +- Do not use download url anymore + ------------------------------------------------------------------- Thu Oct 17 14:50:53 UTC 2019 - Richard Brown