Commit 37b5ce2
debugger: fix race condition/deadlock on initialization
PR-URL: #38161
Refs: https://github.com/nodejs/node/discussions/36481
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 93b0c78 commit 37b5ce2
1 file changed
Lines changed: 10 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1062,19 +1062,16 @@ function createRepl(inspector) { | |||
| 1062 | 1062 | } | |
| 1063 | 1063 | ||
| 1064 | 1064 | function initAfterStart() { | |
| 1065 | - const setupTasks = [ | ||
| 1066 | - Runtime.enable(), | ||
| 1067 | - Profiler.enable(), | ||
| 1068 | - Profiler.setSamplingInterval({ interval: 100 }), | ||
| 1069 | - Debugger.enable(), | ||
| 1070 | - Debugger.setPauseOnExceptions({ state: 'none' }), | ||
| 1071 | - Debugger.setAsyncCallStackDepth({ maxDepth: 0 }), | ||
| 1072 | - Debugger.setBlackboxPatterns({ patterns: [] }), | ||
| 1073 | - Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }), | ||
| 1074 | - restoreBreakpoints(), | ||
| 1075 | - Runtime.runIfWaitingForDebugger(), | ||
| 1076 | - ]; | ||
| 1077 | - return Promise.all(setupTasks); | ||
| 1065 | + return Runtime.enable() | ||
| 1066 | + .then(() => Profiler.enable()) | ||
| 1067 | + .then(() => Profiler.setSamplingInterval({ interval: 100 })) | ||
| 1068 | + .then(() => Debugger.enable()) | ||
| 1069 | + .then(() => Debugger.setPauseOnExceptions({ state: 'none' })) | ||
| 1070 | + .then(() => Debugger.setAsyncCallStackDepth({ maxDepth: 0 })) | ||
| 1071 | + .then(() => Debugger.setBlackboxPatterns({ patterns: [] })) | ||
| 1072 | + .then(() => Debugger.setPauseOnExceptions({ state: pauseOnExceptionState })) | ||
| 1073 | + .then(() => restoreBreakpoints()) | ||
| 1074 | + .then(() => Runtime.runIfWaitingForDebugger()) | ||
| 1078 | 1075 | } | |
| 1079 | 1076 | ||
| 1080 | 1077 | return function startRepl() { | |
0 commit comments