aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-01-23 20:17:34 +0100
committerJakob Unterwurzacher2016-01-23 20:18:13 +0100
commite799ae672d64e6d3f943f79cda67be12a2b999e1 (patch)
treee3654deb6e277c4c490e11ab14135fe648f6d719
parent142ed8b2b6e0549188c0651a2a077b37f2ae6da0 (diff)
Show new benchmark.bash in README
The old benchmark is in benchmark-builtin.bash. renamed: benchmarks-builtin.bash -> benchmark-builtin.bash renamed: benchmarks-external.bash -> benchmark.bash
-rw-r--r--README.md20
-rwxr-xr-xbenchmark-builtin.bash (renamed from benchmarks-builtin.bash)3
-rwxr-xr-xbenchmark.bash (renamed from benchmarks-external.bash)6
3 files changed, 16 insertions, 13 deletions
diff --git a/README.md b/README.md
index f49bfb1..753e390 100644
--- a/README.md
+++ b/README.md
@@ -82,17 +82,15 @@ Run `./benchmark.bash` to run the benchmarks.
The output should look like this:
- ./benchmark.bash
- gocryptfs v0.3.1-30-gd69e0df-dirty; on-disk format 2
- PASS
- BenchmarkStreamWrite-2 100 12246070 ns/op 85.63 MB/s
- BenchmarkStreamRead-2 200 9125990 ns/op 114.90 MB/s
- BenchmarkCreate0B-2 10000 101284 ns/op
- BenchmarkCreate1B-2 10000 178356 ns/op 0.01 MB/s
- BenchmarkCreate100B-2 5000 361014 ns/op 0.28 MB/s
- BenchmarkCreate4kB-2 5000 375035 ns/op 10.92 MB/s
- BenchmarkCreate10kB-2 3000 491071 ns/op 20.85 MB/s
- ok github.com/rfjakob/gocryptfs/integration_tests 17.216s
+```
+$ ./benchmark.bash
+linux-3.0.tar.gz 100%[===========================>] 92,20M 2,96MB/s in 35s
+2016-01-23 20:08:11 URL:https://www.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.gz [...]
+WRITE: 131072000 bytes (131 MB) copied, 1,36225 s, 96,2 MB/s
+UNTAR: 23.16
+LS: 1.71
+RM: 4.36
+```
Changelog
---------
diff --git a/benchmarks-builtin.bash b/benchmark-builtin.bash
index 41f0aa7..145fcfd 100755
--- a/benchmarks-builtin.bash
+++ b/benchmark-builtin.bash
@@ -1,5 +1,8 @@
#!/bin/bash
+# Run the synthetic benchmarks that are built into gocryptfs using
+# "go test".
+
set -eu
source build.bash
diff --git a/benchmarks-external.bash b/benchmark.bash
index f48c7ac..55f6fa2 100755
--- a/benchmarks-external.bash
+++ b/benchmark.bash
@@ -1,18 +1,20 @@
#!/bin/bash
+# Run the set of "canonical" benchmarks that are shown on
+# https://nuetzlich.net/gocryptfs/comparison/
+
set -eu
TIME="/usr/bin/time -f %e"
# Setup
cd /tmp
-wget -q -c https://www.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.gz
+wget -nv --show-progress -c https://www.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.gz
DIR1=$(mktemp -d)
DIR2=$(mktemp -d)
gocryptfs -q -init -extpass="echo test" $DIR1
gocryptfs -q -extpass="echo test" $DIR1 $DIR2
cd $DIR2
-echo
# Benchmarks
echo -n "WRITE: "