@agoric/swingset-vat 0.32.3-dev-bf1e645.0 → 0.32.3-dev-07f6885.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-bf1e645.0+bf1e645",
+  "version": "0.32.3-dev-07f6885.0+07f6885",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,16 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-bf1e645.0+bf1e645",
-    "@agoric/kmarshal": "0.1.1-dev-bf1e645.0+bf1e645",
-    "@agoric/store": "0.9.3-dev-bf1e645.0+bf1e645",
-    "@agoric/swing-store": "0.9.2-dev-bf1e645.0+bf1e645",
-    "@agoric/swingset-liveslots": "0.10.3-dev-bf1e645.0+bf1e645",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-bf1e645.0+bf1e645",
-    "@agoric/time": "0.3.3-dev-bf1e645.0+bf1e645",
-    "@agoric/vat-data": "0.5.3-dev-bf1e645.0+bf1e645",
-    "@agoric/xsnap": "0.14.3-dev-bf1e645.0+bf1e645",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-bf1e645.0+bf1e645",
+    "@agoric/internal": "0.3.3-dev-07f6885.0+07f6885",
+    "@agoric/kmarshal": "0.1.1-dev-07f6885.0+07f6885",
+    "@agoric/store": "0.9.3-dev-07f6885.0+07f6885",
+    "@agoric/swing-store": "0.9.2-dev-07f6885.0+07f6885",
+    "@agoric/swingset-liveslots": "0.10.3-dev-07f6885.0+07f6885",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-07f6885.0+07f6885",
+    "@agoric/time": "0.3.3-dev-07f6885.0+07f6885",
+    "@agoric/vat-data": "0.5.3-dev-07f6885.0+07f6885",
+    "@agoric/xsnap": "0.14.3-dev-07f6885.0+07f6885",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-07f6885.0+07f6885",
     "@endo/base64": "^1.0.7",
     "@endo/bundle-source": "^3.4.0",
     "@endo/captp": "^4.3.0",
@@ -103,5 +103,5 @@
   "typeCoverage": {
     "atLeast": 75.7
   },
-  "gitHead": "bf1e6453eee701f3e465120a03877cf44d458cc6"
+  "gitHead": "07f6885c560333981d6564581b2a00735a6c428c"
 }

package/src/kernel/kernel.js

@@ -4,7 +4,7 @@ import { assert, Fail } from '@endo/errors';
 import { isNat } from '@endo/nat';
 import { mustMatch, M } from '@endo/patterns';
 import { importBundle } from '@endo/import-bundle';
-import { objectMetaMap } from '@agoric/internal';
+import { objectMetaMap, PromiseAllOrErrors } from '@agoric/internal';
 import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 import { kser, kslot, makeError } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
@@ -261,8 +261,12 @@ export default function buildKernel(
    */
   async function terminateVat(vatID, shouldReject, info) {
     console.log(`kernel terminating vat ${vatID} (failure=${shouldReject})`);
-    let critical = false;
     insistCapData(info);
+    // Note that it's important for much of this work to happen within the
+    // synchronous prelude. For details, see
+    // https://github.com/Agoric/agoric-sdk/pull/10055#discussion_r1754918394
+    let critical = false;
+    const deferred = [];
     // ISSUE: terminate stuff in its own crank like creation?
     // TODO: if a static vat terminates, panic the kernel?
     // TODO: guard against somebody telling vatAdmin to kill a vat twice
@@ -287,7 +291,7 @@ export default function buildKernel(
       // remove vatID from the list of live vats, and mark for deletion
       kernelKeeper.deleteVatID(vatID);
       kernelKeeper.markVatAsTerminated(vatID);
-      kernelKeeper.removeVatFromSwingStoreExports(vatID);
+      deferred.push(kernelKeeper.removeVatFromSwingStoreExports(vatID));
       for (const kpid of deadPromises) {
         resolveToError(kpid, makeError('vat terminated'), vatID);
       }
@@ -302,9 +306,7 @@ export default function buildKernel(
       // it's going to be a small cost compared to the trouble you're probably
       // already in anyway if this happens.
       panic(`critical vat ${vatID} failed`, Error(info.body));
-      return;
-    }
-    if (vatAdminRootKref) {
+    } else if (vatAdminRootKref) {
       // static vat termination can happen before vat admin vat exists
       notifyTermination(
         vatID,
@@ -319,8 +321,11 @@ export default function buildKernel(
       );
     }
 
-    // worker needs to be stopped, if any
-    await vatWarehouse.stopWorker(vatID);
+    // worker, if present, needs to be stopped
+    // (note that this only applies to ephemeral vats)
+    deferred.push(vatWarehouse.stopWorker(vatID));
+
+    await PromiseAllOrErrors(deferred);
   }
 
   function notifyMeterThreshold(meterID) {

package/src/kernel/state/kernelKeeper.js

@@ -930,13 +930,13 @@ export default function makeKernelKeeper(
     kvStore.set(`${kernelSlot}.data.slots`, capdata.slots.join(','));
   }
 
-  function removeVatFromSwingStoreExports(vatID) {
+  async function removeVatFromSwingStoreExports(vatID) {
     // Delete primary swingstore records for this vat, in preparation
     // for (slow) deletion. After this, swingstore exports will omit
     // this vat. This is called from the kernel's terminateVat, which
     // initiates (but does not complete) deletion.
     snapStore.stopUsingLastSnapshot(vatID);
-    transcriptStore.stopUsingTranscript(vatID);
+    await transcriptStore.stopUsingTranscript(vatID);
   }
 
   /**

package/src/kernel/state/vatKeeper.js

@@ -655,7 +655,7 @@ export function makeVatKeeper(
     addToTranscript(makeSaveSnapshotItem(snapshotID));
 
     // then start a new transcript span
-    transcriptStore.rolloverSpan(vatID);
+    await transcriptStore.rolloverSpan(vatID);
 
     // then push a load-snapshot entry, so that the current span
     // always starts with an initialize-worker or load-snapshot
@@ -715,7 +715,7 @@ export function makeVatKeeper(
     return transcriptStore.deleteVatTranscripts(vatID, budget);
   }
 
-  function beginNewIncarnation() {
+  async function beginNewIncarnation() {
     if (snapStore) {
       snapStore.stopUsingLastSnapshot(vatID);
     }

package/src/kernel/vat-admin-hooks.js

@@ -94,6 +94,9 @@ export function makeVatAdminHooks(tools) {
       // we don't need to incrementRefCount because if terminateVat sends
       // 'reason' to vat-admin, it uses notifyTermination / queueToKref /
       // doSend, and doSend() does its own incref
+      // FIXME: This assumes that most work of terminateVat happens in the
+      // synchronous prelude, which should be made more obvious. For details,
+      // see https://github.com/Agoric/agoric-sdk/pull/10055#discussion_r1754918394
       void terminateVat(vatID, true, marshalledReason);
       // TODO: terminateVat is async, result doesn't fire until worker
       // is dead. To fix this we'll probably need to move termination