Index: head/benchmarks/bonnie++/Makefile =================================================================== --- head/benchmarks/bonnie++/Makefile (revision 424233) +++ head/benchmarks/bonnie++/Makefile (revision 424234) @@ -1,34 +1,31 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= bonnie++ -PORTVERSION= 1.97 -PORTREVISION= 3 +PORTVERSION= 1.97.2 CATEGORIES= benchmarks MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/ MAINTAINER= martymac@FreeBSD.org COMMENT= Performance Test of Filesystem I/O LICENSE= GPLv2 GNU_CONFIGURE= yes USES= shebangfix tar:tgz SHEBANG_FILES= bon_csv2txt.in - -WRKSRC= ${WRKDIR}/${PORTNAME}-1.97.1 PORTDOCS= readme.html OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} \ 's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR} .include Index: head/benchmarks/bonnie++/distinfo =================================================================== --- head/benchmarks/bonnie++/distinfo (revision 424233) +++ head/benchmarks/bonnie++/distinfo (revision 424234) @@ -1,2 +1,3 @@ -SHA256 (bonnie++-1.97.tgz) = 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 -SIZE (bonnie++-1.97.tgz) = 102604 +TIMESTAMP = 1476819885 +SHA256 (bonnie++-1.97.2.tgz) = 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 +SIZE (bonnie++-1.97.2.tgz) = 102533 Index: head/benchmarks/bonnie++/files/patch-bonnie++.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 424233) +++ head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 424234) @@ -1,67 +1,45 @@ ---- bonnie++.cpp.orig 2009-07-03 02:38:14 UTC -+++ bonnie++.cpp -@@ -73,7 +73,7 @@ public: - void set_io_chunk_size(int size) - { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } - void set_file_chunk_size(int size) -- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } -+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } - - // Return the page-aligned version of the local buffer - char *buf() { return m_buf_pa; } -@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFla - , m_buf(NULL) - , m_buf_pa(NULL) - { -- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); -+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); - SetName("."); - } - -@@ -294,11 +294,7 @@ int main(int argc, char *argv[]) +--- bonnie++.cpp.orig 2016-06-30 09:41:41.000000000 +0000 ++++ bonnie++.cpp 2016-10-18 19:52:40.381679719 +0000 +@@ -294,11 +294,7 @@ { char *sbuf = _strdup(optarg); char *size = strtok(sbuf, ":"); -#ifdef _LARGEFILE64_SOURCE file_size = size_from_str(size, "gt"); -#else - file_size = size_from_str(size, "g"); -#endif size = strtok(NULL, ""); if(size) { -@@ -384,17 +380,8 @@ int main(int argc, char *argv[]) +@@ -384,15 +380,6 @@ if(file_size % 1024 > 512) file_size = file_size + 1024 - (file_size % 1024); } -#ifndef _LARGEFILE64_SOURCE - if(file_size == 2048) - file_size = 2047; - if(file_size > 2048) - { - fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size); - usage(); - } -#endif -- globals.byte_io_size = __min(file_size, globals.byte_io_size); -- globals.byte_io_size = __max(0, globals.byte_io_size); -+ globals.byte_io_size = min(file_size, globals.byte_io_size); -+ globals.byte_io_size = max(0, globals.byte_io_size); + globals.byte_io_size = min(file_size, globals.byte_io_size); + globals.byte_io_size = max(0, globals.byte_io_size); - if(machine == NULL) - { -@@ -465,14 +452,6 @@ int main(int argc, char *argv[]) +@@ -465,14 +452,6 @@ && (directory_max_size < directory_min_size || directory_max_size < 0 || directory_min_size < 0) ) usage(); -#ifndef _LARGEFILE64_SOURCE - if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) ) - { - fprintf(stderr - , "The small chunk size and large IO size make this test impossible in 32bit.\n"); - usage(); - } -#endif if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) { fprintf(stderr Index: head/benchmarks/bonnie++/files/patch-duration.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-duration.cpp (revision 424233) +++ head/benchmarks/bonnie++/files/patch-duration.cpp (revision 424234) @@ -1,26 +1,17 @@ ---- duration.cpp.orig 2008-12-23 22:26:42 UTC -+++ duration.cpp +--- duration.cpp.orig 2016-06-30 09:41:58.000000000 +0000 ++++ duration.cpp 2016-10-18 20:09:09.173611133 +0000 @@ -1,5 +1,3 @@ -using namespace std; - #include #include "duration.h" -@@ -20,6 +18,8 @@ using namespace std; +@@ -20,6 +18,8 @@ #endif #endif +using namespace std; + Duration_Base::Duration_Base() : m_start(0.0) , m_max(0.0) -@@ -38,7 +38,7 @@ double Duration_Base::stop() - getTime(&tv); - double ret; - ret = tv - m_start; -- m_max = __max(m_max, ret); -+ m_max = max(m_max, ret); - return ret; - } - Index: head/benchmarks/bonnie++/files/patch-port.h.in =================================================================== --- head/benchmarks/bonnie++/files/patch-port.h.in (revision 424233) +++ head/benchmarks/bonnie++/files/patch-port.h.in (revision 424234) @@ -1,44 +1,18 @@ ---- port.h.in.orig 2008-12-24 00:16:16 UTC -+++ port.h.in -@@ -4,12 +4,12 @@ - #include "conf.h" - - #ifndef HAVE_MIN_MAX --#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO) --#ifdef HAVE_ALGO -+#if defined(HAVE_ALGORITHM) -+#include -+#elif defined(HAVE_ALGO) - #include --#else -+#elif defined(HAVE_ALGO_H) - #include --#endif - #else - #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY)) - #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY)) -@@ -19,14 +19,7 @@ +--- port.h.in.orig 2016-10-18 19:58:02.629657140 +0000 ++++ port.h.in 2016-10-18 20:02:26.501248353 +0000 +@@ -6,14 +6,7 @@ @semun@ @bool@ @snprintf@ -#ifndef _LARGEFILE64_SOURCE -@large_file@ -#endif -#ifdef _LARGEFILE64_SOURCE -#define OFF_T_PRINTF "%lld" -#else -#define OFF_T_PRINTF "%d" -#endif +#define OFF_T_PRINTF "%ld" #if @true_false@ #define false 0 -@@ -49,8 +42,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; Index: head/benchmarks/bonnie++/files/patch-rand.h =================================================================== --- head/benchmarks/bonnie++/files/patch-rand.h (revision 424233) +++ head/benchmarks/bonnie++/files/patch-rand.h (revision 424234) @@ -1,15 +1,15 @@ ---- rand.h.orig 2003-01-08 19:52:53 UTC -+++ rand.h +--- rand.h.orig 2016-06-30 09:38:55.000000000 +0000 ++++ rand.h 2016-10-18 20:04:31.159630423 +0000 @@ -1,11 +1,11 @@ #ifndef RAND_H #define RAND_H -using namespace std; #include "port.h" + #include #include #include - #include +using namespace std; class Rand {