Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 320051 | Differences between
and this patch

Collapse All | Expand All

(-)bonnie++.cpp.orig (-21 lines)
Lines 322-332 Link Here
322
      {
322
      {
323
        char *sbuf = _strdup(optarg);
323
        char *sbuf = _strdup(optarg);
324
        char *size = strtok(sbuf, ":");
324
        char *size = strtok(sbuf, ":");
325
#ifdef _LARGEFILE64_SOURCE
326
        file_size = size_from_str(size, "gt");
325
        file_size = size_from_str(size, "gt");
327
#else
328
        file_size = size_from_str(size, "g");
329
#endif
330
        size = strtok(NULL, "");
326
        size = strtok(NULL, "");
331
        if(size)
327
        if(size)
332
        {
328
        {
Lines 411-425 Link Here
411
    if(file_size % 1024 > 512)
407
    if(file_size % 1024 > 512)
412
      file_size = file_size + 1024 - (file_size % 1024);
408
      file_size = file_size + 1024 - (file_size % 1024);
413
  }
409
  }
414
#ifndef _LARGEFILE64_SOURCE
415
  if(file_size == 2048)
416
    file_size = 2047;
417
  if(file_size > 2048)
418
  {
419
    fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
420
    usage();
421
  }
422
#endif
423
  globals.byte_io_size = __min(file_size, globals.byte_io_size);
410
  globals.byte_io_size = __min(file_size, globals.byte_io_size);
424
  globals.byte_io_size = __max(0, globals.byte_io_size);
411
  globals.byte_io_size = __max(0, globals.byte_io_size);
425
412
Lines 503-516 Link Here
503
     && (directory_max_size < directory_min_size || directory_max_size < 0
490
     && (directory_max_size < directory_min_size || directory_max_size < 0
504
     || directory_min_size < 0) )
491
     || directory_min_size < 0) )
505
    usage();
492
    usage();
506
#ifndef _LARGEFILE64_SOURCE
507
  if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
508
  {
509
    fprintf(stderr
510
   , "The small chunk size and large IO size make this test impossible in 32bit.\n");
511
    usage();
512
  }
513
#endif
514
  if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
493
  if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
515
  {
494
  {
516
    fprintf(stderr
495
    fprintf(stderr

Return to bug 320051