Hello community, here is the log from the commit of package bonnie++ for openSUSE:Factory checked in at 2014-07-31 21:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bonnie++ (Old) and /work/SRC/openSUSE:Factory/.bonnie++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bonnie++" Changes: -------- --- /work/SRC/openSUSE:Factory/bonnie++/bonnie++.changes 2011-10-16 12:43:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bonnie++.new/bonnie++.changes 2014-07-31 21:50:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 13:47:07 CEST 2014 - [email protected] + +- upgraded source to version 1.97 + * fixed a bunch of bugs including bad CSV output. + +------------------------------------------------------------------- Old: ---- bonnie++-1.96.tgz New: ---- bonnie++-1.97.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bonnie++.spec ++++++ --- /var/tmp/diff_new_pack.HAstEd/_old 2014-07-31 21:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.HAstEd/_new 2014-07-31 21:50:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bonnie++ # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # - Name: bonnie++ -BuildRequires: gcc-c++ +Version: 1.97 +Release: 0 +Summary: A Bonnie-Like File System Benchmark License: MIT Group: System/Benchmark -Provides: bonnie++-1.96 -Summary: A Bonnie-Like File System Benchmark -Version: 1.96 -Release: 1 -Source: http://www.coker.com.au/bonnie++/bonnie++-1.96.tgz +Url: http://www.coker.com.au/bonnie++/ +Source: %{name}-%{version}.tgz +BuildRequires: gcc-c++ +Provides: bonnie++-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -33,27 +33,27 @@ hard drive and file system performance tests. %prep -%setup +%setup -q %build - make clean %{?_smp_mflags} - make MORECFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make clean %{?_smp_mflags} +make MORECFLAGS="%{optflags}" %{?_smp_mflags} %install - mkdir -p $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bonnie++ zcav $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bon_csv2html bon_csv2txt $RPM_BUILD_ROOT/usr/bin - mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,8} - /usr/bin/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 $RPM_BUILD_ROOT%{_mandir}/man1 - /usr/bin/install -c -m 644 bonnie++.8 zcav.8 $RPM_BUILD_ROOT%{_mandir}/man8 +mkdir -p %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bonnie++ zcav %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bon_csv2html bon_csv2txt %{buildroot}%{_prefix}/bin +mkdir -p %{buildroot}%{_mandir}/man{1,8} +%{_bindir}/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 %{buildroot}%{_mandir}/man1 +%{_bindir}/install -c -m 644 bonnie++.8 zcav.8 %{buildroot}%{_mandir}/man8 %files %defattr(-,root,root) %doc readme.html -/usr/bin/bonnie++ -/usr/bin/zcav -/usr/bin/bon_csv2html -/usr/bin/bon_csv2txt +%{_bindir}/bonnie++ +%{_bindir}/zcav +%{_bindir}/bon_csv2html +%{_bindir}/bon_csv2txt %{_mandir}/man8/bonnie++.8.gz %{_mandir}/man8/zcav.8.gz %{_mandir}/man1/bon_csv2html.1.gz ++++++ bonnie++-1.96.tgz -> bonnie++-1.97.tgz ++++++ ++++ 7100 lines of diff (skipped) ++++ retrying with extended exclude list Files old/bonnie++-1.96/.bon_csv2html.cpp.swp and new/bonnie++-1.97/.bon_csv2html.cpp.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.1 new/bonnie++-1.97/bon_csv2html.1 --- old/bonnie++-1.96/bon_csv2html.1 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.1 2011-01-18 22:36:31.000000000 +0100 @@ -21,10 +21,10 @@ Before each field I list the field number as well as the name given in the heading .TP .B 0 format_version -Version of the output format in use (1.96) +Version of the output format in use (1.97) .TP .B 1 bonnie_version -(1.96) +(1.97) .TP .B 2 name Machine Name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.cpp new/bonnie++-1.97/bon_csv2html.cpp --- old/bonnie++-1.96/bon_csv2html.cpp 2009-07-03 08:21:11.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.cpp 2012-11-23 09:22:33.000000000 +0100 @@ -43,14 +43,14 @@ bool col_used[MAX_ITEMS]; #define COL_NAME 2 #define COL_CONCURRENCY 3 -#define COL_FILE_SIZE 5 -#define COL_DATA_CHUNK_SIZE 6 +#define COL_FILE_size 5 +#define COL_DATA_CHUNK_size 6 #define COL_PUTC 7 #define COL_NUM_FILES 19 -#define COL_MAX_SIZE 20 -#define COL_MIN_SIZE 21 +#define COL_MAX_size 20 +#define COL_MIN_size 21 #define COL_NUM_DIRS 22 -#define COL_FILE_CHUNK_SIZE 23 +#define COL_FILE_CHUNK_size 23 #define COL_RAN_DEL_CPU 35 #define COL_PUTC_LATENCY 36 #define COL_SEEKS_LATENCY 41 @@ -90,11 +90,11 @@ props[i] = new PCCHAR[MAX_ITEMS]; props[i][0] = NULL; props[i][1] = NULL; - props[i][COL_NAME] = "bgcolor=\"#FFFFFF\" class=\"rowheader\"><FONT SIZE=+1"; + props[i][COL_NAME] = "bgcolor=\"#FFFFFF\" class=\"rowheader\"><font size=+1"; int j; for(j = COL_CONCURRENCY; j < MAX_ITEMS; j++) { - if( (j >= COL_NUM_FILES && j <= COL_FILE_CHUNK_SIZE) || j <= COL_DATA_CHUNK_SIZE ) + if( (j >= COL_NUM_FILES && j <= COL_FILE_CHUNK_size) || j <= COL_DATA_CHUNK_size ) { props[i][j] = "class=\"size\" bgcolor=\"#FFFFFF\""; } @@ -109,32 +109,32 @@ for(i = 0; i < data.size(); i++) { // First print the average speed line - printf("<TR>"); - print_item(i, COL_NAME, "rowspan=2"); + printf("<tr>"); + print_item(i, COL_NAME, "rowspan=\"2\""); if(col_used[COL_CONCURRENCY] == true) print_item(i, COL_CONCURRENCY); - print_item(i, COL_FILE_SIZE); // file_size - if(col_used[COL_DATA_CHUNK_SIZE] == true) - print_item(i, COL_DATA_CHUNK_SIZE); + print_item(i, COL_FILE_size); // file_size + if(col_used[COL_DATA_CHUNK_size] == true) + print_item(i, COL_DATA_CHUNK_size); print_a_line(i, COL_PUTC, COL_NUM_FILES); - if(col_used[COL_MAX_SIZE]) - print_item(i, COL_MAX_SIZE); - if(col_used[COL_MIN_SIZE]) - print_item(i, COL_MIN_SIZE); + if(col_used[COL_MAX_size]) + print_item(i, COL_MAX_size); + if(col_used[COL_MIN_size]) + print_item(i, COL_MIN_size); if(col_used[COL_NUM_DIRS]) print_item(i, COL_NUM_DIRS); - if(col_used[COL_FILE_CHUNK_SIZE]) - print_item(i, COL_FILE_CHUNK_SIZE); - print_a_line(i, COL_FILE_CHUNK_SIZE + 1, COL_RAN_DEL_CPU); - printf("</TR>\n"); + if(col_used[COL_FILE_CHUNK_size]) + print_item(i, COL_FILE_CHUNK_size); + print_a_line(i, COL_FILE_CHUNK_size + 1, COL_RAN_DEL_CPU); + printf("</tr>\n"); // Now print the latency line - printf("<TR>"); + printf("<tr>"); int lat_width = 1; - if(col_used[COL_DATA_CHUNK_SIZE] == true) + if(col_used[COL_DATA_CHUNK_size] == true) lat_width++; if(col_used[COL_CONCURRENCY] == true) lat_width++; - printf("<TD class=\"size\" bgcolor=\"#FFFFFF\" COLSPAN=%d>Latency</TD>" + printf("<td class=\"size\" bgcolor=\"#FFFFFF\" colspan=\"%d\">Latency</td>" , lat_width); print_a_line(i, COL_PUTC_LATENCY, COL_SEEKS_LATENCY); int bef_lat_width; @@ -143,10 +143,10 @@ lat_width = 2; bef_lat_width = mid_width - lat_width; if(bef_lat_width) - printf("<TD COLSPAN=%d></TD>", bef_lat_width); - printf("<TD class=\"size\" bgcolor=\"#FFFFFF\" COLSPAN=%d>Latency</TD>", lat_width); + printf("<td colspan=\"%d\"></td>", bef_lat_width); + printf("<td class=\"size\" bgcolor=\"#FFFFFF\" colspan=\"%d\">Latency</td>", lat_width); print_a_line(i, COL_SEQ_CREATE_LATENCY, COL_RAN_DEL_LATENCY); - printf("</TR>\n"); + printf("</tr>\n"); } footer(); return 0; @@ -251,7 +251,7 @@ { if(vals[column_ind] == eLatency) { - props[sort_ind][column_ind] = "COLSPAN=2"; + props[sort_ind][column_ind] = "colspan=\"2\""; } } } @@ -316,14 +316,14 @@ if(vals[column_ind] != eSpeed) { reverse = true; - extra = " COLSPAN=2"; + extra = " colspan=\"2\""; } props[arr[sort_ind].pos][column_ind] = get_col(range_col, arr[sort_ind].val - min_col, reverse, extra); } else if(vals[column_ind] != eSpeed) { - props[arr[sort_ind].pos][column_ind] = "COLSPAN=2"; + props[arr[sort_ind].pos][column_ind] = "colspan=\"2\""; } } } @@ -333,7 +333,7 @@ { if(vals[column_ind] == eLatency) { - props[sort_ind][column_ind] = "COLSPAN=2"; + props[sort_ind][column_ind] = "colspan=\"2\""; } } } @@ -366,90 +366,90 @@ int header() { int vers_width = 2; - if(col_used[COL_DATA_CHUNK_SIZE] == true) + if(col_used[COL_DATA_CHUNK_size] == true) vers_width++; if(col_used[COL_CONCURRENCY] == true) vers_width++; int mid_width = 1; - if(col_used[COL_MAX_SIZE]) + if(col_used[COL_MAX_size]) mid_width++; - if(col_used[COL_MIN_SIZE]) + if(col_used[COL_MIN_size]) mid_width++; if(col_used[COL_NUM_DIRS]) mid_width++; - if(col_used[COL_FILE_CHUNK_SIZE]) + if(col_used[COL_FILE_CHUNK_size]) mid_width++; - printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>" -"<HTML>" -"<HEAD><TITLE>Bonnie++ Benchmark results</TITLE>" -"<STYLE type=\"text/css\">" -"TD.header {text-align: center; backgroundcolor: \"#CCFFFF\" }" -"TD.rowheader {text-align: center; backgroundcolor: \"#CCCFFF\" }" -"TD.size {text-align: center; backgroundcolor: \"#CCCFFF\" }" -"TD.ksec {text-align: center; fontstyle: italic }" -"</STYLE>" -"<BODY>" -"<TABLE ALIGN=center BORDER=3 CELLPADDING=2 CELLSPACING=1>" -"<TR><TD COLSPAN=%d class=\"header\"><FONT SIZE=+1><B>" + printf("<!DOCTYPE html PUBLIC \"-//W3C//Dtd XHTML 1.0 Strict//EN\" \"http://www.w3.org/tr/xhtml1/Dtd/xhtml1-strict.dtd\";>" +"<html xmlns=\"http://www.w3.org/1999/xhtml\";>" +"<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" /><title>Bonnie++ Benchmark results</title>" +"<style type=\"text/css\">" +"td.header {text-align: center; backgroundcolor: \"#CCFFFF\" }" +"td.rowheader {text-align: center; backgroundcolor: \"#CCCFFF\" }" +"td.size {text-align: center; backgroundcolor: \"#CCCFFF\" }" +"td.ksec {text-align: center; fontstyle: italic }" +"</style></head>" +"<body>" +"<table border=\"3\" cellpadding=\"2\" cellspacing=\"1\">" +"<tr><td colspan=\"%d\" class=\"header\"><font size=+1><b>" "Version " BON_VERSION -"</B></FONT></TD>" -"<TD COLSPAN=6 class=\"header\"><FONT SIZE=+2><B>Sequential Output</B></FONT></TD>" -"<TD COLSPAN=4 class=\"header\"><FONT SIZE=+2><B>Sequential Input</B></FONT></TD>" -"<TD COLSPAN=2 ROWSPAN=2 class=\"header\"><FONT SIZE=+2><B>Random<BR>Seeks</B></FONT></TD>" -"<TD COLSPAN=%d class=\"header\"></TD>" -"<TD COLSPAN=6 class=\"header\"><FONT SIZE=+2><B>Sequential Create</B></FONT></TD>" -"<TD COLSPAN=6 class=\"header\"><FONT SIZE=+2><B>Random Create</B></FONT></TD>" -"</TR>\n" -"<TR>", vers_width, mid_width); +"</b></font></td>" +"<td colspan=\"6\" class=\"header\"><font size=+2><b>Sequential Output</b></font></td>" +"<td colspan=\"4\" class=\"header\"><font size=+2><b>Sequential Input</b></font></td>" +"<td colspan=\"2\" rowspan=\"2\" class=\"header\"><font size=+2><b>Random<br>Seeks</b></font></td>" +"<td colspan=\"%d\" class=\"header\"></td>" +"<td colspan=\"6\" class=\"header\"><font size=+2><b>Sequential Create</b></font></td>" +"<td colspan=\"6\" class=\"header\"><font size=+2><b>Random Create</b></font></td>" +"</tr>\n" +"<tr>", vers_width, mid_width); if(col_used[COL_CONCURRENCY] == true) - printf("<TD COLSPAN=2>Concurrency</TD>"); + printf("<td colspan=\"2\">Concurrency</td>"); else - printf("<TD></TD>"); - printf("<TD>Size</TD>"); - if(col_used[COL_DATA_CHUNK_SIZE] == true) - printf("<TD>Chunk Size</TD>"); + printf("<td></td>"); + printf("<td>Size</td>"); + if(col_used[COL_DATA_CHUNK_size] == true) + printf("<td>Chunk Size</td>"); heading("Per Char"); heading("Block"); heading("Rewrite"); heading("Per Char"); heading("Block"); - printf("<TD>Num Files</TD>"); - if(col_used[COL_MAX_SIZE]) - printf("<TD>Max Size</TD>"); - if(col_used[COL_MIN_SIZE]) - printf("<TD>Min Size</TD>"); + printf("<td>Num Files</td>"); + if(col_used[COL_MAX_size]) + printf("<td>Max Size</td>"); + if(col_used[COL_MIN_size]) + printf("<td>Min Size</td>"); if(col_used[COL_NUM_DIRS]) - printf("<TD>Num Dirs</TD>"); - if(col_used[COL_FILE_CHUNK_SIZE]) - printf("<TD>Chunk Size</TD>"); + printf("<td>Num Dirs</td>"); + if(col_used[COL_FILE_CHUNK_size]) + printf("<td>Chunk Size</td>"); heading("Create"); heading("Read"); heading("Delete"); heading("Create"); heading("Read"); heading("Delete"); - printf("</TR>"); + printf("</tr>"); - printf("<TR><TD COLSPAN=%d></TD>", vers_width); + printf("<tr><td colspan=\"%d\"></td>", vers_width); int i; - CPCCHAR ksec_form = "<TD class=\"ksec\"><FONT SIZE=-2>%s/sec</FONT></TD>" - "<TD class=\"ksec\"><FONT SIZE=-2>%% CPU</FONT></TD>"; + CPCCHAR ksec_form = "<td class=\"ksec\"><font size=-2>%s/sec</font></td>" + "<td class=\"ksec\"><font size=-2>%% CPU</font></td>"; for(i = 0; i < 5; i++) { printf(ksec_form, "K"); } printf(ksec_form, ""); - printf("<TD COLSPAN=%d></TD>", mid_width); + printf("<td colspan=\"%d\"></td>", mid_width); for(i = 0; i < 6; i++) { printf(ksec_form, ""); } - printf("</TR>\n"); + printf("</tr>\n"); return mid_width; } void heading(const char * const head) { - printf("<TD COLSPAN=2>%s</TD>", head); + printf("<td colspan=\"2\">%s</td>", head); } void footer() { - printf("</TABLE>\n</BODY></HTML>\n"); + printf("</table>\n</body></html>\n"); } STR_VEC split(CPCCHAR delim, CPCCHAR buf) @@ -473,7 +473,8 @@ STR_VEC arr = split(",", buf); if(strcmp(arr[0], CSV_VERSION) ) { - fprintf(stderr, "Can't process: %s\n", buf); + if(strncmp(arr[0], "format_version", 14)) + fprintf(stderr, "Can't process: %s\n", buf); free((void *)arr[0]); return; } @@ -487,12 +488,12 @@ line_data = data[num][item]; else line_data = ""; - printf("<TD"); + printf("<td"); if(extra) printf(" %s", extra); if(props[num][item]) printf(" %s", props[num][item]); - printf(">%s</TD>", line_data); + printf(">%s</td>", line_data); } void print_a_line(int num, int start, int end) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2txt new/bonnie++-1.97/bon_csv2txt --- old/bonnie++-1.96/bon_csv2txt 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2txt 2011-01-18 22:36:31.000000000 +0100 @@ -19,7 +19,7 @@ sub IOHeader { - my $version = '1.96'; + my $version = '1.97'; printf(STDOUT "Version %9s ------Sequential Output------ --Sequential Input- --Random-\n", $version); print " -Per Chr- --Block-- -Rewrite- -Per Chr- --Block-- --Seeks--\n"; print "Machine Size K/sec %CP K/sec %CP K/sec %CP K/sec %CP K/sec %CP /sec %CP\n"; @@ -39,7 +39,7 @@ chomp($line); $line =~ s/\r//; my @arr = split(',', $line); - my $csv_version = '1.96'; + my $csv_version = '1.97'; if($arr[0] ne $csv_version) { printf(STDERR "Can't process: %s\n", $line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_time.cpp new/bonnie++-1.97/bon_time.cpp --- old/bonnie++-1.96/bon_time.cpp 2008-12-23 22:03:20.000000000 +0100 +++ new/bonnie++-1.97/bon_time.cpp 2012-11-23 08:22:33.000000000 +0100 @@ -175,7 +175,7 @@ void BonTimer::PrintHeader(FILE *fp) { - fprintf(fp, "format_version,bonnie_version,name,file_size,io_chunk_size,putc,putc_cpu,put_block,put_block_cpu,rewrite,rewrite_cpu,getc,getc_cpu,get_block,get_block_cpu,seeks,seeks_cpu"); + fprintf(fp, "format_version,bonnie_version,name,concurrency,seed,file_size,io_chunk_size,putc,putc_cpu,put_block,put_block_cpu,rewrite,rewrite_cpu,getc,getc_cpu,get_block,get_block_cpu,seeks,seeks_cpu"); fprintf(fp, ",num_files,max_size,min_size,num_dirs,file_chunk_size,seq_create,seq_create_cpu,seq_stat,seq_stat_cpu,seq_del,seq_del_cpu,ran_create,ran_create_cpu,ran_stat,ran_stat_cpu,ran_del,ran_del_cpu"); fprintf(fp, ",putc_latency,put_block_latency,rewrite_latency,getc_latency,get_block_latency,seeks_latency,seq_create_latency,seq_stat_latency,seq_del_latency,ran_create_latency,ran_stat_latency,ran_del_latency"); fprintf(fp, "\n"); @@ -293,7 +293,7 @@ } else if(m_type == csv) { - fprintf(m_fp, CSV_VERSION "," BON_VERSION ",%s,%d,%s,,,,,,,,,,,,,", m_name + fprintf(m_fp, CSV_VERSION "," BON_VERSION ",%s,%d,%s,,,,,,,,,,,,,,", m_name , m_concurrency, random_source.getSeed().c_str()); } return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie++.8 new/bonnie++-1.97/bonnie++.8 --- old/bonnie++-1.96/bonnie++.8 2008-12-10 00:13:45.000000000 +0100 +++ new/bonnie++-1.97/bonnie++.8 2012-11-23 08:43:18.000000000 +0100 @@ -199,6 +199,10 @@ the output will be displayed as "++++". This is because such a test result can't be calculated accurately due to rounding errors and I would rather display no result than a wrong result. +.P +Data volumes for the 80 column text display use "K" for KiB (1024 bytes), "M" +for MiB (1048576 bytes), and "G" for GiB (1073741824 bytes). So K/sec means +a multiple of 1024 bytes per second. .SH "AUTHOR" This program, its manual page, and the Debian package were written by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie++.spec new/bonnie++-1.97/bonnie++.spec --- old/bonnie++-1.96/bonnie++.spec 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bonnie++.spec 2011-01-18 22:36:31.000000000 +0100 @@ -1,6 +1,6 @@ Summary: A program for benchmarking hard drives and filesystems Name: bonnie++ -Version: 1.96 +Version: 1.97 Release: 1 Copyright: GPL Group: Utilities/Benchmarking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie.h new/bonnie++-1.97/bonnie.h --- old/bonnie++-1.96/bonnie.h 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bonnie.h 2011-01-18 22:36:31.000000000 +0100 @@ -3,8 +3,8 @@ using namespace std; -#define BON_VERSION "1.96" -#define CSV_VERSION "1.96" +#define BON_VERSION "1.97" +#define CSV_VERSION "1.97" #include "port.h" #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/configure.in new/bonnie++-1.97/configure.in --- old/bonnie++-1.96/configure.in 2009-07-04 03:23:53.000000000 +0200 +++ new/bonnie++-1.97/configure.in 2011-01-18 22:35:28.000000000 +0100 @@ -2,9 +2,9 @@ AC_INIT(bonnie++.cpp) AC_CONFIG_HEADER(conf.h) AC_SUBST(version) -version="1.96" +version="1.97" AC_SUBST(csv_version) -csv_version="1.96" +csv_version="1.97" AC_ARG_ENABLE(stripping, [ --disable-stripping disables stripping of installed binaries], @@ -96,7 +96,7 @@ int main () { int fd; off64_t i = off64_t(1) << 32 + 1; - char *name = "test.2g"; + const char * const name = "test.2g"; fd = open64(name, O_CREAT|O_RDWR|O_EXCL|O_LARGEFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/debian/changelog new/bonnie++-1.97/debian/changelog --- old/bonnie++-1.96/debian/changelog 2009-07-04 03:24:26.000000000 +0200 +++ new/bonnie++-1.97/debian/changelog 2012-11-23 10:14:22.000000000 +0100 @@ -1,3 +1,29 @@ +bonnie++ (1.97.1) unstable; urgency=medium + + * Fixed the changelog and aim it at unstable not wheezy. + + -- Russell Coker <[email protected]> Fri, 23 Nov 2012 20:12:46 +1100 + +bonnie++ (1.97) unstable; urgency=medium + + * Fix a CSV column alignment bug in the case where -s0 is used. Bump the + data format version to 1.97. Thanks to Brian Keefer for reporting this. + Also added the concurrency and seed fields to the header. + Closes: #660564, #669124 + * Use a const pointer for the large file test. + * zcav.8 documents the maximum value of -s + * Made the zcav deefault block size 512M to cope with new disks that can + sustain >200MB/s. Also documented this. + * Made zcav not SEGV when the -c option is used. + Closes: #687668 + * Describe the units for the plain text output in bonnie++.8. + Closes: #643821 + * Removed the outdated section in the description which referred to Lenny. + Closes: #693483 + * Fixed most of the HTML validation errors in the output of bon_csv2html. + + -- Russell Coker <[email protected]> Fri, 23 Nov 2012 19:32:00 +1100 + bonnie++ (1.96) unstable; urgency=low * Fix a minor bug in setting the GID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/debian/control new/bonnie++-1.97/debian/control --- old/bonnie++-1.96/debian/control 2008-08-19 10:36:47.000000000 +0200 +++ new/bonnie++-1.97/debian/control 2012-11-23 08:52:15.000000000 +0100 @@ -11,17 +11,11 @@ Conflicts: zcav, bonnie, bonnie++ Replaces: zcav, bonnie Provides: zcav, bonnie -Description: Hard drive benchmark suite. - It is called Bonnie++ because it was based on the Bonnie program. This - program also tests performance with creating large numbers of files. - Now includes zcav raw-read test program. A modern hard drive will have more - sectors in the outer tracks because they are longer. The hard drive will - have a number (often more than 8) of zones where each zone has the same - number of sectors (due to the need for an integral number of sectors per - track). This program allows you to determine the levels of performance - provided by different zones and store them in a convenient format for gnuplot. - . - This is the experimental version. It's not ready to replace the 1.x series - in time for Lenny but will be for Lenny+1. The extra features (large file - support, better bon_csv2html, and support for zcav tests on multiple devices) - will make it worth using for some people. +Description: Hard drive benchmark suite + Based on the old Bonnie benchmark, Bonnie++ is a toolkit for testing + hard drive and file system performance. + . + As well as bonnie++ itself and some output filters, the suite provides + some other benchmarking tools including zcav, which can compare the + raw-read performance of different zones on a drive, and gives output + suitable for gnuplot. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/sun/pkginfo new/bonnie++-1.97/sun/pkginfo --- old/bonnie++-1.96/sun/pkginfo 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/sun/pkginfo 2011-01-18 22:36:31.000000000 +0100 @@ -1,6 +1,6 @@ PKG=bonnie++ ARCH=sparc -VERSION=1.96 +VERSION=1.97 CATEGORY=application NAME=Bonnie++ DESC=Hard drive benchmark suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav.8 new/bonnie++-1.97/zcav.8 --- old/bonnie++-1.96/zcav.8 2009-07-03 06:35:13.000000000 +0200 +++ new/bonnie++-1.97/zcav.8 2012-11-23 08:27:16.000000000 +0100 @@ -40,7 +40,7 @@ .TP .B \-b -the size (in Meg) of the blocks to read/write (default 100M), optionally +the size (in Meg) of the blocks to read/write (default 512M), optionally followed by a ':' and the chunk size for read/write operations (default 1M). Note that the chunk size must be less than or equal to the block size and must also be significantly less than the size of the RAM in the machine. @@ -62,7 +62,7 @@ .TP .B \-s skip rate. The option \-s 10 will cause it to read every 10th block and skip -the rest. +the rest. Accepts values from 2 to 20. .TP .B \-f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav.cpp new/bonnie++-1.97/zcav.cpp --- old/bonnie++-1.96/zcav.cpp 2009-07-03 06:33:09.000000000 +0200 +++ new/bonnie++-1.97/zcav.cpp 2012-11-23 08:26:19.000000000 +0100 @@ -104,7 +104,7 @@ MultiZcav::MultiZcav() { - m_block_size = 256; + m_block_size = DEFAULT_BLOCK_SIZE; m_max_loops = 1; m_max_size = 0; m_start_offset = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav_io.cpp new/bonnie++-1.97/zcav_io.cpp --- old/bonnie++-1.96/zcav_io.cpp 2009-07-03 06:28:48.000000000 +0200 +++ new/bonnie++-1.97/zcav_io.cpp 2012-11-23 08:34:43.000000000 +0100 @@ -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][0] != -1.0) + && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0)) && (!max_size || i < max_size); i++) { double read_time = access_data(i ? skip_rate - 1 : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav_io.h new/bonnie++-1.97/zcav_io.h --- old/bonnie++-1.96/zcav_io.h 2009-07-03 06:23:02.000000000 +0200 +++ new/bonnie++-1.97/zcav_io.h 2012-11-23 08:26:11.000000000 +0100 @@ -20,6 +20,7 @@ double average(double *array, int count); const int MEG = 1024*1024; +const int DEFAULT_BLOCK_SIZE = 512; const int DEFAULT_CHUNK_SIZE = 1; class ZcavRead -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
