From b45f977de9826fd0334f0070528c7a4f55404cf7 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 22 Sep 2019 19:22:34 -0700
Subject: [PATCH 1/4] Use vimdiff.

---
 dotfiles/gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index e300459..9fea2fa 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -58,3 +58,8 @@
 	helper = cache --timeout=36000
 [receive]
 	denyCurrentBranch = updateInstead
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false

From 170c3f0e9ffa4635f8ff0dc92873ade8754cf335 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 22 Sep 2019 19:22:49 -0700
Subject: [PATCH 2/4] Add disk benchmark script.

---
 bin/disk-benchmark | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 bin/disk-benchmark

diff --git a/bin/disk-benchmark b/bin/disk-benchmark
new file mode 100755
index 0000000..1c6ac8b
--- /dev/null
+++ b/bin/disk-benchmark
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ue
+
+FILENAME=${1}
+
+if [ -f ${FILENAME} ] ; then
+  echo "File ${FILENAME} already exists!" >/dev/stderr
+  exit 1
+fi
+
+fio --loops=5 --size=1000m --filename=${FILENAME} --stonewall --ioengine=libaio --direct=1 \
+  --name=Seqread --bs=1m --rw=read \
+  --name=Seqwrite --bs=1m --rw=write \
+  --name=512Kread --bs=512k --rw=randread \
+  --name=512Kwrite --bs=512k --rw=randwrite \
+  --name=4kQD32read --bs=4k --iodepth=32 --rw=randread \
+  --name=4kQD32write --bs=4k --iodepth=32 --rw=randwrite
+rm -f ${FILENAME}

From a20636347caec8a3b9f574477e8c4ab33cc68baf Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 22 Sep 2019 19:24:29 -0700
Subject: [PATCH 3/4] Switch to trap for benchmark cleanup.

---
 bin/disk-benchmark | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/disk-benchmark b/bin/disk-benchmark
index 1c6ac8b..4eabad7 100755
--- a/bin/disk-benchmark
+++ b/bin/disk-benchmark
@@ -9,6 +9,8 @@ if [ -f ${FILENAME} ] ; then
   exit 1
 fi
 
+trap "test -f ${FILENAME} && rm -f ${FILENAME}" EXIT
+
 fio --loops=5 --size=1000m --filename=${FILENAME} --stonewall --ioengine=libaio --direct=1 \
   --name=Seqread --bs=1m --rw=read \
   --name=Seqwrite --bs=1m --rw=write \
@@ -16,4 +18,3 @@ fio --loops=5 --size=1000m --filename=${FILENAME} --stonewall --ioengine=libaio
   --name=512Kwrite --bs=512k --rw=randwrite \
   --name=4kQD32read --bs=4k --iodepth=32 --rw=randread \
   --name=4kQD32write --bs=4k --iodepth=32 --rw=randwrite
-rm -f ${FILENAME}

From 395297e08b565de5e13d13661287aa5d0e93a753 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 22 Sep 2019 19:34:05 -0700
Subject: [PATCH 4/4] Update benchmark for variable size.

---
 bin/disk-benchmark | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/disk-benchmark b/bin/disk-benchmark
index 4eabad7..ad46705 100755
--- a/bin/disk-benchmark
+++ b/bin/disk-benchmark
@@ -3,6 +3,7 @@
 set -ue
 
 FILENAME=${1}
+BENCHMARK_SIZE=${BENCHMARK_SIZE:-1000m}
 
 if [ -f ${FILENAME} ] ; then
   echo "File ${FILENAME} already exists!" >/dev/stderr
@@ -11,7 +12,8 @@ fi
 
 trap "test -f ${FILENAME} && rm -f ${FILENAME}" EXIT
 
-fio --loops=5 --size=1000m --filename=${FILENAME} --stonewall --ioengine=libaio --direct=1 \
+fio --loops=5 --size=${BENCHMARK_SIZE} --filename=${FILENAME} \
+  --stonewall --ioengine=libaio --direct=1 \
   --name=Seqread --bs=1m --rw=read \
   --name=Seqwrite --bs=1m --rw=write \
   --name=512Kread --bs=512k --rw=randread \