GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bootstrap: merge main thread and worker thread initializations · nodejs/node@2ee3d81

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal
- main
  - worker_thread.js
- process
  - pre_execution.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/main/worker_thread.js‎`

Copy file name to clipboardExpand all lines: lib/internal/main/worker_thread.js

+10-52Lines changed: 10 additions & 52 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,24 +14,8 @@ const {`
`14`	`14`	`} = primordials;`
`15`	`15`
`16`	`16`	`const {`
`17`		`- patchProcessObject,`
`18`		`- setupCoverageHooks,`
`19`		`- setupInspectorHooks,`
`20`		`- setupWarningHandler,`
`21`		`- setupFetch,`
`22`		`- setupWebCrypto,`
`23`		`- setupCustomEvent,`
`24`		`- setupDebugEnv,`
`25`		`- setupPerfHooks,`
`26`		`- initializeDeprecations,`
`27`		`- initializeWASI,`
`28`		`- initializeCJSLoader,`
`29`		`- initializeESMLoader,`
`30`		`- initializeFrozenIntrinsics,`
`31`		`- initializeReport,`
`32`		`- initializeSourceMapsHandlers,`
`33`		`- loadPreloadModules,`
`34`		`- setupTraceCategoryState,`
	`17`	`+ prepareWorkerThreadExecution,`
	`18`	`+ setupUserModules,`
`35`	`19`	`markBootstrapComplete`
`36`	`20`	`} = require('internal/process/pre_execution');`
`37`	`21`
`@@ -60,28 +44,13 @@ const {`
`60`	`44`	`onGlobalUncaughtException`
`61`	`45`	`} = require('internal/process/execution');`
`62`	`46`
`63`		`-const publicWorker = require('worker_threads');`
`64`	`47`	`let debug = require('internal/util/debuglog').debuglog('worker', (fn) => {`
`65`	`48`	`debug = fn;`
`66`	`49`	`});`
`67`	`50`
`68`	`51`	`const assert = require('internal/assert');`
`69`	`52`
`70`		`-patchProcessObject();`
`71`		`-setupInspectorHooks();`
`72`		`-setupDebugEnv();`
`73`		`-`
`74`		`-setupWarningHandler();`
`75`		`-setupFetch();`
`76`		`-setupWebCrypto();`
`77`		`-setupCustomEvent();`
`78`		`-initializeSourceMapsHandlers();`
`79`		`-`
`80`		`-// Since worker threads cannot switch cwd, we do not need to`
`81`		`-// overwrite the process.env.NODE_V8_COVERAGE variable.`
`82`		`-if (process.env.NODE_V8_COVERAGE) {`
`83`		`- setupCoverageHooks(process.env.NODE_V8_COVERAGE);`
`84`		`-}`
	`53`	`+prepareWorkerThreadExecution();`
`85`	`54`
`86`	`55`	debug(`[${threadId}] is setting up worker child environment`);
`87`	`56`
`@@ -126,23 +95,11 @@ port.on('message', (message) => {`
`126`	`95`	`hasStdin`
`127`	`96`	`} = message;`
`128`	`97`
`129`		`- setupTraceCategoryState();`
`130`		`- setupPerfHooks();`
`131`		`- initializeReport();`
`132`		`- if (manifestSrc) {`
`133`		`- require('internal/process/policy').setup(manifestSrc, manifestURL);`
`134`		`- }`
`135`		`- initializeDeprecations();`
`136`		`- initializeWASI();`
`137`		`-`
`138`		`- require('internal/dns/utils').initializeDns();`
`139`		`-`
`140`		`- initializeCJSLoader();`
`141`		`- initializeESMLoader();`
`142`		`-`
`143`	`98`	`if (argv !== undefined) {`
`144`	`99`	`ArrayPrototypePushApply(process.argv, argv);`
`145`	`100`	`}`
	`101`	`+`
	`102`	`+ const publicWorker = require('worker_threads');`
`146`	`103`	`publicWorker.parentPort = publicPort;`
`147`	`104`	`publicWorker.workerData = workerData;`
`148`	`105`
`@@ -164,10 +121,10 @@ port.on('message', (message) => {`
`164`	`121`	`};`
`165`	`122`	`workerIo.sharedCwdCounter = cwdCounter;`
`166`	`123`
`167`		`- const CJSLoader = require('internal/modules/cjs/loader');`
`168`		`- assert(!CJSLoader.hasLoadedAnyUserCJSModule);`
`169`		`- loadPreloadModules();`
`170`		`- initializeFrozenIntrinsics();`
	`124`	`+ if (manifestSrc) {`
	`125`	`+ require('internal/process/policy').setup(manifestSrc, manifestURL);`
	`126`	`+ }`
	`127`	`+ setupUserModules();`
