The following changes since commit 83881283564820dabaa07c1bdea0e75e686efcaa:
Update command line usage help (2011-10-17 19:58:51 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (2):
Fix printf() being used instead of log_info()
Fix OSX build
Jens Axboe (4):
Fix error in disk util stats for terse output
Fix klibc getopt_long_only() for optional arguments
Turn old debug printf() into a proper log_err()
Fio 1.99.9
HOWTO | 3 +--
diskutil.c | 2 +-
fio.c | 4 ++--
fio_version.h | 2 +-
lib/getopt_long.c | 11 ++++++++++-
os/os.h | 1 +
os/windows/install.wxs | 2 +-
os/windows/version.h | 2 +-
8 files changed, 18 insertions(+), 9 deletions(-)
---
Diff of recent changes:
diff --git a/HOWTO b/HOWTO
index 34c3505..ef8f959 100644
--- a/HOWTO
+++ b/HOWTO
@@ -1382,8 +1382,7 @@ Split up, the format is as follows:
Disk utilization: Disk name, Read ios, write ios,
Read merges, write merges,
Read ticks, write ticks,
- Read in-queue time, write in-queue time,
- Disk utilization percentage
+ Time spent in queue, disk utilization percentage
Additional Info (dependant on continue_on_error, default off): total # errors, first error code
Additional Info (dependant on description being set): Text description
diff --git a/diskutil.c b/diskutil.c
index 24e1782..3168b59 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -550,7 +550,7 @@ void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
dus->ticks[0], dus->ticks[1],
dus->time_in_queue, util);
} else {
- log_info(";%s;%u;%u;%u;%u;%lu;%lu;%u;%u;%u;%u;%3.2f%%",
+ log_info(";%s;%u;%u;%u;%u;%u;%u;%u;%3.2f%%",
dus->name, dus->ios[0], dus->ios[1],
dus->merges[0], dus->merges[1],
dus->ticks[0], dus->ticks[1],
diff --git a/fio.c b/fio.c
index 3a53794..c18df12 100644
--- a/fio.c
+++ b/fio.c
@@ -833,7 +833,7 @@ sync_done:
}
if (td->trim_entries)
- printf("trim entries %ld\n", td->trim_entries);
+ log_err("fio: %d trim entries leaked?\n", td->trim_entries);
if (td->o.fill_device && td->error == ENOSPC) {
td->error = 0;
@@ -1560,7 +1560,7 @@ static void run_threads(void)
nr_thread > 1 ? "s" : "");
if (nr_process) {
if (nr_thread)
- printf(" and ");
+ log_info(" and ");
log_info("%d process%s", nr_process,
nr_process > 1 ? "es" : "");
}
diff --git a/fio_version.h b/fio_version.h
index d98e5e9..b374014 100644
--- a/fio_version.h
+++ b/fio_version.h
@@ -3,6 +3,6 @@
#define FIO_MAJOR 1
#define FIO_MINOR 99
-#define FIO_PATCH 8
+#define FIO_PATCH 9
#endif
diff --git a/lib/getopt_long.c b/lib/getopt_long.c
index 6e8abc0..70894e3 100644
--- a/lib/getopt_long.c
+++ b/lib/getopt_long.c
@@ -126,7 +126,16 @@ int getopt_long_only(int argc, char *const *argv, const char *optstring,
} else {
/* Argument-taking option with non-attached
argument */
- if (argv[optind + 1]) {
+ if (osptr[2] == ':') {
+ if (argv[optind + 1]) {
+ optarg = (char *)argv[optind+1];
+ optind += 2;
+ } else {
+ optarg = NULL;
+ optind++;
+ }
+ return opt;
+ } else if (argv[optind + 1]) {
optarg = (char *)argv[optind+1];
optind += 2;
} else {
diff --git a/os/os.h b/os/os.h
index 1218815..d6ce9a7 100644
--- a/os/os.h
+++ b/os/os.h
@@ -2,6 +2,7 @@
#define FIO_OS_H
#include <sys/types.h>
+#include <sys/socket.h>
#include <pthread.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 2c87d47..a95fe37 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -3,7 +3,7 @@
<?define VersionMajor = 1?>
<?define VersionMinor = 99?>
-<?define VersionBuild = 8?>
+<?define VersionBuild = 9?>
<Product Id="*"
Codepage="1252" Language="1033"
diff --git a/os/windows/version.h b/os/windows/version.h
index db181a1..57cecb3 100644
--- a/os/windows/version.h
+++ b/os/windows/version.h
@@ -3,4 +3,4 @@
#define FIO_VERSION_MAJOR FIO_MAJOR
#define FIO_VERSION_MINOR FIO_MINOR
#define FIO_VERSION_BUILD FIO_PATCH
-#define FIO_VERSION_STRING "1.99.8"
+#define FIO_VERSION_STRING "1.99.9"
--
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
