The following changes since commit e2ea5c7407e37c9ea986df75fbf74fd60874b87b:
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio (2012-05-02 14:29:21 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (1):
Fix terse bandwidth
Martin Steigerwald (3):
Fix spelling error in manpage.
Fix manpage error warning: macro `hostname'' not defined.
Fix hyphen as minus sign errors by escaping minus signs.
fio.1 | 26 +++++++++++++-------------
stat.c | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
---
Diff of recent changes:
diff --git a/fio.1 b/fio.1
index 7997526..5b61e43 100644
--- a/fio.1
+++ b/fio.1
@@ -70,7 +70,7 @@ Set the internal smalloc pool size to \fIkb\fP kilobytes.
All fio parser warnings are fatal, causing fio to exit with an error.
.TP
.BI \-\-max\-jobs \fR=\fPnr
-Set the maximum allowed number of jobs (threads/processes) to suport.
+Set the maximum allowed number of jobs (threads/processes) to support.
.TP
.BI \-\-server \fR=\fPargs
Start a backend server, with \fIargs\fP specifying what to listen to. See client/server section.
@@ -1318,46 +1318,46 @@ To start the server, you would do:
on that machine, where args defines what fio listens to. The arguments
are of the form 'type:hostname or IP:port'. 'type' is either 'ip' (or ip4)
-for TCP/IP v4, 'ip6' for TCP/IP v6, or 'sock' for a local unix domain socket.
-'hostname' is either a hostname or IP address, and 'port' is the port to
+for TCP/IP v4, 'ip6' for TCP/IP v6, or 'sock' for a local unix domain
+socket. 'hostname' is either a hostname or IP address, and 'port' is the port to
listen to (only valid for TCP/IP, not a local socket). Some examples:
-1) fio --server
+1) fio \-\-server
Start a fio server, listening on all interfaces on the default port (8765).
-2) fio --server=ip:hostname,4444
+2) fio \-\-server=ip:hostname,4444
Start a fio server, listening on IP belonging to hostname and on port 4444.
-3) fio --server=ip6:::1,4444
+3) fio \-\-server=ip6:::1,4444
Start a fio server, listening on IPv6 localhost ::1 and on port 4444.
-4) fio --server=,4444
+4) fio \-\-server=,4444
Start a fio server, listening on all interfaces on port 4444.
-5) fio --server=1.2.3.4
+5) fio \-\-server=1.2.3.4
Start a fio server, listening on IP 1.2.3.4 on the default port.
-6) fio --server=sock:/tmp/fio.sock
+6) fio \-\-server=sock:/tmp/fio.sock
Start a fio server, listening on the local socket /tmp/fio.sock.
When a server is running, you can connect to it from a client. The client
is run with:
-fio --local-args --client=server --remote-args <job file(s)>
+fio \-\-local-args \-\-client=server \-\-remote-args <job file(s)>
-where --local-args are arguments that are local to the client where it is
-running, 'server' is the connect string, and --remote-args and <job file(s)>
+where \-\-local-args are arguments that are local to the client where it is
+running, 'server' is the connect string, and \-\-remote-args and <job file(s)>
are sent to the server. The 'server' string follows the same format as it
does on the server side, to allow IP/hostname/socket and port strings.
You can connect to multiple clients as well, to do that you could run:
-fio --client=server2 --client=server2 <job file(s)>
+fio \-\-client=server2 \-\-client=server2 <job file(s)>
.SH AUTHORS
.B fio
diff --git a/stat.c b/stat.c
index 542e910..8c846f6 100644
--- a/stat.c
+++ b/stat.c
@@ -613,7 +613,7 @@ static void show_ddir_status_terse(struct thread_stat *ts,
if (ts->runtime[ddir]) {
uint64_t runt = ts->runtime[ddir];
- bw = ts->io_bytes[ddir] / runt;
+ bw = ((1000 * ts->io_bytes[ddir]) / runt) / 1024;
iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt;
}
--
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
