feat: refresh slogulator to account for smallcaps and improve UX

This is in support of #8647
Agoric · Dec 18, 2023 · 15cea93 · 15cea93
1 parent 7d63ca3
commit 15cea93
Show file tree

Hide file tree

Showing 9 changed files with 332 additions and 123 deletions.
diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -1202,6 +1202,19 @@ export default function buildKernel(
     return results;
   }
 
+  function getCrankVatForSlog(message) {
+    if (message.type === 'send') {
+      const { type } = parseKernelSlot(message.target);
+      if (type !== 'promise') {
+        return kernelKeeper.ownerOfKernelObject(message.target);
+      } else {
+        return '<unknown vat>';
+      }
+    } else {
+      return message.vatID;
+    }
+  }
+
   /**
    * @param {RunQueueEvent} message
    * @returns {Promise<PolicyInput>}
@@ -1216,6 +1229,7 @@ export default function buildKernel(
       crankType: 'delivery',
       crankNum: kernelKeeper.getCrankNumber(),
       message,
+      vatID: getCrankVatForSlog(message),
     });
     /** @type { PolicyInput } */
     let policyInput = ['none', {}];
@@ -1375,6 +1389,7 @@ export default function buildKernel(
       crankType: 'routing',
       crankNum: kernelKeeper.getCrankNumber(),
       message,
+      vatID: getCrankVatForSlog(message),
     });
     /** @type { PolicyInput } */
     const policyInput = ['none', {}];

diff --git a/packages/SwingSet/src/kernel/state/kernelKeeper.js b/packages/SwingSet/src/kernel/state/kernelKeeper.js
@@ -1517,6 +1517,7 @@ export default function makeKernelKeeper(kernelStorage, kernelSlog) {
     const acceptanceQueue = dumpQueue('acceptanceQueue');
 
     return harden({
+      crankNumber: kvStore.get('crankNumber'),
       vatTables,
       kernelTable,
       promises,

diff --git a/packages/SwingSet/tools/run-utils.js b/packages/SwingSet/tools/run-utils.js
@@ -6,11 +6,8 @@ const sink = () => {};
 
 /**
  * @param {import('../src/controller/controller.js').SwingsetController} controller
- * @param {(...args: any[]) => void} [log]
  */
-export const makeRunUtils = (controller, log = (..._) => {}) => {
-  let cranksRun = 0;
-
+export const makeRunUtils = controller => {
   const mutex = makeQueue();
 
   mutex.put(controller.run());
@@ -27,18 +24,12 @@ export const makeRunUtils = (controller, log = (..._) => {}) => {
 
     const thunkResult = await thunk();
 
-    const result = controller.run().then(cranks => {
-      cranksRun += cranks;
-      log(`kernel ran ${cranks} cranks`);
-      return thunkResult;
-    });
+    const result = controller.run().then(() => thunkResult);
     mutex.put(result.then(sink, sink));
     return result;
   };
 
   const queueAndRun = async (deliveryThunk, voidResult = false) => {
-    log('queueAndRun at', cranksRun);
-
     const kpid = await runThunk(deliveryThunk);
 
     if (voidResult) {

diff --git a/packages/boot/test/upgrading/test-upgrade-vats.js b/packages/boot/test/upgrading/test-upgrade-vats.js
@@ -59,7 +59,7 @@ const makeScenario = async (
   t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
-  const runUtils = makeRunUtils(c, t.log);
+  const runUtils = makeRunUtils(c);
   return runUtils;
 };
 

diff --git a/packages/boot/tools/supports.ts b/packages/boot/tools/supports.ts
@@ -371,7 +371,7 @@ export const makeSwingsetTestKit = async (
   );
   console.timeLog('makeBaseSwingsetTestKit', 'buildSwingset');
 
-  const runUtils = makeRunUtils(controller, log);
+  const runUtils = makeRunUtils(controller);
 
   const buildProposal = makeProposalExtractor({
     childProcess: childProcessAmbient,

diff --git a/packages/swingset-runner/bin/slogulator-debug b/packages/swingset-runner/bin/slogulator-debug
@@ -0,0 +1 @@
+../src/slogulator-debug-entrypoint.js
diff --git a/packages/swingset-runner/src/slogulator-debug-entrypoint.js b/packages/swingset-runner/src/slogulator-debug-entrypoint.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node --inspect-brk
+/* eslint-env node */
+
+/**
+ * Simple boilerplate program providing linkage to launch an application written using modules within the
+ * as yet not-entirely-ESM-supporting version of NodeJS.
+ */
+import '@endo/init';
+import { main } from './slogulator.js';
+
+process.exitCode = 1;
+try {
+  main();
+  process.exitCode = 0;
+} catch (error) {
+  console.error(error);
+}
diff --git a/packages/swingset-runner/src/slogulator-entrypoint.js b/packages/swingset-runner/src/slogulator-entrypoint.js
@@ -9,11 +9,9 @@ import '@endo/init';
 import { main } from './slogulator.js';
 
 process.exitCode = 1;
-main().then(
-  () => {
-    process.exitCode = 0;
-  },
-  error => {
-    console.error(error);
-  },
-);
+try {
+  main();
+  process.exitCode = 0;
+} catch (error) {
+  console.error(error);
+}