Attachment #207210 for bug #210855




# $FreeBSD: head/benchmarks/bonnie++/Makefile 451953 2017-10-13 08:09:19Z bapt $

PORTNAME=	bonnie++
PORTVERSION=	1.98
CATEGORIES=	benchmarks
MASTER_SITES=	https://www.coker.com.au/bonnie++/



LICENSE=	GPLv2

GNU_CONFIGURE=	yes

USES=	shebangfix tar:tgz

GNU_CONFIGURE=	yes
SHEBANG_FILES=	bon_csv2txt.in

PORTDOCS=	readme.html

Lines 1-3 Link Here

(-)benchmarks/bonnie++/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482419750	1	TIMESTAMP = 1567440456
2	SHA256 (bonnie++-1.97.3.tgz) = e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e	2	SHA256 (bonnie++-1.98.tgz) = 6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04
3	SIZE (bonnie++-1.97.3.tgz) = 100166	3	SIZE (bonnie++-1.98.tgz) = 100339

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-bon_time.cpp (+11 lines)
	1	--- bon_time.cpp.orig 2019-09-02 11:43:11 UTC
	2	+++ bon_time.cpp
	3	@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i
	4	}
	5	else
	6	{
	7	- fprintf(m_fp, " %5d", stat);
	8	+ fprintf(m_fp, " %5f", stat);
	9	}
	10	}
	11	else




--- 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, ":");

-#else
-        file_size = size_from_str(size, "g");
-#endif
         char * chunk_size = strtok(NULL, ":");
         if(chunk_size)
         {
@@ -398,15 +394,6 @@
     if(file_size % 1024 > 512)
       file_size = file_size + 1024 - (file_size % 1024);
   }

   globals.byte_io_size = min(file_size, globals.byte_io_size);
   globals.byte_io_size = max(0, globals.byte_io_size);
 
@@ -479,14 +466,6 @@
      && (directory_max_size < directory_min_size || directory_max_size < 0
      || directory_min_size < 0) )
     usage();




--- 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");

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-getc_putc_helper.cpp (+11 lines)
	1	--- getc_putc_helper.cpp.orig 2009-07-03 04:26:05.000000000 +0200
	2	+++ getc_putc_helper.cpp 2019-09-05 12:09:25.707876000 +0200
	3	@@ -45,7 +45,7 @@
	4	return 1;
	5	}
	6	fflush(NULL);
	7	- TEST_FUNC_READ("getc() no thread", if( (c = getc(fp)) == EOF), res[1]);
	8	+ TEST_FUNC_READ("getc() no thread", int tmp = getc(fp); c = (char)tmp; if (tmp == EOF), res[1]);
	9	if(fseek(fp, 0, SEEK_SET) != 0)
	10	{
	11	fprintf(stderr, "Can't seek.\n");

Return to bug 210855

Lines 2-8 Link Here

(-)benchmarks/bonnie++/Makefile (-3 / +3 lines)
2	# $FreeBSD: head/benchmarks/bonnie++/Makefile 451953 2017-10-13 08:09:19Z bapt $	2	# $FreeBSD: head/benchmarks/bonnie++/Makefile 451953 2017-10-13 08:09:19Z bapt $
3		3
4	PORTNAME= bonnie++	4	PORTNAME= bonnie++
5	PORTVERSION= 1.97.3	5	PORTVERSION= 1.98
6	CATEGORIES= benchmarks	6	CATEGORIES= benchmarks
7	MASTER_SITES= https://www.coker.com.au/bonnie++/	7	MASTER_SITES= https://www.coker.com.au/bonnie++/
8		8
Lines 11-19 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	GNU_CONFIGURE= yes
15
16	USES= shebangfix tar:tgz	14	USES= shebangfix tar:tgz
		15
		16	GNU_CONFIGURE= yes
17	SHEBANG_FILES= bon_csv2txt.in	17	SHEBANG_FILES= bon_csv2txt.in
18		18
19	PORTDOCS= readme.html	19	PORTDOCS= readme.html

Lines 1-6 Link Here

(-)benchmarks/bonnie++/files/patch-bonnie++.cpp (-7 / +7 lines)
1	--- bonnie++.cpp.orig 2016-06-30 09:41:41.000000000 +0000	1	--- bonnie++.cpp.orig 2019-09-02 18:10:39.852145000 +0200
2	+++ bonnie++.cpp 2016-10-18 19:52:40.381679719 +0000	2	+++ bonnie++.cpp 2019-09-02 18:12:18.027222000 +0200
3	@@ -294,11 +294,7 @@	3	@@ -298,11 +298,7 @@
4	{	4	{
5	char *sbuf = _strdup(optarg);	5	char *sbuf = _strdup(optarg);
6	char *size = strtok(sbuf, ":");	6	char *size = strtok(sbuf, ":");
Lines 9-18 Link Here
9	-#else	9	-#else
10	- file_size = size_from_str(size, "g");	10	- file_size = size_from_str(size, "g");
11	-#endif	11	-#endif
12	size = strtok(NULL, "");	12	char * chunk_size = strtok(NULL, ":");
13	if(size)	13	if(chunk_size)
14	{	14	{
15	@@ -384,15 +380,6 @@	15	@@ -398,15 +394,6 @@
16	if(file_size % 1024 > 512)	16	if(file_size % 1024 > 512)
17	file_size = file_size + 1024 - (file_size % 1024);	17	file_size = file_size + 1024 - (file_size % 1024);
18	}	18	}
Lines 28-34 Link Here
28	globals.byte_io_size = min(file_size, globals.byte_io_size);	28	globals.byte_io_size = min(file_size, globals.byte_io_size);
29	globals.byte_io_size = max(0, globals.byte_io_size);	29	globals.byte_io_size = max(0, globals.byte_io_size);
30		30
31	@@ -465,14 +452,6 @@	31	@@ -479,14 +466,6 @@
32	&& (directory_max_size < directory_min_size \|\| directory_max_size < 0	32	&& (directory_max_size < directory_min_size \|\| directory_max_size < 0
33	\|\| directory_min_size < 0) )	33	\|\| directory_min_size < 0) )
34	usage();	34	usage();

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-getc_putc.cpp (+20 lines)
	1	--- getc_putc.cpp.orig 2018-09-15 09:00:31.000000000 +0200
	2	+++ getc_putc.cpp 2019-09-05 12:09:25.705704000 +0200
	3	@@ -206,7 +206,7 @@
	4	return 1;
	5	}
	6	fflush(NULL);
	7	- TEST_FUNC_READ("getc()", if( (c = getc(fp)) == EOF), res[Getc]);
	8	+ TEST_FUNC_READ("getc()", int tmp = getc(fp); c = (char)tmp; if (tmp == EOF), res[Getc]);
	9	if(fseek(fp, 0, SEEK_SET) != 0)
	10	{
	11	fprintf(stderr, "Can't seek.\n");
	12	@@ -221,7 +221,7 @@
	13	return 1;
	14	}
	15	fflush(NULL);
	16	- TEST_FUNC_READ("getc_unlocked()", if( (c = getc_unlocked(fp)) == EOF), res[GetcUnlocked]);
	17	+ TEST_FUNC_READ("getc_unlocked()", int tmp = getc_unlocked(fp); c = (char)tmp; if (tmp == EOF), res[GetcUnlocked]);
	18
	19	if(!quiet)
	20	printf("done\n");