Attachment 207210 Details for Bug 210855 – Patch v4

[patch] Patch v4

patch-bonnie++.txt (text/plain), 4.78 KB, created by Ganael LAPLANCHE on 2019-09-05 10:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2019-09-05 10:17:18 UTC

Size: 4.78 KB

patch

obsolete

>diff -aurN benchmarks/bonnie++.orig/Makefile benchmarks/bonnie++/Makefile
>--- benchmarks/bonnie++.orig/Makefile	2017-10-13 10:09:19.477850000 +0200
>+++ benchmarks/bonnie++/Makefile	2019-09-03 19:42:27.841307000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/benchmarks/bonnie++/Makefile 451953 2017-10-13 08:09:19Z bapt $
> 
> PORTNAME=	bonnie++
>-PORTVERSION=	1.97.3
>+PORTVERSION=	1.98
> CATEGORIES=	benchmarks
> MASTER_SITES=	https://www.coker.com.au/bonnie++/
> 
>@@ -11,9 +11,9 @@
> 
> LICENSE=	GPLv2
> 
>-GNU_CONFIGURE=	yes
>-
> USES=	shebangfix tar:tgz
>+
>+GNU_CONFIGURE=	yes
> SHEBANG_FILES=	bon_csv2txt.in
> 
> PORTDOCS=	readme.html
>diff -aurN benchmarks/bonnie++.orig/distinfo benchmarks/bonnie++/distinfo
>--- benchmarks/bonnie++.orig/distinfo	2016-12-22 16:49:11.694660000 +0100
>+++ benchmarks/bonnie++/distinfo	2019-09-03 19:48:56.442230000 +0200
>@@ -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
>diff -aurN benchmarks/bonnie++.orig/files/patch-bon_time.cpp benchmarks/bonnie++/files/patch-bon_time.cpp
>--- benchmarks/bonnie++.orig/files/patch-bon_time.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ benchmarks/bonnie++/files/patch-bon_time.cpp	2019-09-03 19:42:30.493263000 +0200
>@@ -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
>diff -aurN benchmarks/bonnie++.orig/files/patch-bonnie++.cpp benchmarks/bonnie++/files/patch-bonnie++.cpp
>--- benchmarks/bonnie++.orig/files/patch-bonnie++.cpp	2016-10-19 12:20:01.776094000 +0200
>+++ benchmarks/bonnie++/files/patch-bonnie++.cpp	2019-09-03 19:47:31.470703000 +0200
>@@ -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();
>diff -aurN benchmarks/bonnie++.orig/files/patch-getc_putc.cpp benchmarks/bonnie++/files/patch-getc_putc.cpp
>--- benchmarks/bonnie++.orig/files/patch-getc_putc.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ benchmarks/bonnie++/files/patch-getc_putc.cpp	2019-09-05 12:10:46.376623000 +0200
>@@ -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");
>diff -aurN benchmarks/bonnie++.orig/files/patch-getc_putc_helper.cpp benchmarks/bonnie++/files/patch-getc_putc_helper.cpp
>--- benchmarks/bonnie++.orig/files/patch-getc_putc_helper.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ benchmarks/bonnie++/files/patch-getc_putc_helper.cpp	2019-09-05 12:10:15.040748000 +0200
>@@ -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");

Actions: View | Diff

Attachments on bug 210855: 207097 | 207131 | 207156 | 207172 | 207173 | 207198 | 207210