From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-benchmarks/bonnie++/Manifest | 7 ++++ app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild | 38 ++++++++++++++++++++++ app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild | 38 ++++++++++++++++++++++ .../files/bonnie++-1.96-compile-flags.patch | 17 ++++++++++ .../bonnie++-1.97-zcav-array-indexing-fix.patch | 35 ++++++++++++++++++++ app-benchmarks/bonnie++/metadata.xml | 17 ++++++++++ 6 files changed, 152 insertions(+) create mode 100644 app-benchmarks/bonnie++/Manifest create mode 100644 app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild create mode 100644 app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild create mode 100644 app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch create mode 100644 app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch create mode 100644 app-benchmarks/bonnie++/metadata.xml (limited to 'app-benchmarks/bonnie++') diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest new file mode 100644 index 000000000000..db55fe7993f0 --- /dev/null +++ b/app-benchmarks/bonnie++/Manifest @@ -0,0 +1,7 @@ +AUX bonnie++-1.96-compile-flags.patch 611 BLAKE2B b4290c150cd7a84e3b3f60efb1999f83231657533c674b686c02f9ea7d8da6e17dafb9cb94e047edd72fcca484723cbb1828c42c1cf4d37467d405e187344314 SHA512 bc5acf12ba0231f8ed4708363dd4146bf9b07fb05c8367e1c572b1950a8334da413de0b2283bc185050cb57a4d5b2ec966072085f80b7bcd6f45d5a8b8ba7fee +AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 BLAKE2B c31575b33594c310884d95c0030867706dee2598b49c9943e8ca6af3e6ebef5454f1cc786c487f8970f8be70df54830b54ab02ccd061a8bac2daf100d77b7578 SHA512 f26a3873965d70c3cb1b0ce4422daa1a9b3152d189a532c81ec4764aac1a04fadf45f1c562fedaaa6de443eeadcdc176ed7b5c1353eeaa91ad340a1560e96d32 +DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 +DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 +EBUILD bonnie++-1.97.2.ebuild 965 BLAKE2B 1eb3c87ffc61ba3d9aa790ffdabb767f1eaeb96d929a155428d6edfe5a02124ea4f072e3ab43f95dd53cca58047c2540dafdbd1241615b2f44659c991767d0c7 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b +EBUILD bonnie++-1.97.3.ebuild 964 BLAKE2B f5bf7dfd5d015e6226fdb9625403cc5aafd2088f2f6272f0b13cdd9d444d11c7d7623d60d72ed423864adb9f034481fff9f6d1b4ffbe51f7714101da2ca81570 SHA512 a182e252546d1d8ef98b4ec5031dab9b2a7b050df5a01f3018dd5752b231050f927ca2c64754421d121ab6bf990f83448c43619b437d7806592dd00257f77492 +MISC metadata.xml 610 BLAKE2B f9248e7f0ed78f7b1beffc4fcf133e76b09a7140bfa1b6d4aa42278181362223f272d3b6444075b51cc4f553fdad7ed9d092c6edca604475bffb890a278d6e98 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild new file mode 100644 index 000000000000..129503e49533 --- /dev/null +++ b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +DESCRIPTION="Hard drive bottleneck testing benchmark suite" +HOMEPAGE="http://www.coker.com.au/bonnie++/" +SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86" +IUSE="debug" + +S="${WORKDIR}/${P}" + +PATCHES=( + "${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788 + "${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319 +) + +DOCS=( README.txt README-2.00 debian/changelog credits.txt ) +HTML_DOCS=( readme.html ) + +src_configure() { + econf \ + $(usex debug "--enable-debug" "") \ + --disable-stripping +} + +src_install() { + dobin bonnie++ zcav bon_csv2html bon_csv2txt + sed -i -e \ + "s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \ + bonnie++.8 || die #431684 + doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8 + einstalldocs +} diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild new file mode 100644 index 000000000000..3ff574002e5f --- /dev/null +++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +DESCRIPTION="Hard drive bottleneck testing benchmark suite" +HOMEPAGE="http://www.coker.com.au/bonnie++/" +SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86" +IUSE="debug" + +S="${WORKDIR}/${P}" + +PATCHES=( + "${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788 + "${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319 +) + +DOCS=( README.txt README-2.00 debian/changelog credits.txt ) +HTML_DOCS=( readme.html ) + +src_configure() { + econf \ + $(usex debug "--enable-debug" "") \ + --disable-stripping +} + +src_install() { + dobin bonnie++ zcav bon_csv2html bon_csv2txt + sed -i -e \ + "s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \ + bonnie++.8 || die #431684 + doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8 + einstalldocs +} diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch new file mode 100644 index 000000000000..05821f977ecc --- /dev/null +++ b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile.in b/Makefile.in +index 4f14819..1092891 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -9,9 +9,9 @@ prefix=@prefix@ + eprefix=@exec_prefix@ + #MORE_WARNINGS=-Weffc++ + WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) +-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) +-CXX=@CXX@ $(CFLAGS) +-LINK=@CXX@ ++CXXFLAGS += @debug@ -DNDEBUG $(WFLAGS) ++CXX=@CXX@ $(CXXFLAGS) ++LINK=@CXX@ $(LDFLAGS) + THREAD_LFLAGS=@thread_ldflags@ + + INSTALL=@INSTALL@ diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch new file mode 100644 index 000000000000..3d92689541db --- /dev/null +++ b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch @@ -0,0 +1,35 @@ +From: Göktürk Yüksek +Subject: [PATCH] Fix array indexing in Zcav::Read when max_loop > 1 and start_offset > 0 + +In method Zcav::Read, the variable 'i' holds the block index. It is +also used as an index to arrays of measurement values (read times and +block counts) when (max_loops > 0). However, the blocks array and +measurements arrays will be out of sync if some initial blocks are to +be skipped (by having start_offset > 0). Using the same index value +for arrays of different sizes causes segfaults. Fix it by substracting +the start_offset properly when accessing the measurements arrays. + +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=309319 + +--- a/zcav_io.cpp ++++ b/zcav_io.cpp +@@ -108,7 +108,7 @@ + double total_read_time = 0.0; + bool nextLoop = false; + for( ; !nextLoop && (!max_size || i < max_size) +- && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0)) ++ && (loops == 0 || (m_times[i - start_offset] && m_times[i - start_offset][0] != -1.0)) + && (!max_size || i < max_size); i++) + { + double read_time = access_data(i ? skip_rate - 1 : 0); +@@ -135,8 +135,8 @@ + m_times.push_back(new double[max_loops]); + m_count.push_back(0); + } +- m_times[i][loops] = read_time; +- m_count[i]++; ++ m_times[i - start_offset][loops] = read_time; ++ m_count[i - start_offset]++; + } + } // end loop for reading blocks + diff --git a/app-benchmarks/bonnie++/metadata.xml b/app-benchmarks/bonnie++/metadata.xml new file mode 100644 index 000000000000..4d0566b2ee10 --- /dev/null +++ b/app-benchmarks/bonnie++/metadata.xml @@ -0,0 +1,17 @@ + + + + + gokturk@gentoo.org + Göktürk Yüksek + + + bircoph@gentoo.org + Andrew Savchenko + + + Bonnie++ is based on the Bonnie hard drive benchmark by Tim Bray. This + program is used by ReiserFS developers, but can be useful for anyone + who wants to know how fast their hard drive or file system is. + + -- cgit v1.2.3