Recent changes (master)
The following changes since commit 2eca48926723d3ebe8f43d4999302fb826f4a250:
client: cleanup output types (2018-09-07 15:59:51 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to fd98fb689d5ad7e9977461e961fff3fdd37f9cb8:
Kill fusion atomic write engine (2018-09-08 08:09:53 -0600)
----------------------------------------------------------------
Jens Axboe (2):
Rename example job files (*.job -> *.fio)
Kill fusion atomic write engine
Makefile | 3 -
configure | 25 ---
engines/fusion-aw.c | 183 ---------------------
examples/{fio-rand-RW.job => fio-rand-RW.fio} | 0
examples/{fio-rand-read.job => fio-rand-read.fio} | 0
.../{fio-rand-write.job => fio-rand-write.fio} | 0
examples/{fio-seq-RW.job => fio-seq-RW.fio} | 0
examples/{fio-seq-read.job => fio-seq-read.fio} | 0
examples/{fio-seq-write.job => fio-seq-write.fio} | 0
examples/fusion-aw-sync.fio | 18 --
options.c | 5 -
os/windows/examples.wxs | 28 ++--
12 files changed, 12 insertions(+), 250 deletions(-)
delete mode 100644 engines/fusion-aw.c
rename examples/{fio-rand-RW.job => fio-rand-RW.fio} (100%)
rename examples/{fio-rand-read.job => fio-rand-read.fio} (100%)
rename examples/{fio-rand-write.job => fio-rand-write.fio} (100%)
rename examples/{fio-seq-RW.job => fio-seq-RW.fio} (100%)
rename examples/{fio-seq-read.job => fio-seq-read.fio} (100%)
rename examples/{fio-seq-write.job => fio-seq-write.fio} (100%)
delete mode 100644 examples/fusion-aw-sync.fio---
Diff of recent changes:
Makefile +0 -3
@@ -86,9 +86,6 @@ endif ifdef CONFIG_GUASI SOURCE += engines/guasi.c endif -ifdef CONFIG_FUSION_AW - SOURCE += engines/fusion-aw.c -endif ifdef CONFIG_SOLARISAIO SOURCE += engines/solarisaio.c endif
configure +0 -25
@@ -1149,28 +1149,6 @@ fi print_config "GUASI" "$guasi" ########################################## -# fusion-aw probe -if test "$fusion_aw" != "yes" ; then - fusion_aw="no" -fi -cat > $TMPC << EOF -#include <nvm/nvm_primitives.h> -int main(int argc, char **argv) -{ - nvm_version_t ver_info; - nvm_handle_t handle; - - handle = nvm_get_handle(0, &ver_info); - return nvm_atomic_write(handle, 0, 0, 0); -} -EOF -if compile_prog "" "-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -ldl -lpthread" "fusion-aw"; then - LIBS="-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -ldl -lpthread $LIBS" - fusion_aw="yes" -fi -print_config "Fusion-io atomic engine" "$fusion_aw" - -########################################## # libnuma probe if test "$libnuma" != "yes" ; then libnuma="no"
@@ -2405,9 +2383,6 @@ fi if test "$guasi" = "yes" ; then output_sym "CONFIG_GUASI" fi -if test "$fusion_aw" = "yes" ; then - output_sym "CONFIG_FUSION_AW" -fi if test "$libnuma_v2" = "yes" ; then output_sym "CONFIG_LIBNUMA" fi
engines/fusion-aw.c deleted +0 -183
183 lines not on this page · raw message
examples/fio-rand-RW.fio new file +18 -0
@@ -0,0 +1,18 @@ +; fio-rand-RW.job for fiotest + +[global] +name=fio-rand-RW +filename=fio-rand-RW +rw=randrw +rwmixread=60 +rwmixwrite=40 +bs=4K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-rand-RW.job deleted +0 -18
@@ -1,18 +0,0 @@ -; fio-rand-RW.job for fiotest - -[global] -name=fio-rand-RW -filename=fio-rand-RW -rw=randrw -rwmixread=60 -rwmixwrite=40 -bs=4K -direct=0 -numjobs=4 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fio-rand-read.fio new file +16 -0
@@ -0,0 +1,16 @@ +; fio-rand-read.job for fiotest + +[global] +name=fio-rand-read +filename=fio-rand-read +rw=randread +bs=4K +direct=0 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-rand-read.job deleted +0 -16
@@ -1,16 +0,0 @@ -; fio-rand-read.job for fiotest - -[global] -name=fio-rand-read -filename=fio-rand-read -rw=randread -bs=4K -direct=0 -numjobs=1 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fio-rand-write.fio new file +16 -0
@@ -0,0 +1,16 @@ +; fio-rand-write.job for fiotest + +[global] +name=fio-rand-write +filename=fio-rand-write +rw=randwrite +bs=4K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-rand-write.job deleted +0 -16
@@ -1,16 +0,0 @@ -; fio-rand-write.job for fiotest - -[global] -name=fio-rand-write -filename=fio-rand-write -rw=randwrite -bs=4K -direct=0 -numjobs=4 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fio-seq-RW.fio new file +18 -0
@@ -0,0 +1,18 @@ +; fio-seq-RW.job for fiotest + +[global] +name=fio-seq-RW +filename=fio-seq-RW +rw=rw +rwmixread=60 +rwmixwrite=40 +bs=256K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-RW.job deleted +0 -18
@@ -1,18 +0,0 @@ -; fio-seq-RW.job for fiotest - -[global] -name=fio-seq-RW -filename=fio-seq-RW -rw=rw -rwmixread=60 -rwmixwrite=40 -bs=256K -direct=0 -numjobs=4 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fio-seq-read.fio new file +14 -0
@@ -0,0 +1,14 @@ +[global] +name=fio-seq-reads +filename=fio-seq-reads +rw=read +bs=256K +direct=1 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-read.job deleted +0 -14
@@ -1,14 +0,0 @@ -[global] -name=fio-seq-reads -filename=fio-seq-reads -rw=read -bs=256K -direct=1 -numjobs=1 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fio-seq-write.fio new file +16 -0
@@ -0,0 +1,16 @@ +; fio-seq-write.job for fiotest + +[global] +name=fio-seq-write +filename=fio-seq-write +rw=write +bs=256K +direct=0 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-write.job deleted +0 -16
@@ -1,16 +0,0 @@ -; fio-seq-write.job for fiotest - -[global] -name=fio-seq-write -filename=fio-seq-write -rw=write -bs=256K -direct=0 -numjobs=1 -time_based=1 -runtime=900 - -[file1] -size=10G -ioengine=libaio -iodepth=16
examples/fusion-aw-sync.fio deleted +0 -18
@@ -1,18 +0,0 @@ -# Example Job File that randomly writes 8k worth of data atomically for -# 60 seconds. -[rw_aw_file_sync] -rw=randwrite -ioengine=fusion-aw-sync -blocksize=8k -blockalign=8k - -# if file system supports atomic write -filename=/mnt/fs/file -# or test on a direct block device instead -#filename=/dev/fioa -randrepeat=1 -fallocate=none -direct=1 -invalidate=0 -runtime=60 -time_based
options.c +0 -5
@@ -1828,11 +1828,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .help = "RDMA IO engine", },#endif -#ifdef CONFIG_FUSION_AW - { .ival = "fusion-aw-sync", - .help = "Fusion-io atomic write engine", - }, -#endif#ifdef CONFIG_LINUX_EXT4_MOVE_EXTENT { .ival = "e4defrag", .help = "ext4 defrag engine",
os/windows/examples.wxs +12 -16
@@ -45,22 +45,22 @@ <File Source="..\..\examples\filecreate-ioengine.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-rand-read.job" /> + <File Source="..\..\examples\fio-rand-read.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-rand-RW.job" /> + <File Source="..\..\examples\fio-rand-RW.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-rand-write.job" /> + <File Source="..\..\examples\fio-rand-write.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-seq-read.job" /> + <File Source="..\..\examples\fio-seq-read.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-seq-RW.job" /> + <File Source="..\..\examples\fio-seq-RW.fio" /> </Component> <Component> - <File Source="..\..\examples\fio-seq-write.job" /> + <File Source="..\..\examples\fio-seq-write.fio" /> </Component> <Component> <File Source="..\..\examples\fixed-rate-submission.fio" />
@@ -75,9 +75,6 @@ <File Source="..\..\examples\ftruncate.fio" /> </Component> <Component> - <File Source="..\..\examples\fusion-aw-sync.fio" /> - </Component> - <Component> <File Source="..\..\examples\gfapi.fio" /> </Component> <Component>
@@ -188,17 +185,16 @@ <ComponentRef Id="enospc_pressure.fio" /> <ComponentRef Id="falloc.fio" /> <ComponentRef Id="filecreate_ioengine.fio"/> - <ComponentRef Id="fio_rand_read.job"/> - <ComponentRef Id="fio_rand_RW.job"/> - <ComponentRef Id="fio_rand_write.job"/> - <ComponentRef Id="fio_seq_read.job"/> - <ComponentRef Id="fio_seq_RW.job"/> - <ComponentRef Id="fio_seq_write.job"/> + <ComponentRef Id="fio_rand_read.fio"/> + <ComponentRef Id="fio_rand_RW.fio"/> + <ComponentRef Id="fio_rand_write.fio"/> + <ComponentRef Id="fio_seq_read.fio"/> + <ComponentRef Id="fio_seq_RW.fio"/> + <ComponentRef Id="fio_seq_write.fio"/> <ComponentRef Id="fixed_rate_submission.fio" /> <ComponentRef Id="flow.fio" /> <ComponentRef Id="fsx.fio" /> <ComponentRef Id="ftruncate.fio"/> - <ComponentRef Id="fusion_aw_sync.fio" /> <ComponentRef Id="gfapi.fio" /> <ComponentRef Id="gpudirect_rdmaio_client.fio"/> <ComponentRef Id="gpudirect_rdmaio_server.fio"/>