summaryrefslogtreecommitdiff
path: root/test/async-hooks
diff options
context:
space:
mode:
authorBastian Krol <bastian.krol@instana.com>2018-10-01 17:11:25 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2018-10-10 08:45:56 +0200
commiteb9748d222061381236f19cbe162cf9eb2e034ad (patch)
tree88d7412a51fc3966d059cff654002c4d9b160348 /test/async-hooks
parent45c70b0ce79c5c606247356bf4697dae6f60c810 (diff)
downloadandroid-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.tar.gz
android-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.tar.bz2
android-node-v8-eb9748d222061381236f19cbe162cf9eb2e034ad.zip
async_hooks: add missing async_hooks destroys in AsyncReset
This adds missing async_hooks destroy calls for sockets (in _http_agent.js) and HTTP parsers. We need to emit a destroy in AsyncWrap#AsyncReset before assigning a new async_id when the instance has already been in use and is being recycled, because in that case, we have already emitted an init for the "old" async_id. This also removes a duplicated init call for HTTP parser: Each time a new parser was created, AsyncReset was being called via the C++ Parser class constructor (super constructor AsyncWrap) and also via Parser::Reinitialize. PR-URL: https://github.com/nodejs/node/pull/23272 Fixes: https://github.com/nodejs/node/issues/19859 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/async-hooks')
-rw-r--r--test/async-hooks/test-graph.http.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/test/async-hooks/test-graph.http.js b/test/async-hooks/test-graph.http.js
index b18bc7453c..414ebabeee 100644
--- a/test/async-hooks/test-graph.http.js
+++ b/test/async-hooks/test-graph.http.js
@@ -38,20 +38,14 @@ process.on('exit', function() {
{ type: 'HTTPPARSER',
id: 'httpparser:1',
triggerAsyncId: 'tcpserver:1' },
- { type: 'HTTPPARSER',
- id: 'httpparser:2',
- triggerAsyncId: 'tcpserver:1' },
{ type: 'TCPWRAP', id: 'tcp:2', triggerAsyncId: 'tcpserver:1' },
{ type: 'Timeout', id: 'timeout:1', triggerAsyncId: 'tcp:2' },
{ type: 'HTTPPARSER',
- id: 'httpparser:3',
- triggerAsyncId: 'tcp:2' },
- { type: 'HTTPPARSER',
- id: 'httpparser:4',
+ id: 'httpparser:2',
triggerAsyncId: 'tcp:2' },
{ type: 'Timeout',
id: 'timeout:2',
- triggerAsyncId: 'httpparser:4' },
+ triggerAsyncId: 'httpparser:2' },
{ type: 'SHUTDOWNWRAP',
id: 'shutdown:1',
triggerAsyncId: 'tcp:2' } ]