The following changes since commit c9c20f05373375d029f63225aea86fe6e3829e96:
Fio 1.41.4 (2010-06-24 10:39:02 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (4):
Documentation update
Revert "fix 1000 vs kb_base confusion in show_run_stats."
Merge branch 'master' of ssh://router/data/git/fio
Fio 1.41.5
HOWTO | 4 +++-
fio.1 | 4 +++-
init.c | 2 +-
stat.c | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
---
Diff of recent changes:
diff --git a/HOWTO b/HOWTO
index 7db02b1..b284c42 100644
--- a/HOWTO
+++ b/HOWTO
@@ -346,7 +346,9 @@ size=int The total size of file io for this job. Fio will run until
limited by other options (such as 'runtime', for instance).
Unless specific nrfiles and filesize options are given,
fio will divide this size between the available files
- specified by the job.
+ specified by the job. If not set, fio will use the full
+ size of the given files or devices. If the the files
+ do not exist, size must be given.
filesize=int Individual file sizes. May be a range, in which case fio
will select sizes for files at random within the given range
diff --git a/fio.1 b/fio.1
index cabff41..190da4f 100644
--- a/fio.1
+++ b/fio.1
@@ -199,7 +199,9 @@ are likely to be issued. Default: true.
Total size of I/O for this job. \fBfio\fR will run until this many bytes have
been transfered, unless limited by other options (\fBruntime\fR, for instance).
Unless \fBnr_files\fR and \fBfilesize\fR options are given, this amount will be
-divided between the available files for the job.
+divided between the available files for the job. If not set, fio will use the
+full size of the given files or devices. If the the files do not exist, size
+must be given.
.TP
.BI fill_device \fR=\fPbool
Sets size to something really large and waits for ENOSPC (no space left on
diff --git a/init.c b/init.c
index fb02b3f..d5b59b2 100644
--- a/init.c
+++ b/init.c
@@ -21,7 +21,7 @@
#include "verify.h"
#include "profile.h"
-static char fio_version_string[] = "fio 1.41.4";
+static char fio_version_string[] = "fio 1.41.5";
#define FIO_RANDSEED (0xb1899bedUL)
diff --git a/stat.c b/stat.c
index 0f259d2..a79c7ef 100644
--- a/stat.c
+++ b/stat.c
@@ -658,9 +658,9 @@ void show_run_stats(void)
max_run[1] = rs->max_run[1];
if (rs->max_run[0])
- rs->agg[0] = (rs->io_kb[0] * rs->kb_base) / max_run[0];
+ rs->agg[0] = (rs->io_kb[0] * 1000) / max_run[0];
if (rs->max_run[1])
- rs->agg[1] = (rs->io_kb[1] * rs->kb_base) / max_run[1];
+ rs->agg[1] = (rs->io_kb[1] * 1000) / max_run[1];
}
/*
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
