FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bootstrap: make I/O streams work with user-land snapshot · nodejs/node@542f5e7 · GitHub

/ node Public

Commit 542f5e7

Browse files
joyeecheung
authored and
juanarbol
committed
bootstrap: make I/O streams work with user-land snapshot
Use the mksnapshot cleanup hooks to release the references to the native streams so that they can be destroyed right before the snapshot is taken, and move the initialization of the global console to pre-execution so that they can be re-initialized during snapshot dehydration. This makes it possible for user-land snapshots to use the I/O during snapshot building. PR-URL: #42466 Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Khaidi Chu <i@2333.moe> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent ce5e484 commit 542f5e7

4 files changed

Lines changed: 45 additions & 8 deletions

File tree

‎lib/internal/bootstrap/pre_execution.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ function patchProcessObject(expandArgv1) {
123123
}
124124
}
125125

126+
// We need to initialize the global console here again with process.stdout
127+
// and friends for snapshot deserialization.
128+
const globalConsole = require('internal/console/global');
129+
const { initializeGlobalConsole } = require('internal/console/constructor');
130+
initializeGlobalConsole(globalConsole);
131+
126132
// TODO(joyeecheung): most of these should be deprecated and removed,
127133
// except some that we need to be able to mutate during run time.
128134
addReadOnlyProcessAlias('_eval', '--eval');

‎lib/internal/bootstrap/switches/is_main_thread.js‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,27 +122,53 @@ let stdin;
122122
let stdout;
123123
let stderr;
124124

125+
let stdoutDestroy;
126+
let stderrDestroy;
127+
128+
function refreshStdoutOnSigWinch() {
129+
stdout._refreshSize();
130+
}
131+
132+
function refreshStderrOnSigWinch() {
133+
stderr._refreshSize();
134+
}
135+
125136
function getStdout() {
126137
if (stdout) return stdout;
127138
stdout = createWritableStdioStream(1);
128139
stdout.destroySoon = stdout.destroy;
129140
// Override _destroy so that the fd is never actually closed.
141+
stdoutDestroy = stdout._destroy;
130142
stdout._destroy = dummyDestroy;
131143
if (stdout.isTTY) {
132-
process.on('SIGWINCH', () => stdout._refreshSize());
144+
process.on('SIGWINCH', refreshStdoutOnSigWinch);
133145
}
146+
147+
internalBinding('mksnapshot').cleanups.push(function cleanupStdout() {
148+
stdout._destroy = stdoutDestroy;
149+
stdout.destroy();
150+
process.removeListener('SIGWINCH', refreshStdoutOnSigWinch);
151+
stdout = undefined;
152+
});
134153
return stdout;
135154
}
136155

137156
function getStderr() {
138157
if (stderr) return stderr;
139158
stderr = createWritableStdioStream(2);
140159
stderr.destroySoon = stderr.destroy;
160+
stderrDestroy = stderr._destroy;
141161
// Override _destroy so that the fd is never actually closed.
142162
stderr._destroy = dummyDestroy;
143163
if (stderr.isTTY) {
144-
process.on('SIGWINCH', () => stderr._refreshSize());
164+
process.on('SIGWINCH', refreshStderrOnSigWinch);
145165
}
166+
internalBinding('mksnapshot').cleanups.push(function cleanupStderr() {
167+
stderr._destroy = stderrDestroy;
168+
stderr.destroy();
169+
process.removeListener('SIGWINCH', refreshStderrOnSigWinch);
170+
stderr = undefined;
171+
});
146172
return stderr;
147173
}
148174

@@ -233,6 +259,10 @@ function getStdin() {
233259
}
234260
}
235261

262+
internalBinding('mksnapshot').cleanups.push(function cleanupStdin() {
263+
stdin.destroy();
264+
stdin = undefined;
265+
});
236266
return stdin;
237267
}
238268

‎lib/internal/console/constructor.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,15 @@ Console.prototype.dirxml = Console.prototype.log;
669669
Console.prototype.error = Console.prototype.warn;
670670
Console.prototype.groupCollapsed = Console.prototype.group;
671671

672+
function initializeGlobalConsole(globalConsole) {
673+
globalConsole[kBindStreamsLazy](process);
674+
globalConsole[kBindProperties](true, 'auto');
675+
}
676+
672677
module.exports = {
673678
Console,
674679
kBindStreamsLazy,
675680
kBindProperties,
681+
initializeGlobalConsole,
676682
formatTime // exported for tests
677683
};

‎lib/internal/console/global.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ const {
2121
} = primordials;
2222

2323
const {
24-
Console,
25-
kBindStreamsLazy,
26-
kBindProperties
24+
Console
2725
} = require('internal/console/constructor');
2826

2927
const globalConsole = ObjectCreate({});
@@ -44,9 +42,6 @@ for (const prop of ReflectOwnKeys(Console.prototype)) {
4442
ReflectDefineProperty(globalConsole, prop, desc);
4543
}
4644

47-
globalConsole[kBindStreamsLazy](process);
48-
globalConsole[kBindProperties](true, 'auto');
49-
5045
// This is a legacy feature - the Console constructor is exposed on
5146
// the global console instance.
5247
globalConsole.Console = Console;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL