Date: Thu, 5 Sep 2019 20:16:57 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511264 - in head/benchmarks/bonnie++: . files Message-ID: <201909052016.x85KGvtq024801@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Thu Sep 5 20:16:56 2019 New Revision: 511264 URL: https://svnweb.freebsd.org/changeset/ports/511264 Log: Update to 1.98 and fix type conversion warnings PR: 210855 Submitted by: Mark Millard <marklmi26-fbsd@yahoo.com> Reviewed by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at> Added: head/benchmarks/bonnie++/files/patch-bon_time.cpp (contents, props changed) head/benchmarks/bonnie++/files/patch-getc_putc.cpp (contents, props changed) head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp (contents, props changed) Modified: head/benchmarks/bonnie++/Makefile head/benchmarks/bonnie++/distinfo head/benchmarks/bonnie++/files/patch-bonnie++.cpp Modified: head/benchmarks/bonnie++/Makefile ============================================================================== --- head/benchmarks/bonnie++/Makefile Thu Sep 5 20:11:51 2019 (r511263) +++ head/benchmarks/bonnie++/Makefile Thu Sep 5 20:16:56 2019 (r511264) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bonnie++ -PORTVERSION= 1.97.3 +PORTVERSION= 1.98 CATEGORIES= benchmarks MASTER_SITES= https://www.coker.com.au/bonnie++/ @@ -11,9 +11,9 @@ 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 Modified: head/benchmarks/bonnie++/distinfo ============================================================================== --- head/benchmarks/bonnie++/distinfo Thu Sep 5 20:11:51 2019 (r511263) +++ head/benchmarks/bonnie++/distinfo Thu Sep 5 20:16:56 2019 (r511264) @@ -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 Added: head/benchmarks/bonnie++/files/patch-bon_time.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/bonnie++/files/patch-bon_time.cpp Thu Sep 5 20:16:56 2019 (r511264) @@ -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 Modified: head/benchmarks/bonnie++/files/patch-bonnie++.cpp ============================================================================== --- head/benchmarks/bonnie++/files/patch-bonnie++.cpp Thu Sep 5 20:11:51 2019 (r511263) +++ head/benchmarks/bonnie++/files/patch-bonnie++.cpp Thu Sep 5 20:16:56 2019 (r511264) @@ -1,6 +1,6 @@ ---- 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, ":"); @@ -9,10 +9,10 @@ -#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); } @@ -28,7 +28,7 @@ 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(); Added: head/benchmarks/bonnie++/files/patch-getc_putc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/bonnie++/files/patch-getc_putc.cpp Thu Sep 5 20:16:56 2019 (r511264) @@ -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"); Added: head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp Thu Sep 5 20:16:56 2019 (r511264) @@ -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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909052016.x85KGvtq024801>