Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 575686bb85fa36f326524c505e83c54abc0d2f2b:

  zbd: add a new --ignore_zone_limits option (2021-05-27 16:04:58 -0600)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to d7a28031718d281f1b9ea593c8a3f395761510ca:

  Merge branch 'fix/928' of https://github.com/larsks/fio (2021-06-03 09:01:52 -0600)

----------------------------------------------------------------
Erwan Velu (3):
      ci: Installing missing toolchain
      ci: Reporting installed msys2 packages
      Makefile: Avoid using built-in stpcpy during clang build

Jens Axboe (2):
      Merge branch 'evelu-test' of https://github.com/ErwanAliasr1/fio
      Merge branch 'fix/928' of https://github.com/larsks/fio

Lars Kellogg-Stedman (1):
      fix fio2gnuplot to work with new logging format

 Makefile               | 5 +++++
 ci/appveyor-install.sh | 2 ++
 tools/plot/fio2gnuplot | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/Makefile b/Makefile
index ef317373..f57569d5 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,11 @@ ifdef CONFIG_PDB
   LDFLAGS += -fuse-ld=lld $(LINK_PDBFILE)
 endif
 
+# If clang, do not use builtin stpcpy as it breaks the build
+ifeq ($(CC),clang)
+  FIO_CFLAGS += -fno-builtin-stpcpy
+endif
+
 ifdef CONFIG_GFIO
   PROGS += gfio
 endif
diff --git a/ci/appveyor-install.sh b/ci/appveyor-install.sh
index c73e4cb5..3137f39e 100755
--- a/ci/appveyor-install.sh
+++ b/ci/appveyor-install.sh
@@ -31,7 +31,9 @@ case "${DISTRO}" in
         pacman.exe --noconfirm -S \
             mingw-w64-${PACKAGE_ARCH}-clang \
             mingw-w64-${PACKAGE_ARCH}-cunit \
+            mingw-w64-${PACKAGE_ARCH}-toolchain \
             mingw-w64-${PACKAGE_ARCH}-lld
+        pacman.exe -Q # List installed packages
         ;;
 esac
 
diff --git a/tools/plot/fio2gnuplot b/tools/plot/fio2gnuplot
index 78ee82fb..d2dc81df 100755
--- a/tools/plot/fio2gnuplot
+++ b/tools/plot/fio2gnuplot
@@ -198,7 +198,7 @@ def compute_temp_file(fio_data_file,disk_perf,gnuplot_output_dir, min_time, max_
 			# Index will be used to remember what file was featuring what value
 			index=index+1
 
-			time, perf, x, block_size = line[1]
+			time, perf, x, block_size = line[1][:4]
 			if (blk_size == 0):
 				try:
 					blk_size=int(block_size)