fio: update to 3.16

changes not found.

4 files changed, 31 insertions, 79 deletions

diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
index 1c3755e34e6..4f439b06bad 100644
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/04/25 07:32:37 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/08 18:13:32 maya Exp $
 
-DISTNAME=	fio-2.19
-PKGREVISION=	1
+DISTNAME=	fio-3.16
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://brick.kernel.dk/snaps/
 
@@ -19,6 +18,7 @@ EGDIR=		${PREFIX}/share/examples/fio
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 REPLACE_BASH+=		tools/genfio
+REPLACE_PYTHON+=	tools/fio_jsonplus_clat2csv
 REPLACE_PYTHON+=	tools/fio_latency2csv.py
 REPLACE_PYTHON+=	tools/fiologparser.py
 REPLACE_PYTHON+=	tools/hist/fiologparser_hist.py
diff --git a/benchmarks/fio/PLIST b/benchmarks/fio/PLIST
index eab56ae2494..de65536b518 100644
--- a/benchmarks/fio/PLIST
+++ b/benchmarks/fio/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2017/02/04 12:50:23 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/08 18:13:32 maya Exp $
 bin/fio
 bin/fio-dedupe
 bin/fio-genzipf
 bin/fio-verify-state
 bin/fio2gnuplot
 bin/fio_generate_plots
-bin/fio_latency2csv.py
+bin/fio_jsonplus_clat2csv
 bin/fiologparser.py
 bin/fiologparser_hist.py
 bin/genfio
@@ -18,29 +18,49 @@ share/examples/fio/1mbs_clients.fio
 share/examples/fio/aio-read.fio
 share/examples/fio/backwards-read.fio
 share/examples/fio/basic-verify.fio
+share/examples/fio/butterfly.fio
+share/examples/fio/cpp_null.fio
 share/examples/fio/cpuio.fio
+share/examples/fio/cross-stripe-verify.fio
 share/examples/fio/dev-dax.fio
 share/examples/fio/disk-zone-profile.fio
 share/examples/fio/e4defrag.fio
 share/examples/fio/e4defrag2.fio
 share/examples/fio/enospc-pressure.fio
 share/examples/fio/falloc.fio
+share/examples/fio/filecreate-ioengine.fio
+share/examples/fio/fio-rand-RW.fio
+share/examples/fio/fio-rand-read.fio
+share/examples/fio/fio-rand-write.fio
+share/examples/fio/fio-seq-RW.fio
+share/examples/fio/fio-seq-read.fio
+share/examples/fio/fio-seq-write.fio
 share/examples/fio/fixed-rate-submission.fio
 share/examples/fio/flow.fio
 share/examples/fio/fsx.fio
-share/examples/fio/fusion-aw-sync.fio
+share/examples/fio/ftruncate.fio
 share/examples/fio/gfapi.fio
+share/examples/fio/gpudirect-rdmaio-client.fio
+share/examples/fio/gpudirect-rdmaio-server.fio
+share/examples/fio/http-s3.fio
+share/examples/fio/http-swift.fio
+share/examples/fio/http-webdav.fio
+share/examples/fio/ime.fio
 share/examples/fio/iometer-file-access-server.fio
 share/examples/fio/jesd219.fio
 share/examples/fio/latency-profile.fio
 share/examples/fio/libhdfs.fio
+share/examples/fio/libiscsi.fio
+share/examples/fio/libpmem.fio
 share/examples/fio/mtd.fio
+share/examples/fio/nbd.fio
 share/examples/fio/netio.fio
 share/examples/fio/netio_multicast.fio
 share/examples/fio/null.fio
 share/examples/fio/numa.fio
 share/examples/fio/pmemblk.fio
 share/examples/fio/poisson-rate-submission.fio
+share/examples/fio/rados.fio
 share/examples/fio/rand-zones.fio
 share/examples/fio/rbd.fio
 share/examples/fio/rdmaio-client.fio
diff --git a/benchmarks/fio/distinfo b/benchmarks/fio/distinfo
index 0b99071fc5f..f775fa90ba1 100644
--- a/benchmarks/fio/distinfo
+++ b/benchmarks/fio/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/06/26 13:48:50 wiedi Exp $
+$NetBSD: distinfo,v 1.5 2019/10/08 18:13:32 maya Exp $
 
