@agoric/swingset-vat 0.32.3-dev-0303d15.0 → 0.32.3-dev-e393fda.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-0303d15.0+0303d15",
+  "version": "0.32.3-dev-e393fda.0+e393fda",
   "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-0303d15.0+0303d15",
-    "@agoric/kmarshal": "0.1.1-dev-0303d15.0+0303d15",
-    "@agoric/store": "0.9.3-dev-0303d15.0+0303d15",
-    "@agoric/swing-store": "0.9.2-dev-0303d15.0+0303d15",
-    "@agoric/swingset-liveslots": "0.10.3-dev-0303d15.0+0303d15",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-0303d15.0+0303d15",
-    "@agoric/time": "0.3.3-dev-0303d15.0+0303d15",
-    "@agoric/vat-data": "0.5.3-dev-0303d15.0+0303d15",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-0303d15.0+0303d15",
+    "@agoric/internal": "0.3.3-dev-e393fda.0+e393fda",
+    "@agoric/kmarshal": "0.1.1-dev-e393fda.0+e393fda",
+    "@agoric/store": "0.9.3-dev-e393fda.0+e393fda",
+    "@agoric/swing-store": "0.9.2-dev-e393fda.0+e393fda",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e393fda.0+e393fda",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-e393fda.0+e393fda",
+    "@agoric/time": "0.3.3-dev-e393fda.0+e393fda",
+    "@agoric/vat-data": "0.5.3-dev-e393fda.0+e393fda",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-e393fda.0+e393fda",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
@@ -57,7 +57,7 @@
     "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
     "better-sqlite3": "^9.1.1",
-    "import-meta-resolve": "^2.2.1",
+    "import-meta-resolve": "^4.1.0",
     "microtime": "^3.1.0",
     "semver": "^6.3.0",
     "tmp": "^0.2.1",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 76.28
   },
-  "gitHead": "0303d15e3238f29fa106e103e54103c2beabc895"
+  "gitHead": "e393fda2039f1b32543bf529a846d626319233df"
 }

package/src/kernel/state/vatKeeper.js

@@ -677,13 +677,7 @@ export function makeVatKeeper(
       restartWorker,
     );
 
-    const {
-      hash: snapshotID,
-      uncompressedSize,
-      dbSaveSeconds,
-      compressedSize,
-      compressSeconds,
-    } = info;
+    const { hash: snapshotID } = info;
 
     // push a save-snapshot transcript entry
     addToTranscript(makeSaveSnapshotItem(snapshotID));
@@ -695,18 +689,6 @@ export function makeVatKeeper(
     // always starts with an initialize-worker or load-snapshot
     // pseudo-delivery
     addToTranscript(makeLoadSnapshotItem(snapshotID));
-
-    kernelSlog.write({
-      type: 'heap-snapshot-save',
-      vatID,
-      snapshotID,
-      uncompressedSize,
-      dbSaveSeconds,
-      compressedSize,
-      compressSeconds,
-      endPosition,
-      restartWorker,
-    });
   }
 
   /**

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

@@ -128,8 +128,10 @@ export function makeXsSubprocessFactory({
 
     const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
     const snapshotInfo = vatKeeper.getSnapshotInfo();
+    let uncompressedSizeLoaded = null;
     if (snapshotInfo) {
       kernelSlog.write({ type: 'heap-snapshot-load', vatID, ...snapshotInfo });
+      uncompressedSizeLoaded = snapshotInfo.uncompressedSize;
     }
 
     // `startXSnap` adds `nameDisplayArg` as a dummy argument so that 'ps'
@@ -240,9 +242,31 @@ export function makeXsSubprocessFactory({
     async function makeSnapshot(snapPos, snapStore, restartWorker) {
       const snapshotDescription = `${vatID}-${snapPos}`;
       const snapshotStream = worker.makeSnapshotStream(snapshotDescription);
+      const saveSnapshot = async saveStream => {
+        const results = await snapStore.saveSnapshot(
+          vatID,
+          snapPos,
+          saveStream,
+        );
+        const { hash: snapshotID, ...metrics } = results;
+        const uncompressedSizeDelta =
+          uncompressedSizeLoaded &&
+          metrics.uncompressedSize - uncompressedSizeLoaded;
+        uncompressedSizeLoaded = results.uncompressedSize;
+        kernelSlog.write({
+          type: 'heap-snapshot-save',
+          vatID,
+          snapshotID,
+          endPosition: snapPos,
+          ...metrics,
+          uncompressedSizeDelta,
+          restartWorker,
+        });
+        return results;
+      };
 
       if (!restartWorker) {
-        return snapStore.saveSnapshot(vatID, snapPos, snapshotStream);
+        return saveSnapshot(snapshotStream);
       }
 
       /** @type {AsyncGenerator<Uint8Array, void, void>[]} */
@@ -268,7 +292,7 @@ export function makeXsSubprocessFactory({
             snapshotDescription,
           },
         }),
-        snapStore.saveSnapshot(vatID, snapPos, snapStoreSaveStream),
+        saveSnapshot(snapStoreSaveStream),
       ]);
       await closeP;