The following changes since commit bbcacb72ac5f81b77a96981e6d00d9134360e7c5: parse: warn if option is missing a long option variant (2016-05-23 10:39:16 -0600) are available in the git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 97e1fe78db572a48a44c2a8511f8393a8643fc28: Fio 2.11 (2016-05-24 18:42:04 -0600) ---------------------------------------------------------------- Jens Axboe (2): backend: regrow logs for sync IO engines as well Fio 2.11 Mark Nelson (1): remove numpy and scipy dependency Martin Steigerwald (5): Spelling fix. Reported by Debian��s lintian. Spelling fix. Reported by Debian��s lintian. Spelling fix. Reported by Debian��s lintian. Spelling fix. Spelling fix. Reported by Debian��s lintian. FIO-VERSION-GEN | 2 +- backend.c | 3 +++ fio.1 | 2 +- gettime-thread.c | 2 +- idletime.c | 2 +- memory.c | 2 +- options.c | 2 +- os/windows/install.wxs | 2 +- tools/fiologparser.py | 35 ++++++++++++++++++++--------------- 9 files changed, 30 insertions(+), 22 deletions(-) --- Diff of recent changes: diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN index d1ba7ca..ea65ea8 100755 --- a/FIO-VERSION-GEN +++ b/FIO-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-2.10 +DEF_VER=fio-2.11 LF=' ' diff --git a/backend.c b/backend.c index 6d50360..f132222 100644 --- a/backend.c +++ b/backend.c @@ -524,6 +524,9 @@ sync_done: break; } + if (td->flags & TD_F_REGROW_LOGS) + regrow_logs(td); + /* * when doing I/O (not when verifying), * check for any errors that are to be ignored diff --git a/fio.1 b/fio.1 index 839a359..f521c9d 100644 --- a/fio.1 +++ b/fio.1 @@ -2087,7 +2087,7 @@ This format is not supported in Fio versions => 1.20-rc3. .B Trace file format v2 .RS The second version of the trace file format was added in Fio version 1.17. -It allows to access more then one file per trace and has a bigger set of +It allows one to access more then one file per trace and has a bigger set of possible file actions. The first line of the trace file has to be: diff --git a/gettime-thread.c b/gettime-thread.c index 9bf85f0..6dc1486 100644 --- a/gettime-thread.c +++ b/gettime-thread.c @@ -81,7 +81,7 @@ int fio_start_gtod_thread(void) ret = pthread_detach(gtod_thread); if (ret) { - log_err("Can't detatch gtod thread: %s\n", strerror(ret)); + log_err("Can't detach gtod thread: %s\n", strerror(ret)); goto err; } diff --git a/idletime.c b/idletime.c index fab43c5..4c00d80 100644 --- a/idletime.c +++ b/idletime.c @@ -260,7 +260,7 @@ void fio_idle_prof_init(void) if ((ret = pthread_detach(ipt->thread))) { /* log error and let the thread spin */ - log_err("fio: pthread_detatch %s\n", strerror(ret)); + log_err("fio: pthread_detach %s\n", strerror(ret)); } } diff --git a/memory.c b/memory.c index c04d7df..af4d5ef 100644 --- a/memory.c +++ b/memory.c @@ -89,7 +89,7 @@ static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem) " support huge pages.\n"); } else if (errno == ENOMEM) { log_err("fio: no huge pages available, do you" - " need to alocate some? See HOWTO.\n"); + " need to allocate some? See HOWTO.\n"); } } diff --git a/options.c b/options.c index 7f0f2c0..3360784 100644 --- a/options.c +++ b/options.c @@ -2023,7 +2023,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { }, { .ival = "normal", .oval = FIO_RAND_DIST_GAUSS, - .help = "Normal (gaussian) distribution", + .help = "Normal (Gaussian) distribution", }, { .ival = "zoned", .oval = FIO_RAND_DIST_ZONED, diff --git a/os/windows/install.wxs b/os/windows/install.wxs index 8ae1394..45084e6 100755 --- a/os/windows/install.wxs +++ b/os/windows/install.wxs @@ -10,7 +10,7 @@ + UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.11">