@agoric/swingset-vat 0.32.3-dev-5ec590e.0.5ec590e → 0.32.3-dev-d1bb9cd.0.d1bb9cd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-5ec590e.0.5ec590e",
+  "version": "0.32.3-dev-d1bb9cd.0.d1bb9cd",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -22,7 +22,7 @@
     "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/xsnap": "0.14.3-dev-5ec590e.0.5ec590e",
+    "@agoric/xsnap": "0.14.3-dev-d1bb9cd.0.d1bb9cd",
     "@types/better-sqlite3": "^7.6.13",
     "@types/microtime": "^2.1.0",
     "@types/tmp": "^0.2.0",
@@ -30,15 +30,15 @@
     "ava": "^6.4.1"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-5ec590e.0.5ec590e",
-    "@agoric/kmarshal": "0.1.1-dev-5ec590e.0.5ec590e",
-    "@agoric/store": "0.9.3-dev-5ec590e.0.5ec590e",
-    "@agoric/swing-store": "0.9.2-dev-5ec590e.0.5ec590e",
-    "@agoric/swingset-liveslots": "0.10.3-dev-5ec590e.0.5ec590e",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-5ec590e.0.5ec590e",
-    "@agoric/time": "0.3.3-dev-5ec590e.0.5ec590e",
-    "@agoric/vat-data": "0.5.3-dev-5ec590e.0.5ec590e",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-5ec590e.0.5ec590e",
+    "@agoric/internal": "0.3.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/kmarshal": "0.1.1-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/store": "0.9.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/swing-store": "0.9.2-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/time": "0.3.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/vat-data": "0.5.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-d1bb9cd.0.d1bb9cd",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
@@ -113,5 +113,5 @@
   "typeCoverage": {
     "atLeast": 76.72
   },
-  "gitHead": "5ec590e7aa787c5d8fb778a7cf14ec68f252fb83"
+  "gitHead": "d1bb9cd8ec3f764f64cda4b331c66e37ad179a73"
 }

package/src/controller/controller.js

@@ -177,6 +177,15 @@ export async function makeSwingsetController(
     ),
   } = runtimeOptions;
 
+  const shouldProfileStartup = env.SWINGSET_STARTUP_PROFILE === '1';
+  /** @type {Array<{ label: string, ms: number }>} */
+  const startupPhases = [];
+  const noteStartupPhase = (label, ms) => {
+    if (shouldProfileStartup) {
+      startupPhases.push({ label, ms });
+    }
+  };
+
   if (typeof Compartment === 'undefined') {
     throw Error('SES must be installed before calling makeSwingsetController');
   }
