fixup! build: speed up startup with V8 code cache

nodejs · joyeecheung · Jun 18, 2018 · Jun 25, 2018 · Jun 25, 2018 · Jun 25, 2018
commit 30a3827b729080ec8069c710ed9266e1f5c24f4d
diff --git a/lib/internal/bootstrap/cache.js b/lib/internal/bootstrap/cache.js
@@ -0,0 +1,30 @@
+'use strict';
+
+// This is only exposed for internal build steps and testing purposes.
+// We create new copies of the source and the code cache
+// so the resources eventually used to compile builtin modules
+// cannot be tampered with even with --expose-internals
+
+const {
+  NativeModule, internalBinding
+} = require('internal/bootstrap/loaders');
+
+module.exports = {
+  builtinSource: Object.assign({}, NativeModule._source),
+  codeCache: internalBinding('code_cache'),
+  compiledWithoutCache: NativeModule.compiledWithoutCache,
+  compiledWithCache: NativeModule.compiledWithCache,
+  nativeModuleWrap(script) {
+    return NativeModule.wrap(script);
+  },
+  // Modules with source code compiled in js2c that
+  // cannot be compiled with the code cache
+  cannotUseCache: [
+    'config',
+    // TODO(joyeecheung): update the C++ side so that
+    // the code cache is also used when compiling these
+    // two files.
+    'internal/bootstrap/loaders',
+    'internal/bootstrap/node'
+  ]
+};
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -126,53 +126,19 @@
   const config = getBinding('config');
 
   const codeCache = getInternalBinding('code_cache');
-  const compiledWithoutCache = [];
-  const compiledWithCache = [];
+  const compiledWithoutCache = NativeModule.compiledWithoutCache = [];
+  const compiledWithCache = NativeModule.compiledWithCache = [];
 
   // Think of this as module.exports in this file even though it is not
   // written in CommonJS style.
   const loaderExports = { internalBinding, NativeModule };
   const loaderId = 'internal/bootstrap/loaders';
 
-  // This is only exposed for internal build steps and testing purposes.
-  // We create new copies of the source and the code cache
-  // so the resources eventually used to compile builtin modules
-  // cannot be tampered with even with --expose-internals
-  const cacheExports = {
-    get builtinSource() {
-      return getBinding('natives');
-    },
-    get codeCache() {
-      return getInternalBinding('code_cache');
-    },
-    compiledWithoutCache,
-    compiledWithCache,
-    nativeModuleWrap(script) {
-      return NativeModule.wrap(script);
-    },
-    // Modules with source code compiled in js2c that
-    // cannot be compiled with the code cache
-    cannotUseCache: [
-      'config',
-      'internal/bootstrap/cache',
-      // TODO(joyeecheung): update the C++ side so that
-      // the code cache is also used when compiling these
-      // two files.
-      'internal/bootstrap/loaders',
-      'internal/bootstrap/node'
-    ]
-  };
-  const cacheId = 'internal/bootstrap/cache';
-
   NativeModule.require = function(id) {
     if (id === loaderId) {
       return loaderExports;
     }
 
-    if (id === cacheId) {
-      return cacheExports;
-    }
-
     const cached = NativeModule.getCached(id);
     if (cached && (cached.loaded || cached.loading)) {
       return cached.exports;
@@ -223,7 +189,7 @@
       if (id === loaderId) {
         return false;
       }
-      return id === cacheId || NativeModule.exists(id);
+      return NativeModule.exists(id);
     };
 
     NativeModule.isInternal = function(id) {

diff --git a/node.gyp b/node.gyp
@@ -25,6 +25,7 @@
     'node_lib_target_name%': 'node_lib',
     'node_intermediate_lib_type%': 'static_library',
     'library_files': [
+      'lib/internal/bootstrap/cache.js',
       'lib/internal/bootstrap/loaders.js',
       'lib/internal/bootstrap/node.js',
       'lib/async_hooks.js',