move ExitCode processing into worker

This allows SwingSet to lose the direct dependency upon @agoric/xsnap, allowing swingset-worker-xsnap-v1 to encapsulate it.
Agoric · Mar 1, 2023 · 4063a31 · 4063a31
1 parent 7628ae1
commit 4063a31
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/packages/SwingSet/misc-tools/measure-metering/measure.js b/packages/SwingSet/misc-tools/measure-metering/measure.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-extraneous-dependencies */
 // run as `node tools/measure-metering/measure.js`
 
 // eslint-disable-next-line import/order

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -22,6 +22,7 @@
   },
   "devDependencies": {
     "@agoric/swingset-xsnap-supervisor": "^0.9.0",
+    "@agoric/xsnap": "^0.13.2",
     "@agoric/xsnap-lockdown": "^0.13.2",
     "@types/microtime": "^2.1.0",
     "better-sqlite3": "^7.5.0",
@@ -40,7 +41,6 @@
     "@agoric/swingset-worker-xsnap-v1": "^0.9.0",
     "@agoric/time": "^0.2.1",
     "@agoric/vat-data": "^0.4.3",
-    "@agoric/xsnap": "^0.13.2",
     "@endo/base64": "^0.2.28",
     "@endo/bundle-source": "^2.4.2",
     "@endo/captp": "^2.0.18",

diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
@@ -1,5 +1,4 @@
 import { assert, Fail, q } from '@agoric/assert';
-import { ExitCode } from '@agoric/xsnap/api.js';
 import { makeManagerKit } from './manager-helper.js';
 
 import {
@@ -185,21 +184,8 @@ export function makeXsSubprocessFactory({
         result = await issueTagged(['deliver', delivery]);
       } catch (err) {
         parentLog('issueTagged error:', err.code, err.message);
-        let message;
-        switch (err.code) {
-          case ExitCode.E_TOO_MUCH_COMPUTATION:
-            message = 'Compute meter exceeded';
-            break;
-          case ExitCode.E_STACK_OVERFLOW:
-            message = 'Stack meter exceeded';
-            break;
-          case ExitCode.E_NOT_ENOUGH_MEMORY:
-            message = 'Allocate meter exceeded';
-            break;
-          default:
-            // non-metering failure. crash.
-            throw err;
-        }
+        // get an error message for metering failures, else throw
+        const message = worker.trapMeteringFailure(err);
         return harden(['error', message, null]);
       }
 

diff --git a/packages/swingset-worker-xsnap-v1/src/make-v1.js b/packages/swingset-worker-xsnap-v1/src/make-v1.js
@@ -3,6 +3,7 @@ import path from 'path';
 import { Fail } from '@agoric/assert';
 import { type as osType } from 'os';
 import { xsnap, recordXSnap } from '@agoric/xsnap';
+import { ExitCode } from '@agoric/xsnap/api.js';
 import { getLockdownBundle } from '@agoric/xsnap-lockdown';
 import { getSupervisorBundle } from '@agoric/swingset-xsnap-supervisor';
 
@@ -95,7 +96,22 @@ export function makeStartXSnapV1(options) {
       // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await
       await worker.evaluate(`(${bundle.source}\n)()`.trim());
     }
-    return worker;
+
+    const trapMeteringFailure = err => {
+      switch (err.code) {
+        case ExitCode.E_TOO_MUCH_COMPUTATION:
+          return 'Compute meter exceeded';
+        case ExitCode.E_STACK_OVERFLOW:
+          return 'Stack meter exceeded';
+        case ExitCode.E_NOT_ENOUGH_MEMORY:
+          return 'Allocate meter exceeded';
+        default:
+          // non-metering failure. crash.
+          throw err;
+      }
+    };
+
+    return harden({ ...worker, trapMeteringFailure });
   }
   return startXSnapV1;
 }