@agoric/swingset-vat 0.32.3-dev-82cced2.0 → 0.32.3-dev-354c092.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-82cced2.0+82cced2",
+  "version": "0.32.3-dev-354c092.0+354c092",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,17 +27,17 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-82cced2.0+82cced2",
-    "@agoric/internal": "0.3.3-dev-82cced2.0+82cced2",
-    "@agoric/kmarshal": "0.1.1-dev-82cced2.0+82cced2",
-    "@agoric/store": "0.9.3-dev-82cced2.0+82cced2",
-    "@agoric/swing-store": "0.9.2-dev-82cced2.0+82cced2",
-    "@agoric/swingset-liveslots": "0.10.3-dev-82cced2.0+82cced2",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-82cced2.0+82cced2",
-    "@agoric/time": "0.3.3-dev-82cced2.0+82cced2",
-    "@agoric/vat-data": "0.5.3-dev-82cced2.0+82cced2",
-    "@agoric/xsnap": "0.14.3-dev-82cced2.0+82cced2",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-82cced2.0+82cced2",
+    "@agoric/assert": "0.6.1-dev-354c092.0+354c092",
+    "@agoric/internal": "0.3.3-dev-354c092.0+354c092",
+    "@agoric/kmarshal": "0.1.1-dev-354c092.0+354c092",
+    "@agoric/store": "0.9.3-dev-354c092.0+354c092",
+    "@agoric/swing-store": "0.9.2-dev-354c092.0+354c092",
+    "@agoric/swingset-liveslots": "0.10.3-dev-354c092.0+354c092",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-354c092.0+354c092",
+    "@agoric/time": "0.3.3-dev-354c092.0+354c092",
+    "@agoric/vat-data": "0.5.3-dev-354c092.0+354c092",
+    "@agoric/xsnap": "0.14.3-dev-354c092.0+354c092",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-354c092.0+354c092",
     "@endo/base64": "^0.2.34",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 75.26
   },
-  "gitHead": "82cced2187816b38afb7f21b474de1517b4f7422"
+  "gitHead": "354c09254ac91e9dc97ca97f6bef291b2cafabb6"
 }

package/src/controller/controller.js

