Jens Axboe [Wed, 1 May 2013 11:00:26 +0000 (13:00 +0200)]
configure: remove argument for --build-32bit-win
It's an enable type option, just remove the argument.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bruce Cran [Sun, 28 Apr 2013 15:34:15 +0000 (17:34 +0200)]
Add support for dumping the status on Windows.
Windows uses a per-user temporary directory, with the path stored in the TEMP
environment variable. Update check_status_file to check both the Unix TMPDIR
and Windows TEMP variables before falling back to /tmp.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Sat, 27 Apr 2013 21:51:25 +0000 (15:51 -0600)]
Add distclean target
And only clean cscope.out output when doing that. I'm getting
tired of having to re-do cscope for no real reason.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Sat, 27 Apr 2013 02:24:59 +0000 (20:24 -0600)]
Move __NR_shm* syscall numbers to x86-64 where they belong
The definitions are only correct for 64-bit Linux, not for 32-bit.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 26 Apr 2013 23:05:57 +0000 (17:05 -0600)]
Ensure that stat outputs are serialized
Two issues:
- We don't want potentially two stat outputs running at the same time.
This could potentially happen if USR1 or interval stats race with
the thread exit.
- We could potentially crash if the interval or USR1 signaled stat
output trigger when fio is tearing down. Let the main thread wait
for any in-progress output in that case.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Vincent Kang Fu [Fri, 26 Apr 2013 22:56:01 +0000 (16:56 -0600)]
Add log_info_flush()
If fio dumps status through -USR1 or similar and output is
being stored in a file, the buffering on the file descriptor
by the library can cause is not to see all the output. Ensure
that it gets flushed after dumping stats.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 26 Apr 2013 18:06:06 +0000 (12:06 -0600)]
Get rid of td->o.perc_seq
No point in tracking both perc_seq and perc_rand, when we know
that perc_seq + perc_rand == 100.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 26 Apr 2013 14:56:17 +0000 (08:56 -0600)]
Add support for modifying the randomness of a workload
Fio supports random or sequential IO, or random IO with a number of
sequential IOs in between. The percentage_random options allows
more fine grained control over this. It defaults to 100, which would
make any random workload still purely random. If set below 100,
there will be some percentage of sequential IOs. This happens randomly,
but at the specified percentages.
The percentage_sequential option is just the complement of that, it
is guaranteed that:
percentage_sequential + percentage_random == 100%
The later setting has priority, each will adjust the other.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 16:11:41 +0000 (10:11 -0600)]
Catch the case where size= is less than the minimum block size
Fio will currently just attempt to start and immediately exit,
with no clue as to what went wrong. The behaviour is correct
in the sense that there's nothing to output, but it can be a
little confusing.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 16:06:32 +0000 (10:06 -0600)]
parse: add debug output when enabled
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 05:07:17 +0000 (23:07 -0600)]
Fix filling verify pattern for byte sizes of 3, 5, 7, ...
If we can't double up to the max pattern size, we leave unfilled
space. This causes verification failures. Fix this by properly
filling up to the max.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 04:25:22 +0000 (22:25 -0600)]
Ensure we stop parsing and exit if a command line option fails
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 03:11:35 +0000 (21:11 -0600)]
Update man page with new command line options
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 25 Apr 2013 02:38:54 +0000 (20:38 -0600)]
Add support for other ways of triggering intermediate result outputs
Fio has support for using the USR1 signal to dump the current
results while continuing to run. Add a --status-interval parameter
to allow this to be configured to automatically happen every X
seconds.
There's also support for signaling fio through the file system. To
do that, simply touch /tmp/fio-dump-status. When fio sees this file,
it will unlink and dump the current results.
A small tweak is needed for the file approach to work in Windows.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
peter chang [Wed, 24 Apr 2013 22:32:25 +0000 (16:32 -0600)]
fix memory allocation in the cases we may need to align
when using the sg backend we crash w/ a SEGV in fio_sgio_getevents()
because of memory corruption from the IO. when we allocate the td's
backing store there's a possible post-allocation adjustment to page
align the buffers. however, the extra memory that this alignment may
need is not taken into account when allocating the buffer.
Tested:
- the problematic fio file looks like
fdha347:~# cat foo.fio
[global]
bs=64k
thread
rw=read
size=100g
time_based=1
runtime=60
iodepth=1
[sdc]
ioengine=sg
filename=/dev/sg2
numjobs=1
Signed-off-by: peter chang <dpf@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bruce Cran [Tue, 23 Apr 2013 14:42:40 +0000 (08:42 -0600)]
Really suppress ICE61 when building the Windows installer.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bruce Cran [Tue, 23 Apr 2013 14:27:23 +0000 (15:27 +0100)]
Fix Windows build warnings.
winsock2.h needs to be included before windows.h.
Separate declarations and code.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 18 Apr 2013 12:22:37 +0000 (05:22 -0700)]
gerror: mixed code/data section
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:54:53 +0000 (10:54 -0700)]
Add -Wdeclaration-after-statement to compiler flags
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:53:52 +0000 (10:53 -0700)]
Get rid of mixed code/data sections
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:33:41 +0000 (19:33 +0200)]
ioengine: kill unneeded thread_data forward declaration
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:30:43 +0000 (19:30 +0200)]
Kil unneeded forward declaration
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:29:37 +0000 (19:29 +0200)]
Move unused and other attributes to the compiler section
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:27:46 +0000 (19:27 +0200)]
Split out td error handling code
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:21:14 +0000 (19:21 +0200)]
null: 'td' isn't actually unused, unmark it
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 17 Apr 2013 17:20:28 +0000 (19:20 +0200)]
Propagate io engine error back to 'td', if not already done
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 16 Apr 2013 19:10:46 +0000 (21:10 +0200)]
goptions: fix bad log_err() type
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bruce Cran [Mon, 15 Apr 2013 12:39:58 +0000 (14:39 +0200)]
Update the examples filenames in the Windows installer.
The examples now have a ".fio" suffix - update the Windows installer.
Also, allow same version upgrades to avoid installing over the top of
an existing installation.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Mon, 15 Apr 2013 09:40:57 +0000 (11:40 +0200)]
Fixup bad logging types
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Mon, 15 Apr 2013 09:40:30 +0000 (11:40 +0200)]
log: add printf() attribute to log_*() functions
Similarly to how it's done for dprint(), so we can catch
format errors.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Dmitry Monakhov [Mon, 15 Apr 2013 09:23:25 +0000 (11:23 +0200)]
fio: fix segfault on 32bits platforms
Uses wrong type in log_info().
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Mon, 15 Apr 2013 08:21:56 +0000 (10:21 +0200)]
eta: improve output for threads sitting in TD_SETTING_UP
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Otavio Salvador [Mon, 15 Apr 2013 07:36:24 +0000 (09:36 +0200)]
ARM: Use generic assembly nop and barrier code for armv6
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Aaron Carroll [Mon, 15 Apr 2013 06:41:41 +0000 (08:41 +0200)]
README: quick note on how to cross compile
Signed-off-by: Aaron Carroll <aaronc@cse.unsw.edu.au>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Sat, 13 Apr 2013 18:40:53 +0000 (20:40 +0200)]
filesetup: set TD_SETTING_UP runstate when laying out files
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Sat, 13 Apr 2013 18:26:23 +0000 (20:26 +0200)]
Revert change that set group_reporting to 1
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 14:19:03 +0000 (16:19 +0200)]
Fix warning on platforms without disk util support
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 13:40:50 +0000 (15:40 +0200)]
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
Bruce Cran [Fri, 12 Apr 2013 13:40:21 +0000 (15:40 +0200)]
server: include uio.h for writev()
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 12:13:15 +0000 (14:13 +0200)]
gclient: update to new probe command format
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 11:13:24 +0000 (13:13 +0200)]
Make use of zlib optional
Fio uses it to compress io logs between the client and server.
But let them handshake on this requirement when they connect
and probe, and fallback to just sending the logs in plain
format if both of them do not support zlib compression.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 08:17:09 +0000 (10:17 +0200)]
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
Jens Axboe [Fri, 12 Apr 2013 08:16:43 +0000 (10:16 +0200)]
configure: add needed packages hints
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Fri, 12 Apr 2013 07:15:42 +0000 (09:15 +0200)]
x86: fixup cpuid for some odd (android) 32-bit variants
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Aaron Carroll [Fri, 12 Apr 2013 07:15:23 +0000 (09:15 +0200)]
android: add byteorder for the swab routines
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Aaron Carroll [Fri, 12 Apr 2013 05:59:01 +0000 (07:59 +0200)]
android: add shm syscalls and fix ioprio definitions
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Aaron Carroll [Fri, 12 Apr 2013 05:55:02 +0000 (07:55 +0200)]
server: fix 32-bit build warning
Cast the 64-bit tag to a 32-bit pointer first, before
casting to the fio_net_cmd_reply pointer.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 16:44:33 +0000 (18:44 +0200)]
Makefile: clean $(FIO_OBJS) too
Otherwise fio.o gets left behind after a clean.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 13:03:58 +0000 (15:03 +0200)]
README: update
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 12:20:33 +0000 (14:20 +0200)]
Fix a few 4.8 extra anal warnings
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 11:48:31 +0000 (13:48 +0200)]
Get rid of cast between enums
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 11:48:13 +0000 (13:48 +0200)]
libaio: fix double setting of option category
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 11:46:37 +0000 (13:46 +0200)]
net: fix double setting of option category
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 11:45:51 +0000 (13:45 +0200)]
client: move jobs_eta to the end of client_eta
It has a variably length field.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:55:16 +0000 (12:55 +0200)]
client/server: pass ->unit_base properly
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:43:05 +0000 (12:43 +0200)]
client/server: pass je->rate[] and je->iops[] over the net
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:31:29 +0000 (12:31 +0200)]
Merge branch 'gfio' into gfio-int
Conflicts:
backend.c
fio.c
fio.h
init.c
libfio.c
options.c
thread_options.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:26:55 +0000 (12:26 +0200)]
to_kmg() -> fio_uint_to_kmg()
It's being exported.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:25:17 +0000 (12:25 +0200)]
Move t/jobs/ to .fio format
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:24:36 +0000 (12:24 +0200)]
Make io_sample word size agnostic
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 14 Mar 2012 10:39:13 +0000 (11:39 +0100)]
iolog: note type of log
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
backend.c
init.c
iolog.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:11:34 +0000 (12:11 +0200)]
init: kill unused mlock_size
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:04:38 +0000 (12:04 +0200)]
Make nr_thread/nr_process private to backend
No need export that knowledge. Merge from gfio.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 10:01:48 +0000 (12:01 +0200)]
backend: merge in td->o to o-> thread_main() change
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 09:54:08 +0000 (11:54 +0200)]
Rename job files
gfio uses a .fio or .ini ending.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 09:51:35 +0000 (11:51 +0200)]
Move init code to libfio
More merge from gfio.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Thu, 11 Apr 2013 06:53:24 +0000 (08:53 +0200)]
ioengine: import whitespace changes
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 28 Mar 2012 18:50:15 +0000 (20:50 +0200)]
Make lockmem a per job option
We need to get rid of per job options that fiddle with global
state. It's confusing, and it breaks remote option handling.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
backend.c
fio.h
init.c
options.c
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 20:23:40 +0000 (22:23 +0200)]
Merge in crc32c-intel probe
Then we can kill the option callback.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 20:19:46 +0000 (22:19 +0200)]
Merge in zipf differences from gfio
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 20:16:01 +0000 (22:16 +0200)]
Merge missing content to man page
We missed the two CPU engine private options.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 20:13:30 +0000 (22:13 +0200)]
README: remove partial option list
The HOWTO or man page should be used, since either of those
has the full list of option keywords.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 18:48:31 +0000 (20:48 +0200)]
Move rbtree to lib/
That's where it was moved in gfio, one further step towards unifying
the branches.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:50:32 +0000 (19:50 +0200)]
Merge branch 'master' into gfio
Conflicts:
engines/libaio.c
engines/net.c
iolog.h
options.c
options.h
parse.c
parse.h
thread_options.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:45:30 +0000 (19:45 +0200)]
tiobench: remove duplicate profile group
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:43:59 +0000 (19:43 +0200)]
Categorize engine and profile options
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:35:25 +0000 (19:35 +0200)]
parse: fix spelling error
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:32:20 +0000 (19:32 +0200)]
parse: bring in more stuff from gfio
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 17:30:50 +0000 (19:30 +0200)]
Unify options with gfio
Add the parser features and unify the option table.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 13:01:42 +0000 (15:01 +0200)]
Add thread_options.h
The options are always problematic to merge between the master
repo and gfio. So import this bit from gfio.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 12:41:08 +0000 (14:41 +0200)]
configure: gfio wording
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 11:08:02 +0000 (13:08 +0200)]
Add group/category to numa/mem node options
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 11:07:43 +0000 (13:07 +0200)]
parse: set invalid group on option with no group set
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 11:05:23 +0000 (13:05 +0200)]
parse: catch all options without a group/category set
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 11:01:30 +0000 (13:01 +0200)]
gfio: add option group/category to filename_format
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 09:21:33 +0000 (11:21 +0200)]
parse: don't print min/max option ranges if posval[] is set
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 09:12:21 +0000 (11:12 +0200)]
Merge branch 'master' into gfio
Conflicts:
options.c
parse.c
server.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 09:06:59 +0000 (11:06 +0200)]
Convert unit_base to posval[]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Wed, 10 Apr 2013 09:06:34 +0000 (11:06 +0200)]
parse: for option with posval, dump allowed values on failure
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 19:05:14 +0000 (21:05 +0200)]
options: make unit_base be posval[] based
We can kill the verifier and ensure we only get the
possible values we need.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 19:02:15 +0000 (21:02 +0200)]
parse: add posval support to FIO_OPT_INT
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 19:02:15 +0000 (21:02 +0200)]
parse: add posval support to FIO_OPT_INT
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:49:45 +0000 (20:49 +0200)]
options: make unit_base be posval[] based
We can kill the verifier and ensure we only get the
possible values we need.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:49:34 +0000 (20:49 +0200)]
gfio: add support for FIO_OPT_INT options with posval
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:38:32 +0000 (20:38 +0200)]
gfio: update new options for gfio opt format
And fix gclient.c updates for num2str().
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:30:04 +0000 (20:30 +0200)]
server: bump protocol version
Commit
ad705bcb adds member to protocol structures, bump it.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:29:29 +0000 (20:29 +0200)]
server: bump protocol version
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jens Axboe [Tue, 9 Apr 2013 18:29:16 +0000 (20:29 +0200)]
Merge branch 'master' into gfio
Conflicts:
eta.c
fio.h
init.c
options.c
stat.c
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Steven Noonan [Mon, 8 Apr 2013 22:40:13 +0000 (15:40 -0700)]
stat.c: make 'bw' summary line respect 'unit_base' option
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Steven Noonan [Mon, 8 Apr 2013 22:25:54 +0000 (15:25 -0700)]
stats: show summary bandwidth in terms of kb_base
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
projects / fio.git / log