pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/benchmarks/bonnie++
Module Name: pkgsrc
Committed By: markd
Date: Sat Jul 10 01:43:57 UTC 2021
Modified Files:
pkgsrc/benchmarks/bonnie++: Makefile distinfo
Added Files:
pkgsrc/benchmarks/bonnie++/patches: patch-bon_csv2html.cpp
Log Message:
bonnie++: update to 1.98
* Fixed macros in bon_csv2html.cpp that had lower case due to excessive
matching on a regex.
* Changed debian/compat to level 10
* Allow specifying the number of random seeks and the number of seeker
processes and store that in the CSV.
* Changed bon_csv2html and bon_csv2txt to take the new CSV format.
* Changed the text output to use KiB/MiB/GiB as units of measurement so we
can fit NVMe results on screen.
* Changed the HTML to be in MiB/s for the bulk IO tests.
* Changed the default size for getc_putc to work with faster CPUs and more
optimised libc.
-- Russell Coker <russell%coker.com.au@localhost> Wed, 26 Dec 2018 15:14:28 +1100
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/benchmarks/bonnie++/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/benchmarks/bonnie++/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/benchmarks/bonnie++/patches/patch-bon_csv2html.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/benchmarks/bonnie++/Makefile
diff -u pkgsrc/benchmarks/bonnie++/Makefile:1.41 pkgsrc/benchmarks/bonnie++/Makefile:1.42
--- pkgsrc/benchmarks/bonnie++/Makefile:1.41 Mon May 24 19:49:09 2021
+++ pkgsrc/benchmarks/bonnie++/Makefile Sat Jul 10 01:43:57 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2021/05/24 19:49:09 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2021/07/10 01:43:57 markd Exp $
#
-DISTNAME= bonnie++-1.97.3
+DISTNAME= bonnie++-1.98
CATEGORIES= benchmarks
-PKGREVISION= 6
-MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/
+MASTER_SITES= http://www.coker.com.au/bonnie++/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/benchmarks/bonnie++/distinfo
diff -u pkgsrc/benchmarks/bonnie++/distinfo:1.12 pkgsrc/benchmarks/bonnie++/distinfo:1.13
--- pkgsrc/benchmarks/bonnie++/distinfo:1.12 Fri Jun 1 10:55:52 2018
+++ pkgsrc/benchmarks/bonnie++/distinfo Sat Jul 10 01:43:57 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2018/06/01 10:55:52 maya Exp $
+$NetBSD: distinfo,v 1.13 2021/07/10 01:43:57 markd Exp $
-SHA1 (bonnie++-1.97.3.tgz) = 47ce25f21146a63bb007ba94e26adb49c4c15de7
-RMD160 (bonnie++-1.97.3.tgz) = 227f0e6b8e643bdd120e013c4f9f35426b3a7475
-SHA512 (bonnie++-1.97.3.tgz) = 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
-Size (bonnie++-1.97.3.tgz) = 100166 bytes
+SHA1 (bonnie++-1.98.tgz) = 0a6066c0aca248ce241d0b3637d4642ee9023801
+RMD160 (bonnie++-1.98.tgz) = c70149db5cba5bdf433ca556f72e4e1d98e5a435
+SHA512 (bonnie++-1.98.tgz) = 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
+Size (bonnie++-1.98.tgz) = 100339 bytes
SHA1 (patch-ab) = 18756a4f3efaf8d478c3edc5be424c099c47e374
SHA1 (patch-bon__io.cpp) = 2ce4504424c8fbf88ee5d1eb21e3556f541a05f4
+SHA1 (patch-bon_csv2html.cpp) = 98a9336418b38b8ff56824155e370bd294c251fd
SHA1 (patch-port.h.in) = 089d93456efab27a91d5574ed6b8f5956a734620
Added files:
Index: pkgsrc/benchmarks/bonnie++/patches/patch-bon_csv2html.cpp
diff -u /dev/null pkgsrc/benchmarks/bonnie++/patches/patch-bon_csv2html.cpp:1.1
--- /dev/null Sat Jul 10 01:43:57 2021
+++ pkgsrc/benchmarks/bonnie++/patches/patch-bon_csv2html.cpp Sat Jul 10 01:43:57 2021
@@ -0,0 +1,181 @@
+$NetBSD: patch-bon_csv2html.cpp,v 1.1 2021/07/10 01:43:57 markd Exp $
+
+rename data for gcc-11
+
+--- bon_csv2html.cpp.orig 2018-09-13 14:54:36.000000000 +0000
++++ bon_csv2html.cpp
+@@ -10,7 +10,7 @@
+ using namespace std;
+ typedef vector<PCCHAR> STR_VEC;
+
+-vector<STR_VEC> data;
++vector<STR_VEC> stddata;
+ typedef PCCHAR * PPCCHAR;
+ PPCCHAR * props;
+
+@@ -87,8 +87,8 @@ int main(int argc, char **argv)
+ read_in(buf);
+ }
+
+- props = new PPCCHAR[data.size()];
+- for(i = 0; i < data.size(); i++)
++ props = new PPCCHAR[stddata.size()];
++ for(i = 0; i < stddata.size(); i++)
+ {
+ props[i] = new PCCHAR[MAX_ITEMS];
+ props[i][0] = NULL;
+@@ -109,7 +109,7 @@ int main(int argc, char **argv)
+ }
+ calc_vals();
+ int mid_width = header();
+- for(i = 0; i < data.size(); i++)
++ for(i = 0; i < stddata.size(); i++)
+ {
+ // First print the average speed line
+ printf("<tr>");
+@@ -171,23 +171,23 @@ int compar(const void *a, const void *b)
+
+ void calc_vals()
+ {
+- ITEM *arr = new ITEM[data.size()];
++ ITEM *arr = new ITEM[stddata.size()];
+ for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++)
+ {
+ switch(vals[column_ind])
+ {
+ case eNoCols:
+ {
+- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+ {
+ if(column_ind == COL_CONCURRENCY)
+ {
+- if(data[row_ind][column_ind] && strcmp("1", data[row_ind][column_ind]))
++ if(stddata[row_ind][column_ind] && strcmp("1", stddata[row_ind][column_ind]))
+ col_used[column_ind] = true;
+ }
+ else
+ {
+- if(data[row_ind][column_ind] && strlen(data[row_ind][column_ind]))
++ if(stddata[row_ind][column_ind] && strlen(stddata[row_ind][column_ind]))
+ col_used[column_ind] = true;
+ }
+ }
+@@ -195,22 +195,22 @@ void calc_vals()
+ break;
+ case eCPU:
+ {
+- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+ {
+ double work, cpu;
+ arr[row_ind].val = 0.0;
+- if(data[row_ind].size() > column_ind
+- && sscanf(data[row_ind][column_ind - 1], "%lf", &work) == 1
+- && sscanf(data[row_ind][column_ind], "%lf", &cpu) == 1)
++ if(stddata[row_ind].size() > column_ind
++ && sscanf(stddata[row_ind][column_ind - 1], "%lf", &work) == 1
++ && sscanf(stddata[row_ind][column_ind], "%lf", &cpu) == 1)
+ {
+ arr[row_ind].val = cpu / work;
+ }
+ arr[row_ind].pos = row_ind;
+ }
+- qsort(arr, data.size(), sizeof(ITEM), compar);
++ qsort(arr, stddata.size(), sizeof(ITEM), compar);
+ int col_count = -1;
+ double min_col = -1.0, max_col = -1.0;
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ // if item is different from previous or if the first row
+ // (sort_ind == 0) then increment col count
+@@ -239,7 +239,7 @@ void calc_vals()
+ min_col /= mult;
+ }
+ double range_col = max_col - min_col;
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ if(arr[sort_ind].col_ind > -1)
+ {
+@@ -250,7 +250,7 @@ void calc_vals()
+ }
+ else
+ {
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ if(vals[column_ind] == eLatency)
+ {
+@@ -263,25 +263,25 @@ void calc_vals()
+ case eSpeed:
+ case eLatency:
+ {
+- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
+ {
+ arr[row_ind].val = 0.0;
+- if(data[row_ind].size() <= column_ind
+- || sscanf(data[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
++ if(stddata[row_ind].size() <= column_ind
++ || sscanf(stddata[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
+ arr[row_ind].val = 0.0;
+ if(vals[column_ind] == eLatency && arr[row_ind].val != 0.0)
+ {
+- if(strstr(data[row_ind][column_ind], "ms"))
++ if(strstr(stddata[row_ind][column_ind], "ms"))
+ arr[row_ind].val *= 1000.0;
+- else if(!strstr(data[row_ind][column_ind], "us"))
++ else if(!strstr(stddata[row_ind][column_ind], "us"))
+ arr[row_ind].val *= 1000000.0; // is !us && !ms then secs!
+ }
+ arr[row_ind].pos = row_ind;
+ }
+- qsort(arr, data.size(), sizeof(ITEM), compar);
++ qsort(arr, stddata.size(), sizeof(ITEM), compar);
+ int col_count = -1;
+ double min_col = -1.0, max_col = -1.0;
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ // if item is different from previous or if the first row
+ // (sort_ind == 0) then increment col count
+@@ -310,7 +310,7 @@ void calc_vals()
+ min_col /= mult;
+ }
+ double range_col = max_col - min_col;
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ if(arr[sort_ind].col_ind > -1)
+ {
+@@ -332,7 +332,7 @@ void calc_vals()
+ }
+ else
+ {
+- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
++ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
+ {
+ if(vals[column_ind] == eLatency)
+ {
+@@ -481,16 +481,16 @@ void read_in(CPCCHAR buf)
+ free((void *)arr[0]);
+ return;
+ }
+- data.push_back(arr);
++ stddata.push_back(arr);
+ }
+
+ void print_item(int num, int item, CPCCHAR extra)
+ {
+ PCCHAR line_data;
+ char buf[1024];
+- if(int(data[num].size()) > item)
++ if(int(stddata[num].size()) > item)
+ {
+- line_data = data[num][item];
++ line_data = stddata[num][item];
+ switch(item)
+ {
+ case COL_PUT_BLOCK:
Home |
Main Index |
Thread Index |
Old Index