@agoric/swingset-vat 0.32.3-dev-31be299.0 → 0.32.3-dev-84adeef.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-31be299.0+31be299",
+  "version": "0.32.3-dev-84adeef.0+84adeef",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-31be299.0+31be299",
-    "@agoric/kmarshal": "0.1.1-dev-31be299.0+31be299",
-    "@agoric/store": "0.9.3-dev-31be299.0+31be299",
-    "@agoric/swing-store": "0.9.2-dev-31be299.0+31be299",
-    "@agoric/swingset-liveslots": "0.10.3-dev-31be299.0+31be299",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-31be299.0+31be299",
-    "@agoric/time": "0.3.3-dev-31be299.0+31be299",
-    "@agoric/vat-data": "0.5.3-dev-31be299.0+31be299",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-31be299.0+31be299",
+    "@agoric/internal": "0.3.3-dev-84adeef.0+84adeef",
+    "@agoric/kmarshal": "0.1.1-dev-84adeef.0+84adeef",
+    "@agoric/store": "0.9.3-dev-84adeef.0+84adeef",
+    "@agoric/swing-store": "0.9.2-dev-84adeef.0+84adeef",
+    "@agoric/swingset-liveslots": "0.10.3-dev-84adeef.0+84adeef",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-84adeef.0+84adeef",
+    "@agoric/time": "0.3.3-dev-84adeef.0+84adeef",
+    "@agoric/vat-data": "0.5.3-dev-84adeef.0+84adeef",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-84adeef.0+84adeef",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 76.25
   },
-  "gitHead": "31be2992aec21c06633699b7d8095423845b0530"
+  "gitHead": "84adeefc52a0cf475a0dae8723ddd7b4fe54d483"
 }

package/src/controller/controller.js

@@ -425,8 +425,12 @@ export async function makeSwingsetController(
         return kernel.shutdown();
       },
 
-      reapAllVats() {
-        kernel.reapAllVats();
+      reapAllVats(previousVatPos) {
+        return kernel.reapAllVats(previousVatPos);
+      },
+
+      async snapshotAllVats() {
+        return kernel.snapshotAllVats();
       },
 
       changeKernelOptions(options) {

package/src/kernel/kernel.js

@@ -1946,15 +1946,63 @@ export default function buildKernel(
     }
   }
 
-  function reapAllVats() {
+  /** @returns {Generator<VatID>} */
+  function* getAllVatIds() {
     for (const [_, vatID] of kernelKeeper.getStaticVats()) {
-      kernelKeeper.scheduleReap(vatID);
+      yield vatID;
     }
     for (const vatID of kernelKeeper.getDynamicVats()) {
-      kernelKeeper.scheduleReap(vatID);
+      yield vatID;
     }
   }
 
+  function* getAllVatPosEntries() {
+    for (const vatID of getAllVatIds()) {
+      const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
+      yield /** @type {const} */ ([
+        vatID,
+        vatKeeper.getTranscriptEndPosition(),
+      ]);
+    }
+  }
+
+  function reapAllVats(previousVatPos = {}) {
+    /** @type {Record<string, number>} */
+    const currentVatPos = {};
+
+    for (const [vatID, endPos] of getAllVatPosEntries()) {
+      const vatUsesTranscript = endPos !== 0;
+      if (!vatUsesTranscript) {
+        // The comms vat is a little special. It doesn't use a transcript,
+        // doesn't implement BOYD, and is created with a never reap threshold.
+        //
+        // Here we conflate a vat that doesn't use a transcript with a vat
+        // that cannot reap. We do not bother checking the vat options because
+        // in tests we would actually like to force reap normal vats that may
+        // have been configured with a never threshold.
+        continue;
+      } else if ((previousVatPos[vatID] ?? 0) < endPos) {
+        kernelKeeper.scheduleReap(vatID);
+        // We just added one delivery
+        currentVatPos[vatID] = endPos + 1;
+      } else {
+        currentVatPos[vatID] = endPos;
+      }
+    }
+
+    return harden(currentVatPos);
+  }
+
+  async function snapshotAllVats() {
+    const snapshottedVats = [];
+    await null;
+    for (const vatID of getAllVatIds()) {
+      const snapshotted = await vatWarehouse.maybeSaveSnapshot(vatID, 2);
+      if (snapshotted) snapshottedVats.push(vatID);
+    }
+    return harden(snapshottedVats);
+  }
+
   async function step() {
     if (kernelPanic) {
       throw kernelPanic;
@@ -2159,6 +2207,7 @@ export default function buildKernel(
     run,
     shutdown,
     reapAllVats,
+    snapshotAllVats,
     changeKernelOptions,
 
     // the rest are for testing and debugging

package/src/kernel/vat-warehouse.js

@@ -566,18 +566,20 @@ export function makeVatWarehouse({
 
   /**
    * Save a heap snapshot for the given vatID, if the snapshotInterval
-   * is satisified
+   * is satisfied or a lower explicit delivery count has been reached.
    *
    * @param {VatID} vatID
+   * @param {number} [minDeliveryCount]
    */
-  async function maybeSaveSnapshot(vatID) {
-    const recreate = true; // PANIC in the failure case
-    const { manager } = await ensureVatOnline(vatID, recreate);
-    if (!manager.makeSnapshot) {
-      return false; // worker cannot make snapshots
+  async function maybeSaveSnapshot(vatID, minDeliveryCount = snapshotInterval) {
+    kernelKeeper.vatIsAlive(vatID) || Fail`${q(vatID)}: not alive`;
+    const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
+    const vatOptions = vatKeeper.getOptions();
+
+    if (!vatOptions.useTranscript) {
+      return false;
     }
 
-    const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
     let reason;
 
     const hasSnapshot = !!vatKeeper.getSnapshotInfo();
@@ -586,15 +588,21 @@ export function makeVatWarehouse({
     if (!hasSnapshot && deliveriesInSpan >= snapshotInitial) {
       // begin snapshot after 'snapshotInitial' deliveries in an incarnation
       reason = { snapshotInitial };
-    } else if (deliveriesInSpan >= snapshotInterval) {
+    } else if (deliveriesInSpan >= minDeliveryCount) {
       // begin snapshot after 'snapshotInterval' deliveries in a span
-      reason = { snapshotInterval };
+      reason = { snapshotInterval: minDeliveryCount };
     }
     // console.log('maybeSaveSnapshot: reason:', reason);
     if (!reason) {
       return false; // not time to make a snapshot
     }
 
+    const recreate = true; // PANIC in the failure case
+    const { manager } = await ensureVatOnline(vatID, recreate);
+    if (!manager.makeSnapshot) {
+      return false; // worker cannot make snapshots
+    }
+
     // always do a bringOutYourDead just before a snapshot, to shake
     // loose as much garbage as we can, and to minimize the GC
     // sensitivity effects of the forced GC that snapshots perform