diff options
author | Matteo Collina <hello@matteocollina.com> | 2019-01-18 15:31:46 +0100 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2019-02-11 08:50:07 +0100 |
commit | 9af04ad684a666888f76024876d7b74eee60d2f7 (patch) | |
tree | 90ce38c03c30b1331070c01c97599a14f7f303bd /lib | |
parent | fcaeb1f1221c7c4296d44136b2f81d8f6e0db92d (diff) | |
download | android-node-v8-9af04ad684a666888f76024876d7b74eee60d2f7.tar.gz android-node-v8-9af04ad684a666888f76024876d7b74eee60d2f7.tar.bz2 android-node-v8-9af04ad684a666888f76024876d7b74eee60d2f7.zip |
http2: improve compat performance
This bunch of commits help me improve the performance of a http2
server by 8-10%. The benchmarks reports several 1-2% improvements in
various areas.
PR-URL: https://github.com/nodejs/node/pull/25567
Reviewed-By: Benedikt Meurer <benedikt.meurer@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/internal/http2/compat.js | 4 | ||||
-rw-r--r-- | lib/internal/http2/core.js | 26 | ||||
-rw-r--r-- | lib/internal/http2/util.js | 8 |
3 files changed, 29 insertions, 9 deletions
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js index 8043bd492a..da88f4d880 100644 --- a/lib/internal/http2/compat.js +++ b/lib/internal/http2/compat.js @@ -18,18 +18,16 @@ const { ERR_INVALID_HTTP_TOKEN } = require('internal/errors').codes; const { validateString } = require('internal/validators'); -const { kSocket } = require('internal/http2/util'); +const { kSocket, kRequest, kProxySocket } = require('internal/http2/util'); const kBeginSend = Symbol('begin-send'); const kState = Symbol('state'); const kStream = Symbol('stream'); -const kRequest = Symbol('request'); const kResponse = Symbol('response'); const kHeaders = Symbol('headers'); const kRawHeaders = Symbol('rawHeaders'); const kTrailers = Symbol('trailers'); const kRawTrailers = Symbol('rawTrailers'); -const kProxySocket = Symbol('proxySocket'); const kSetHeader = Symbol('setHeader'); const kAborted = Symbol('aborted'); diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 8e84eadbff..0a566ed9e6 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -96,6 +96,8 @@ const { getStreamState, isPayloadMeaningless, kSocket, + kRequest, + kProxySocket, mapToHeaders, NghttpError, sessionName, @@ -117,6 +119,8 @@ const { const { kTimeout } = require('internal/timers'); const { isArrayBufferView } = require('internal/util/types'); +const hasOwnProperty = Object.prototype.hasOwnProperty; + const { FileHandle } = internalBinding('fs'); const binding = internalBinding('http2'); const { @@ -155,7 +159,6 @@ const kOwner = owner_symbol; const kOrigin = Symbol('origin'); const kProceed = Symbol('proceed'); const kProtocol = Symbol('protocol'); -const kProxySocket = Symbol('proxy-socket'); const kRemoteSettings = Symbol('remote-settings'); const kSelectPadding = Symbol('select-padding'); const kSentHeaders = Symbol('sent-headers'); @@ -1622,6 +1625,10 @@ class Http2Stream extends Duplex { endAfterHeaders: false }; + // Fields used by the compat API to avoid megamorphisms. + this[kRequest] = null; + this[kProxySocket] = null; + this.on('pause', streamOnPause); } @@ -2001,9 +2008,20 @@ class Http2Stream extends Duplex { } } -function processHeaders(headers) { - assertIsObject(headers, 'headers'); - headers = Object.assign(Object.create(null), headers); +function processHeaders(oldHeaders) { + assertIsObject(oldHeaders, 'headers'); + const headers = Object.create(null); + + if (oldHeaders !== null && oldHeaders !== undefined) { + const hop = hasOwnProperty.bind(oldHeaders); + // This loop is here for performance reason. Do not change. + for (var key in oldHeaders) { + if (hop(key)) { + headers[key] = oldHeaders[key]; + } + } + } + const statusCode = headers[HTTP2_HEADER_STATUS] = headers[HTTP2_HEADER_STATUS] | 0 || HTTP_STATUS_OK; diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js index f62d936025..0a3faa2355 100644 --- a/lib/internal/http2/util.js +++ b/lib/internal/http2/util.js @@ -10,6 +10,8 @@ const { } = require('internal/errors').codes; const kSocket = Symbol('socket'); +const kProxySocket = Symbol('proxySocket'); +const kRequest = Symbol('request'); const { NGHTTP2_SESSION_CLIENT, @@ -499,12 +501,12 @@ class NghttpError extends Error { } } -function assertIsObject(value, name, types = 'Object') { +function assertIsObject(value, name, types) { if (value !== undefined && (value === null || typeof value !== 'object' || Array.isArray(value))) { - const err = new ERR_INVALID_ARG_TYPE(name, types, value); + const err = new ERR_INVALID_ARG_TYPE(name, types || 'Object', value); Error.captureStackTrace(err, assertIsObject); throw err; } @@ -592,6 +594,8 @@ module.exports = { getStreamState, isPayloadMeaningless, kSocket, + kProxySocket, + kRequest, mapToHeaders, NghttpError, sessionName, |