-SHA1 (fio-2.19.tar.gz) = 05c251899d8aedb3f5dfb2cc6976f2d0f2f2c332
-RMD160 (fio-2.19.tar.gz) = c4d059fece80dd40e1401e48dd149850476e3b51
-SHA512 (fio-2.19.tar.gz) = 92515432401638721793d42a20f1b55a75c50a6304a600c1efa8bb426900ab7d29a3cd11b7e65ce5229a933680c0edbae684d58f02874edf3f384fe5ccd0d727
-Size (fio-2.19.tar.gz) = 681650 bytes
-SHA1 (patch-Makefile) = 96d6822ae7da3a07d4eea264fad8a4d90da3e43f
+SHA1 (fio-3.16.tar.gz) = 817571ef04f3309b15296cedf5e73f907dd2c472
+RMD160 (fio-3.16.tar.gz) = c7934c02ee72afd9cb98ced67f5c88204a124af3
+SHA512 (fio-3.16.tar.gz) = 05b85755411da5ccf620a8f4cc53347de01a605347ccc40769e850dc553abe9472231bd059e8ffe8d59681d7ed4291c7cce38b0f2109afbc390fbed6329f3a31
+Size (fio-3.16.tar.gz) = 979997 bytes
diff --git a/benchmarks/fio/patches/patch-Makefile b/benchmarks/fio/patches/patch-Makefile
deleted file mode 100644
index 906b27de56b..00000000000
--- a/benchmarks/fio/patches/patch-Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-Makefile,v 1.3 2017/06/26 13:48:50 wiedi Exp $
-
-Convert the fmt(1) command to a tr(1) one (the fmt(1) old syntax command is not
-supported on all Unix systems).
-
---- Makefile.orig	2017-04-04 14:30:59.000000000 +0000
-+++ Makefile
-@@ -293,13 +293,8 @@ endif
- prefix = $(INSTALL_PREFIX)
- bindir = $(prefix)/bin
- 
--ifeq ($(CONFIG_TARGET_OS), Darwin)
--mandir = /usr/share/man
--sharedir = /usr/share/fio
--else
--mandir = $(prefix)/man
-+mandir = $(prefix)/$(PKGMANDIR)
- sharedir = $(prefix)/share/fio
--endif
- 
- all: $(PROGS) $(T_TEST_PROGS) $(SCRIPTS) FORCE
- 
-@@ -318,8 +313,8 @@ override CFLAGS += -DFIO_VERSION='"$(FIO
- 	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCDIR)/$*.c > $*.d
- 	@mv -f $*.d $*.d.tmp
- 	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
--	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -w 1 | \
--		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | tr -cs "[:graph:]" "\n" | \
-+		sed -e 's/^ *//' -e '/^$$/ d' -e 's/$$/:/' >> $*.d
- 	@rm -f $*.d.tmp
- 
- ifdef CONFIG_ARITHMETIC
-@@ -357,8 +352,8 @@ init.o: init.c FIO-VERSION-FILE
- 	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCDIR)/$*.c > $*.d
- 	@mv -f $*.d $*.d.tmp
- 	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
--	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -w 1 | \
--		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | tr -cs "[:graph:]" "\n" | \
-+		sed -e 's/^ *//' -e '/^$$/ d' -e 's/$$/:/' >> $*.d
- 	@rm -f $*.d.tmp
- 
- gcompat.o: gcompat.c gcompat.h
-@@ -452,12 +447,13 @@ test: fio
- 	./fio --minimal --thread --ioengine=null --runtime=1s --name=nulltest --rw=randrw --iodepth=2 --norandommap --random_generator=tausworthe64 --size=16T --name=verifynulltest --rw=write --verify=crc32c --verify_state_save=0 --size=100M
- 
- install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
--	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
--	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
--	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 644 $(SRCDIR)/fio.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 644 $(SRCDIR)/tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 644 $(SRCDIR)/tools/plot/fio2gnuplot.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 644 $(SRCDIR)/tools/hist/fiologparser_hist.py.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 755 -d $(DESTDIR)$(sharedir)
--	$(INSTALL) -m 644 $(SRCDIR)/tools/plot/*gpm $(DESTDIR)$(sharedir)/
-+	$(BSD_INSTALL_PROGRAM_DIR) -m 755 -d $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_MAN_DIR) -m 755 -d $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/fio.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/plot/fio2gnuplot.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/hist/fiologparser_hist.py.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_DATA_DIR) -m 755 -d $(DESTDIR)$(sharedir)
-+	$(BSD_INSTALL_DATA) -m 644 $(SRCDIR)/tools/plot/*gpm $(DESTDIR)$(sharedir)/