Index: head/benchmarks/bonnie++/Makefile =================================================================== --- head/benchmarks/bonnie++/Makefile (revision 511263) +++ head/benchmarks/bonnie++/Makefile (revision 511264) @@ -1,31 +1,31 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= bonnie++ -PORTVERSION= 1.97.3 +PORTVERSION= 1.98 CATEGORIES= benchmarks MASTER_SITES= https://www.coker.com.au/bonnie++/ MAINTAINER= martymac@FreeBSD.org COMMENT= Performance Test of Filesystem I/O LICENSE= GPLv2 -GNU_CONFIGURE= yes - USES= shebangfix tar:tgz + +GNU_CONFIGURE= yes SHEBANG_FILES= bon_csv2txt.in 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 511263) +++ head/benchmarks/bonnie++/distinfo (revision 511264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482419750 -SHA256 (bonnie++-1.97.3.tgz) = e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e -SIZE (bonnie++-1.97.3.tgz) = 100166 +TIMESTAMP = 1567440456 +SHA256 (bonnie++-1.98.tgz) = 6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04 +SIZE (bonnie++-1.98.tgz) = 100339 Index: head/benchmarks/bonnie++/files/patch-bon_time.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-bon_time.cpp (nonexistent) +++ head/benchmarks/bonnie++/files/patch-bon_time.cpp (revision 511264) @@ -0,0 +1,11 @@ +--- bon_time.cpp.orig 2019-09-02 11:43:11 UTC ++++ bon_time.cpp +@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i + } + else + { +- fprintf(m_fp, " %5d", stat); ++ fprintf(m_fp, " %5f", stat); + } + } + else Property changes on: head/benchmarks/bonnie++/files/patch-bon_time.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/bonnie++/files/patch-bonnie++.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 511263) +++ head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 511264) @@ -1,45 +1,45 @@ ---- 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 @@ +--- bonnie++.cpp.orig 2019-09-02 18:10:39.852145000 +0200 ++++ bonnie++.cpp 2019-09-02 18:12:18.027222000 +0200 +@@ -298,11 +298,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) + char * chunk_size = strtok(NULL, ":"); + if(chunk_size) { -@@ -384,15 +380,6 @@ +@@ -398,15 +394,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); -@@ -465,14 +452,6 @@ +@@ -479,14 +466,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-getc_putc.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-getc_putc.cpp (nonexistent) +++ head/benchmarks/bonnie++/files/patch-getc_putc.cpp (revision 511264) @@ -0,0 +1,20 @@ +--- getc_putc.cpp.orig 2018-09-15 09:00:31.000000000 +0200 ++++ getc_putc.cpp 2019-09-05 12:09:25.705704000 +0200 +@@ -206,7 +206,7 @@ + return 1; + } + fflush(NULL); +- TEST_FUNC_READ("getc()", if( (c = getc(fp)) == EOF), res[Getc]); ++ TEST_FUNC_READ("getc()", int tmp = getc(fp); c = (char)tmp; if (tmp == EOF), res[Getc]); + if(fseek(fp, 0, SEEK_SET) != 0) + { + fprintf(stderr, "Can't seek.\n"); +@@ -221,7 +221,7 @@ + return 1; + } + fflush(NULL); +- TEST_FUNC_READ("getc_unlocked()", if( (c = getc_unlocked(fp)) == EOF), res[GetcUnlocked]); ++ TEST_FUNC_READ("getc_unlocked()", int tmp = getc_unlocked(fp); c = (char)tmp; if (tmp == EOF), res[GetcUnlocked]); + + if(!quiet) + printf("done\n"); Property changes on: head/benchmarks/bonnie++/files/patch-getc_putc.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp (nonexistent) +++ head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp (revision 511264) @@ -0,0 +1,11 @@ +--- getc_putc_helper.cpp.orig 2009-07-03 04:26:05.000000000 +0200 ++++ getc_putc_helper.cpp 2019-09-05 12:09:25.707876000 +0200 +@@ -45,7 +45,7 @@ + return 1; + } + fflush(NULL); +- TEST_FUNC_READ("getc() no thread", if( (c = getc(fp)) == EOF), res[1]); ++ TEST_FUNC_READ("getc() no thread", int tmp = getc(fp); c = (char)tmp; if (tmp == EOF), res[1]); + if(fseek(fp, 0, SEEK_SET) != 0) + { + fprintf(stderr, "Can't seek.\n"); Property changes on: head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property