`171`	`128`
`172`	`129`	`if (!hasStdin)`
`173`	`130`	`process.stdin.push(null);`
`@@ -198,6 +155,7 @@ port.on('message', (message) => {`
`198`	`155`	`// runMain here might be monkey-patched by users in --require.`
`199`	`156`	`// XXX: the monkey-patchability here should probably be deprecated.`
`200`	`157`	`ArrayPrototypeSplice(process.argv, 1, 0, filename);`
	`158`	`+ const CJSLoader = require('internal/modules/cjs/loader');`
`201`	`159`	`CJSLoader.Module.runMain(filename);`
`202`	`160`	`}`
`203`	`161`	`} else if (message.type === STDIO_PAYLOAD) {`

Collapse file

`‎lib/internal/process/pre_execution.js‎`

Copy file name to clipboardExpand all lines: lib/internal/process/pre_execution.js

+61-54Lines changed: 61 additions & 54 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,26 @@ const {`
`33`	`33`	`isBuildingSnapshot,`
`34`	`34`	`} = require('v8').startupSnapshot;`
`35`	`35`
`36`		`-function prepareMainThreadExecution(expandArgv1 = false,`
`37`		`- initialzeModules = true) {`
`38`		`- refreshRuntimeOptions();`
	`36`	`+function prepareMainThreadExecution(expandArgv1 = false, initialzeModules = true) {`
	`37`	`+ prepareExecution({`
	`38`	`+ expandArgv1,`
	`39`	`+ initialzeModules,`
	`40`	`+ isMainThread: true`
	`41`	`+ });`
	`42`	`+}`
	`43`	`+`
	`44`	`+function prepareWorkerThreadExecution() {`
	`45`	`+ prepareExecution({`
	`46`	`+ expandArgv1: false,`
	`47`	`+ initialzeModules: false, // Will need to initialize it after policy setup`
	`48`	`+ isMainThread: false`
	`49`	`+ });`
	`50`	`+}`
`39`	`51`
`40`		`- // TODO(joyeecheung): this is also necessary for workers when they deserialize`
`41`		`- // this toggle from the snapshot.`
	`52`	`+function prepareExecution(options) {`
	`53`	`+ const { expandArgv1, initialzeModules, isMainThread } = options;`
	`54`	`+`
	`55`	`+ refreshRuntimeOptions();`
`42`	`56`	`reconnectZeroFillToggle();`
`43`	`57`
`44`	`58`	`// Patch the process object with legacy properties and normalizations`
`@@ -60,48 +74,57 @@ function prepareMainThreadExecution(expandArgv1 = false,`
`60`	`74`	`}`
`61`	`75`
`62`	`76`	`setupDebugEnv();`
`63`		`-`
`64`		- // Print stack trace on `SIGINT` if option `--trace-sigint` presents.
`65`		`- setupStacktracePrinterOnSigint();`
`66`		`-`
`67`	`77`	`// Process initial diagnostic reporting configuration, if present.`
`68`	`78`	`initializeReport();`
`69`		`- initializeReportSignalHandlers(); // Main-thread-only.`
`70`		`-`
`71`		`- initializeHeapSnapshotSignalHandlers();`
`72`		`-`
`73`		`- // If the process is spawned with env NODE_CHANNEL_FD, it's probably`
`74`		`- // spawned by our child_process module, then initialize IPC.`
`75`		`- // This attaches some internal event listeners and creates:`
`76`		`- // process.send(), process.channel, process.connected,`
`77`		`- // process.disconnect().`
`78`		`- setupChildProcessIpcChannel();`
`79`		`-`
`80`		`- // Load policy from disk and parse it.`
`81`		`- initializePolicy();`
`82`		`-`
`83`		`- // If this is a worker in cluster mode, start up the communication`
`84`		`- // channel. This needs to be done before any user code gets executed`
`85`		`- // (including preload modules).`
`86`		`- initializeClusterIPC();`
`87`		`-`
`88`	`79`	`initializeSourceMapsHandlers();`
`89`	`80`	`initializeDeprecations();`
`90`	`81`	`initializeWASI();`
`91`		`-`
`92`	`82`	`require('internal/dns/utils').initializeDns();`
`93`	`83`
`94`		`- require('internal/v8/startup_snapshot').runDeserializeCallbacks();`
	`84`	`+ if (isMainThread) {`
	`85`	`+ assert(internalBinding('worker').isMainThread);`
	`86`	`+ // Worker threads will get the manifest in the message handler.`
	`87`	`+ const policy = readPolicyFromDisk();`
	`88`	`+ if (policy) {`
	`89`	`+ require('internal/process/policy')`
	`90`	`+ .setup(policy.manifestSrc, policy.manifestURL);`
	`91`	`+ }`
`95`	`92`
`96`		`- if (!initialzeModules) {`
`97`		`- return;`
	`93`	+ // Print stack trace on `SIGINT` if option `--trace-sigint` presents.
	`94`	`+ setupStacktracePrinterOnSigint();`
	`95`	`+ initializeReportSignalHandlers(); // Main-thread-only.`
	`96`	`+ initializeHeapSnapshotSignalHandlers();`
	`97`	`+ // If the process is spawned with env NODE_CHANNEL_FD, it's probably`
	`98`	`+ // spawned by our child_process module, then initialize IPC.`
	`99`	`+ // This attaches some internal event listeners and creates:`
	`100`	`+ // process.send(), process.channel, process.connected,`
	`101`	`+ // process.disconnect().`
	`102`	`+ setupChildProcessIpcChannel();`
	`103`	`+ // If this is a worker in cluster mode, start up the communication`
	`104`	`+ // channel. This needs to be done before any user code gets executed`
	`105`	`+ // (including preload modules).`
	`106`	`+ initializeClusterIPC();`
	`107`	`+`
	`108`	`+ // TODO(joyeecheung): do this for worker threads as well.`
	`109`	`+ require('internal/v8/startup_snapshot').runDeserializeCallbacks();`
	`110`	`+ } else {`
	`111`	`+ assert(!internalBinding('worker').isMainThread);`
	`112`	`+ // The setup should be called in LOAD_SCRIPT message handler.`
	`113`	`+ assert(!initialzeModules);`
	`114`	`+ }`
	`115`	`+`
	`116`	`+ if (initialzeModules) {`
	`117`	`+ setupUserModules();`
`98`	`118`	`}`
	`119`	`+}`
`99`	`120`
	`121`	`+function setupUserModules() {`
`100`	`122`	`initializeCJSLoader();`
`101`	`123`	`initializeESMLoader();`
`102`	`124`	`const CJSLoader = require('internal/modules/cjs/loader');`
`103`	`125`	`assert(!CJSLoader.hasLoadedAnyUserCJSModule);`
`104`	`126`	`loadPreloadModules();`
	`127`	`+ // Need to be done after --require setup.`
`105`	`128`	`initializeFrozenIntrinsics();`
`106`	`129`	`}`
`107`	`130`
`@@ -476,7 +499,7 @@ function initializeClusterIPC() {`
`476`	`499`	`}`
`477`	`500`	`}`
`478`	`501`
`479`		`-function initializePolicy() {`
	`502`	`+function readPolicyFromDisk() {`
`480`	`503`	`const experimentalPolicy = getOptionValue('--experimental-policy');`
`481`	`504`	`if (experimentalPolicy) {`
`482`	`505`	`process.emitWarning('Policies are experimental.',`
`@@ -520,8 +543,9 @@ function initializePolicy() {`
`520`	`543`	`throw new ERR_MANIFEST_ASSERT_INTEGRITY(manifestURL, realIntegrities);`
`521`	`544`	`}`
`522`	`545`	`}`
`523`		`- require('internal/process/policy')`
`524`		`- .setup(src, manifestURL.href);`
	`546`	`+ return {`
	`547`	`+ manifestSrc: src, manifestURL: manifestURL.href`
	`548`	`+ };`
`525`	`549`	`}`
`526`	`550`	`}`
`527`	`551`
`@@ -603,25 +627,8 @@ function markBootstrapComplete() {`
`603`	`627`	`}`
`604`	`628`
`605`	`629`	`module.exports = {`
`606`		`- refreshRuntimeOptions,`
`607`		`- patchProcessObject,`
`608`		`- setupCoverageHooks,`
`609`		`- setupWarningHandler,`
`610`		`- setupFetch,`
`611`		`- setupWebCrypto,`
`612`		`- setupCustomEvent,`
`613`		`- setupDebugEnv,`
`614`		`- setupPerfHooks,`
	`630`	`+ setupUserModules,`
`615`	`631`	`prepareMainThreadExecution,`
`616`		`- initializeDeprecations,`
`617`		`- initializeESMLoader,`
`618`		`- initializeFrozenIntrinsics,`
`619`		`- initializeSourceMapsHandlers,`
`620`		`- loadPreloadModules,`
`621`		`- setupTraceCategoryState,`
`622`		`- setupInspectorHooks,`
`623`		`- initializeReport,`
`624`		`- initializeCJSLoader,`
`625`		`- initializeWASI,`
	`632`	`+ prepareWorkerThreadExecution,`
`626`	`633`	`markBootstrapComplete`
`627`	`634`	`};`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.