From d7f35304c349f3bc73befa4fdd1b6ab1076faab1 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Sat, 14 Apr 2018 18:26:57 +0200
Subject: [PATCH 1/4] benchmark: add bench for zlib gzip + gunzip cycle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally wrote this for some work that is going to take a while
longer before it’s ready to be PR’ed, so it seems fine to start
with this on its own.
---
 benchmark/zlib/pipe.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 benchmark/zlib/pipe.js

diff --git a/benchmark/zlib/pipe.js b/benchmark/zlib/pipe.js
new file mode 100644
index 00000000000000..9b05749bbb824d
--- /dev/null
+++ b/benchmark/zlib/pipe.js
@@ -0,0 +1,39 @@
+'use strict';
+const common = require('../common.js');
+const fs = require('fs');
+const zlib = require('zlib');
+
+const bench = common.createBenchmark(main, {
+  inputLen: [1024],
+  duration: [5],
+  type: ['string', 'buffer']
+});
+
+function main({ inputLen, duration, type }) {
+  const buffer = Buffer.alloc(inputLen, fs.readFileSync(__filename));
+  const chunk = type === 'buffer' ? buffer : buffer.toString('utf8');
+
+  const input = zlib.createGzip();
+  const output = zlib.createGunzip();
+
+  let readFromOutput = 0;
+  input.pipe(output);
+  if (type === 'string')
+    output.setEncoding('utf8');
+  output.on('data', (chunk) => readFromOutput += chunk.length);
+
+  function write() {
+    input.write(chunk, write);
+  }
+
+  bench.start();
+  write();
+
+  setTimeout(() => {
+    // Give result in GBit/s, like the net benchmarks do
+    bench.end(readFromOutput * 8 / (1024 ** 3));
+
+    // Cut off writing the easy way.
+    input.write = () => {};
+  }, duration * 1000);
+}

From 5c2517f6f7f1d907a29288fa47aee9f9b30af5cd Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 27 Apr 2018 21:07:45 +0200
Subject: [PATCH 2/4] [squash] add new parameter types to benchmark test

---
 test/parallel/test-benchmark-zlib.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-benchmark-zlib.js b/test/parallel/test-benchmark-zlib.js
index 350d05552cda39..2a8088f56f8eb5 100644
--- a/test/parallel/test-benchmark-zlib.js
+++ b/test/parallel/test-benchmark-zlib.js
@@ -9,5 +9,7 @@ runBenchmark('zlib',
                'method=deflate',
                'n=1',
                'options=true',
-               'type=Deflate'
+               'type=Deflate',
+               'inputLen=1024',
+               'duration=0.1'
              ]);

From 4caf88999ec9f61395c88ae7cfc9a55cc9391ae1 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 27 Apr 2018 22:00:30 +0200
Subject: [PATCH 3/4] =?UTF-8?q?[squash]=20duration=200.1=20=E2=86=92=201?=
 =?UTF-8?q?=20for=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/parallel/test-benchmark-zlib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-benchmark-zlib.js b/test/parallel/test-benchmark-zlib.js
index 2a8088f56f8eb5..4deb0ee1d1b54a 100644
--- a/test/parallel/test-benchmark-zlib.js
+++ b/test/parallel/test-benchmark-zlib.js
@@ -11,5 +11,5 @@ runBenchmark('zlib',
                'options=true',
                'type=Deflate',
                'inputLen=1024',
-               'duration=0.1'
+               'duration=1'
              ]);

From 1cf46dfa42f53fd4651d208c11d27f2123d3cbce Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 27 Apr 2018 22:37:00 +0200
Subject: [PATCH 4/4] [squash] refack suggestion

---
 test/parallel/test-benchmark-zlib.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-benchmark-zlib.js b/test/parallel/test-benchmark-zlib.js
index 4deb0ee1d1b54a..25b7d1a4d5f905 100644
--- a/test/parallel/test-benchmark-zlib.js
+++ b/test/parallel/test-benchmark-zlib.js
@@ -11,5 +11,8 @@ runBenchmark('zlib',
                'options=true',
                'type=Deflate',
                'inputLen=1024',
-               'duration=1'
-             ]);
+               'duration=0.001'
+             ],
+             {
+               'NODEJS_BENCHMARK_ZERO_ALLOWED': 1
+             });