From 91b4167ca60f8613630933feffe095835d07c55f Mon Sep 17 00:00:00 2001 From: James M Snell Date: Mon, 19 Mar 2018 08:17:26 -0700 Subject: [PATCH] http2: remove some unnecessary next ticks Backport-PR-URL: https://github.com/nodejs/node/pull/20456 PR-URL: https://github.com/nodejs/node/pull/19451 Reviewed-By: Matteo Collina --- lib/internal/http2/core.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 0a3bcaf2e0cbbd..9641726d5c0f90 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -364,7 +364,7 @@ function onSettings() { session[kUpdateTimer](); debug(`Http2Session ${sessionName(session[kType])}: new settings received`); session[kRemoteSettings] = undefined; - process.nextTick(emit, session, 'remoteSettings', session.remoteSettings); + session.emit('remoteSettings', session.remoteSettings); } // If the stream exists, an attempt will be made to emit an event @@ -380,7 +380,7 @@ function onPriority(id, parent, weight, exclusive) { const emitter = session[kState].streams.get(id) || session; if (!emitter.destroyed) { emitter[kUpdateTimer](); - process.nextTick(emit, emitter, 'priority', id, parent, weight, exclusive); + emitter.emit('priority', id, parent, weight, exclusive); } } @@ -394,7 +394,7 @@ function onFrameError(id, type, code) { `type ${type} on stream ${id}, code: ${code}`); const emitter = session[kState].streams.get(id) || session; emitter[kUpdateTimer](); - process.nextTick(emit, emitter, 'frameError', type, code, id); + emitter.emit('frameError', type, code, id); } function onAltSvc(stream, origin, alt) { @@ -404,7 +404,7 @@ function onAltSvc(stream, origin, alt) { debug(`Http2Session ${sessionName(session[kType])}: altsvc received: ` + `stream: ${stream}, origin: ${origin}, alt: ${alt}`); session[kUpdateTimer](); - process.nextTick(emit, session, 'altsvc', alt, origin, stream); + session.emit('altsvc', alt, origin, stream); } // Receiving a GOAWAY frame from the connected peer is a signal that no @@ -734,7 +734,7 @@ function setupHandle(socket, type, options) { // core will check for session.destroyed before progressing, this // ensures that those at l`east get cleared out. if (this.destroyed) { - process.nextTick(emit, this, 'connect', this, socket); + this.emit('connect', this, socket); return; } debug(`Http2Session ${sessionName(type)}: setting up session handle`); @@ -776,7 +776,7 @@ function setupHandle(socket, type, options) { options.settings : {}; this.settings(settings); - process.nextTick(emit, this, 'connect', this, socket); + this.emit('connect', this, socket); } // Emits a close event followed by an error event if err is truthy. Used @@ -1227,7 +1227,7 @@ class Http2Session extends EventEmitter { } } - process.nextTick(emit, this, 'timeout'); + this.emit('timeout'); } ref() { @@ -1455,8 +1455,8 @@ function streamOnPause() { function abort(stream) { if (!stream.aborted && !(stream._writableState.ended || stream._writableState.ending)) { - process.nextTick(emit, stream, 'aborted'); stream[kState].flags |= STREAM_FLAGS_ABORTED; + stream.emit('aborted'); } } @@ -1578,7 +1578,7 @@ class Http2Stream extends Duplex { } } - process.nextTick(emit, this, 'timeout'); + this.emit('timeout'); } // true if the HEADERS frame has been sent