@@ -103,6 +103,8 @@ function unhandledRejectionHandler(e, pr) {
  *   kernelBundle?: Bundle
  *   xsnapBundleData?: ReturnType<import('./bundle-handler.js').makeXsnapBundleData>,
  *   bundleHandler?: import('./bundle-handler.js').BundleHandler,
+ *   profileVats?: string[],
+ *   debugVats?: string[],
  * }} runtimeOptions
  */
 export async function makeSwingsetController(
@@ -126,6 +128,8 @@ export async function makeSwingsetController(
     warehousePolicy = {},
     overrideVatManagerOptions = {},
     xsnapBundleData = makeXsnapBundleData(),
+    profileVats = [],
+    debugVats = [],
   } = runtimeOptions;
   const {
     bundleHandler = makeWorkerBundleHandler(
@@ -146,9 +150,13 @@ export async function makeSwingsetController(
     tmpName,
     debug: !!env.XSNAP_DEBUG,
     workerTraceRootPath: env.XSNAP_TEST_RECORD,
+    profileVats,
+    debugVats,
   });
   const startSubprocessWorkerNode = makeStartSubprocessWorkerNode(
     startSubprocessWorker,
+    profileVats,
+    debugVats,
   );
 
   function writeSlogObject(obj) {

package/src/controller/startNodeSubprocess.js

@@ -1,13 +1,27 @@
 import process from 'process';
 
-export function makeStartSubprocessWorkerNode(startSubprocessWorker) {
+export function makeStartSubprocessWorkerNode(
+  startSubprocessWorker,
+  profileVats,
+  debugVats,
+) {
   // launch a worker in a subprocess (which runs Node.js)
-  function startSubprocessWorkerNode(nameDisplayArg, nodeOptions) {
+  function startSubprocessWorkerNode(nameDisplayArg, vatID, nodeOptions) {
     const supervisorCodePath = new URL(
       '../supervisors/subprocess-node/supervisor-subprocess-node.js',
       import.meta.url,
     ).pathname;
     const args = nodeOptions ? [...nodeOptions] : [];
+    if (profileVats.includes(vatID)) {
+      args.push('--cpu-prof');
+      args.push('--cpu-prof-interval');
+      args.push('100');
+      args.push('--cpu-prof-name');
+      args.push(`CPU.${nameDisplayArg}.cpuprofile`);
+    }
+    if (debugVats.includes(vatID)) {
+      args.push('--inspect-brk');
+    }
     args.push(supervisorCodePath);
     args.push(nameDisplayArg);
     return startSubprocessWorker(process.execPath, args);

package/src/controller/startXSnap.js

@@ -41,6 +41,8 @@ const NETSTRING_MAX_CHUNK_SIZE = 12_000_000;
  *   debug?: boolean,
  *   workerTraceRootPath?: string,
  *   overrideBundles?: import('../types-external.js').Bundle[],
+ *   profileVats?: string[],
+ *   debugVats?: string[],
  * }} options
  */
 export function makeStartXSnap(options) {
@@ -54,6 +56,8 @@ export function makeStartXSnap(options) {
     snapStore,
     workerTraceRootPath,
     overrideBundles,
+    profileVats = [],
+    debugVats = [],
     debug = false,
   } = options;
 
@@ -123,6 +127,7 @@ export function makeStartXSnap(options) {
    * @param {string} name
    * @param {object} details
    * @param {import('../types-external.js').BundleID[]} details.bundleIDs
+   * @param {string} details.vatID
    * @param {(request: Uint8Array) => Promise<Uint8Array>} details.handleCommand
    * @param {boolean} [details.metered]
    * @param {StartXSnapInitDetails} [details.init]
@@ -131,11 +136,18 @@ export function makeStartXSnap(options) {
     name,
     {
       bundleIDs,
+      vatID,
       handleCommand,
       metered,
       init: initDetails = { from: 'bundles' },
     },
   ) {
+    if (profileVats.includes(vatID)) {
+      Fail`startXSnap: not yet supporting profiling for vat ${vatID}`;
+    }
+    if (debugVats.includes(vatID)) {
+      Fail`startXSnap: not yet supporting debugging for vat ${vatID}`;
+    }
     const meterOpts = metered ? {} : { meteringLimit: 0 };
     const snapshotLoadOpts = getSnapshotLoadOptions(initDetails);
     await null;

package/src/kernel/vat-loader/manager-subprocess-node.js

@@ -30,14 +30,15 @@ export function makeNodeSubprocessFactory(tools) {
       Fail`nodeOptions must be an array`;
 
     // Node worker subprocess adds `nameDisplayArg` as a dummy argument so that
-    // 'ps'shows which worker is for which vat
+    // 'ps' shows which worker is for which vat
     const nameDisplayArg = `${vatID}:${name !== undefined ? name : ''}`;
 
     const mk = makeManagerKit();
 
     // start the worker and establish a connection
-    const { fromChild, toChild, terminate, done } = startSubprocessWorker(
+    const { fromChild, toChild, done } = startSubprocessWorker(
       nameDisplayArg,
+      vatID,
       nodeOptions,
     );
 
@@ -107,7 +108,8 @@ export function makeNodeSubprocessFactory(tools) {
     sendToWorker(['setBundle', vatID, bundle, liveSlotsOptions]);
 
     function shutdown() {
-      terminate();
+      // terminate(); // XXX currently disabled since it breaks profiling; we should revisit if we develop a problem with worker vat processes refusing to exit when requested to do so
+      sendToWorker(['exit']);
       return E.when(done, _ => undefined);
     }
     const manager = mk.getManager(shutdown);

package/src/kernel/vat-loader/manager-subprocess-xsnap.js

@@ -143,6 +143,7 @@ export function makeXsSubprocessFactory({
     // start the worker and establish a connection
     let worker = await startXSnap(nameDisplayArg, {
       bundleIDs,
+      vatID,
       handleCommand: handleCommandKit.handleCommand,
       metered,
       init: snapshotInfo && { from: 'snapStore', vatID },
@@ -258,6 +259,7 @@ export function makeXsSubprocessFactory({
       [worker, snapshotResults] = await Promise.all([
         startXSnap(nameDisplayArg, {
           bundleIDs,
+          vatID,
           handleCommand: handleCommandKit.handleCommand,
           metered,
           init: {

package/src/supervisors/subprocess-node/supervisor-subprocess-node.js

@@ -6,6 +6,7 @@ import '@endo/init';
 import anylogger from 'anylogger';
 import fs from 'fs';
 import { Buffer } from 'buffer';
+import process from 'node:process';
 
 import { assert, details as X, Fail } from '@agoric/assert';
 import { importBundle } from '@endo/import-bundle';
@@ -188,6 +189,9 @@ async function handleCommand(command) {
       return handleSetBundle(margs);
     case 'deliver':
       return handleDeliver(margs);
+    case 'exit':
+      process.exit(0);
+      break;
     default:
       throw Error(`unrecognized downlink message ${type}`);
   }

package/src/vats/timer/vat-timer.js

@@ -20,12 +20,12 @@ import { TimeMath } from '@agoric/time';
 // client). Everything else should remain in the DB.
 
 /**
- * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- * @typedef {import('@agoric/time/src/types').TimestampRecord} TimestampRecord
- * @typedef {import('@agoric/time/src/types').TimestampValue} TimestampValue
- * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime
- * @typedef {import('@agoric/time/src/types').RelativeTimeValue} RelativeTimeValue
- * @typedef {import('@agoric/time/src/types').TimerService} TimerService
+ * @typedef {import('@agoric/time').Timestamp} Timestamp
+ * @typedef {import('@agoric/time').TimestampRecord} TimestampRecord
+ * @typedef {import('@agoric/time').TimestampValue} TimestampValue
+ * @typedef {import('@agoric/time').RelativeTime} RelativeTime
+ * @typedef {import('@agoric/time').RelativeTimeValue} RelativeTimeValue
+ * @typedef {import('@agoric/time').TimerService} TimerService
  *
  * @typedef {object} Handler
  * Handler is a user-provided Far object with .wake(time) used for callbacks

package/tools/manual-timer.js

@@ -6,8 +6,8 @@ import { TimeMath } from '@agoric/time';
 import { buildRootObject } from '../src/vats/timer/vat-timer.js';
 
 /**
- * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- * @typedef {import('@agoric/time/src/types').TimerService} TimerService
+ * @typedef {import('@agoric/time').Timestamp} Timestamp
+ * @typedef {import('@agoric/time').TimerService} TimerService
  * @typedef {import('../src/devices/timer/device-timer.js').Waker} Waker
  *
  * @typedef {object} ManualTimerCallbacks