@@ -307,7 +316,17 @@ export async function makeSwingsetController(
     const kernelBundle = await slogDuration(
       ['bundle-kernel-start', 'bundle-kernel-finish'],
       {},
-      async () => runtimeOptions.kernelBundle ?? buildKernelBundle(),
+      async () => {
+        await null;
+        const t0 = performance.now();
+        const resolved =
+          (await runtimeOptions.kernelBundle) ?? (await buildKernelBundle());
+        noteStartupPhase(
+          'controller.buildKernelBundle',
+          performance.now() - t0,
+        );
+        return resolved;
+      },
     );
 
     // FIXME: Put this somewhere better.
@@ -327,6 +346,7 @@ export async function makeSwingsetController(
       ['import-kernel-start', 'import-kernel-finish'],
       {},
       async () => {
+        const t0 = performance.now();
         const kernelNS = await importBundle(kernelBundle, {
           filePrefix: 'kernel/...',
           endowments: {
@@ -341,12 +361,17 @@ export async function makeSwingsetController(
             Base64: globalThis.Base64, // Available only on XSnap
           },
         });
+        noteStartupPhase(
+          'controller.importKernelBundle',
+          performance.now() - t0,
+        );
         return /** @type {typeof kernelDefault} */ (kernelNS.default);
       },
     );
 
     const kernelEndowments = {
       waitUntilQuiescent,
+      now: () => performance.now(),
       kernelStorage,
       debugPrefix,
       // all vats get these in their global scope, plus a vat-specific 'console'
@@ -366,6 +391,7 @@ export async function makeSwingsetController(
       verbose,
       warehousePolicy,
       overrideVatManagerOptions,
+      startupProfiler: noteStartupPhase,
     };
 
     const kernel = buildKernel(
@@ -374,7 +400,11 @@ export async function makeSwingsetController(
       kernelRuntimeOptions,
     );
 
-    await kernel.start();
+    {
+      const t0 = performance.now();
+      await kernel.start();
+      noteStartupPhase('controller.kernel.start', performance.now() - t0);
+    }
 
     /**
      * Validate and install a code bundle.
@@ -615,6 +645,14 @@ export async function makeSwingsetController(
       },
     });
   });
+  if (shouldProfileStartup) {
+    const rows = startupPhases
+      .sort((a, b) => b.ms - a.ms)
+      .map(({ label, ms }) => `${label}=${ms.toFixed(1)}ms`)
+      .join(', ');
+    // Use ambient console so profiling output is visible regardless of logger levels.
+    console.error(`startup-profile: ${rows}`);
+  }
 
   return controller;
 }

package/src/kernel/kernel.js

@@ -160,6 +160,7 @@ export default function buildKernel(
 ) {
   const {
     waitUntilQuiescent,
+    now = () => 0,
     kernelStorage,
     debugPrefix,
     vatEndowments,
@@ -179,7 +180,11 @@ export default function buildKernel(
     verbose,
     warehousePolicy,
     overrideVatManagerOptions = {},
+    startupProfiler = undefined,
   } = kernelRuntimeOptions;
+  const noteStartupPhase = (label, ms) => {
+    startupProfiler && startupProfiler(label, ms);
+  };
   const logStartup = verbose ? console.debug : () => {};
   if (verbose) kdebugEnable(true);
 
@@ -1844,7 +1849,11 @@ export default function buildKernel(
 
     kernelKeeper.loadStats();
 
-    await vatWarehouse.start(logStartup);
+    {
+      const t0 = now();
+      await vatWarehouse.start(logStartup);
+      noteStartupPhase('kernel.vatWarehouse.start', now() - t0);
+    }
 
     // the admin device is endowed directly by the kernel
     deviceEndowments.vatAdmin = {
@@ -1863,6 +1872,7 @@ export default function buildKernel(
     // instantiate all devices
     for (const [name, deviceID] of kernelKeeper.getDevices()) {
       logStartup(`starting device ${name} as ${deviceID}`);
+      const deviceStart = now();
       const deviceKeeper = kernelKeeper.allocateDeviceKeeperIfNeeded(deviceID);
       const { source, options } = deviceKeeper.getSourceAndOptions();
       assert(source.bundleID);
@@ -1870,6 +1880,7 @@ export default function buildKernel(
       const { deviceParameters = {}, unendowed } = options;
       const devConsole = makeConsole(`${debugPrefix}SwingSet:dev-${name}`);
 
+      const bundleLoadStart = now();
       const bundle = kernelKeeper.getBundle(source.bundleID);
       assert(bundle);
       const NS = await importBundle(bundle, {
@@ -1881,6 +1892,10 @@ export default function buildKernel(
           assert: globalThis.assert,
         }),
       });
+      noteStartupPhase(
+        `kernel.device.${name}.importBundle`,
+        now() - bundleLoadStart,
+      );
 
       if (deviceEndowments[name] || unendowed) {
         const translators = makeDeviceTranslators(deviceID, name, kernelKeeper);
@@ -1921,6 +1936,7 @@ export default function buildKernel(
           `WARNING: skipping device ${deviceID} (${name}) because it has no endowments`,
         );
       }
+      noteStartupPhase(`kernel.device.${name}.total`, now() - deviceStart);
     }
 
     // attach vat-admin device hooks

package/src/kernel/vat-warehouse.js

@@ -266,8 +266,11 @@ export function makeVatWarehouse({
   panic,
   warehousePolicy,
 }) {
-  const { maxVatsOnline = 50, restartWorkerOnSnapshot = true } =
-    warehousePolicy || {};
+  const {
+    maxVatsOnline = 50,
+    maxPreloadVats = maxVatsOnline / 2,
+    restartWorkerOnSnapshot = true,
+  } = warehousePolicy || {};
   // Often a large contract evaluation is among the first few deliveries,
   // so let's do a snapshot after just a few deliveries.
   const snapshotInitial = kernelKeeper.getSnapshotInitial();
@@ -430,7 +433,7 @@ export function makeVatWarehouse({
   /** @param {typeof console.log} logStartup */
   async function start(logStartup) {
     const recreate = true; // note: PANIC on failure to recreate
-    const maxPreload = maxVatsOnline / 2;
+    const maxPreload = maxPreloadVats;
     let numPreloaded = 0;
 
     // NOTE: OPTIMIZATION OPPORTUNITY: replay vats in parallel

package/src/types-external.js

@@ -320,6 +320,7 @@ export {};
 /**
  * @typedef {object} VatWarehousePolicy
  * @property { number } [maxVatsOnline]     Limit the number of simultaneous workers
+ * @property { number } [maxPreloadVats]    Limit the number of vats preloaded at startup
  * @property { boolean } [restartWorkerOnSnapshot]     Reload worker immediately upon snapshot creation
  */
 

package/tools/bundleTool.js

@@ -107,7 +107,9 @@ harden(defaultBundleToolEventSink);
 const inferLogPhase = args => {
   const joined = args.map(arg => String(arg)).join(' ');
   let phase = '[check]';
-  if (joined.includes(' add:') || joined.includes(' bundled ')) {
+  if (joined.includes(' add:')) {
+    phase = '[queue]';
+  } else if (joined.includes(' bundled ')) {
     phase = '[rebuilt]';
   }
   return phase;