Commit 2343c39
async_hooks: use resource stack for AsyncLocalStorage run
PR-URL: #39890
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>1 parent ca9b781 commit 2343c39
3 files changed
Lines changed: 33 additions & 38 deletions
File tree
- benchmark/async_hooks
- lib
- test/async-hooks
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,21 @@ | |||
| 1 | + 'use strict'; | ||
| 2 | + const common = require('../common.js'); | ||
| 3 | + const { AsyncLocalStorage } = require('async_hooks'); | ||
| 4 | + | ||
| 5 | + const bench = common.createBenchmark(main, { | ||
| 6 | + n: [1e7] | ||
| 7 | + }); | ||
| 8 | + | ||
| 9 | + async function run(store, n) { | ||
| 10 | + for (let i = 0; i < n; i++) { | ||
| 11 | + await new Promise((resolve) => store.run(i, resolve)); | ||
| 12 | + } | ||
| 13 | + } | ||
| 14 | + | ||
| 15 | + function main({ n }) { | ||
| 16 | + const store = new AsyncLocalStorage(); | ||
| 17 | + bench.start(); | ||
| 18 | + run(store, n).then(() => { | ||
| 19 | + bench.end(n); | ||
| 20 | + }); | ||
| 21 | + } | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -263,7 +263,6 @@ const storageHook = createHook({ | |||
| 263 | 263 | } | |
| 264 | 264 | }); | |
| 265 | 265 | ||
| 266 | - const defaultAlsResourceOpts = { requireManualDestroy: true }; | ||
| 267 | 266 | class AsyncLocalStorage { | |
| 268 | 267 | constructor() { | |
| 269 | 268 | this.kResourceStore = Symbol('kResourceStore'); | |
@@ -309,14 +308,19 @@ class AsyncLocalStorage { | |||
| 309 | 308 | if (ObjectIs(store, this.getStore())) { | |
| 310 | 309 | return ReflectApply(callback, null, args); | |
| 311 | 310 | } | |
| 312 | - const resource = new AsyncResource('AsyncLocalStorage', | ||
| 313 | - defaultAlsResourceOpts); | ||
| 314 | - // Calling emitDestroy before runInAsyncScope avoids a try/finally | ||
| 315 | - // It is ok because emitDestroy only schedules calling the hook | ||
| 316 | - return resource.emitDestroy().runInAsyncScope(() => { | ||
| 317 | - this.enterWith(store); | ||
| 311 | + | ||
| 312 | + this._enable(); | ||
| 313 | + | ||
| 314 | + const resource = executionAsyncResource(); | ||
| 315 | + const oldStore = resource[this.kResourceStore]; | ||
| 316 | + | ||
| 317 | + resource[this.kResourceStore] = store; | ||
| 318 | + | ||
| 319 | + try { | ||
| 318 | 320 | return ReflectApply(callback, null, args); | |
| 319 | - }); | ||
| 321 | + } finally { | ||
| 322 | + resource[this.kResourceStore] = oldStore; | ||
| 323 | + } | ||
| 320 | 324 | } | |
| 321 | 325 | ||
| 322 | 326 | exit(callback, ...args) { | |
Lines changed: 0 additions & 30 deletions
This file was deleted.
0 commit comments