forked from Lainports/freebsd-ports
7b769dc632
PR: 210855 Submitted by: Mark Millard <marklmi26-fbsd@yahoo.com> Reviewed by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
45 lines
1.3 KiB
C++
45 lines
1.3 KiB
C++
--- 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
|
|
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);
|
|
}
|
|
-#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);
|
|
|
|
@@ -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
|