Merge pull request #584 from Agoric/swingset-metering

Pass all tests with metering installed
Agoric · Feb 20, 2020 · beac518 · beac518
2 parents 9f9452c + d2dbd2c
commit beac518
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -38,6 +38,7 @@
     "@agoric/marshal": "^0.1.1",
     "@agoric/nat": "^2.0.1",
     "@agoric/swing-store-simple": "^0.1.0",
+    "@agoric/tame-metering": "^1.0.0",
     "rollup": "^1.23.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "semver": "^6.3.0",

diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -11,6 +11,10 @@ import { assert } from '@agoric/assert';
 import makeDefaultEvaluateOptions from '@agoric/default-evaluate-options';
 import bundleSource from '@agoric/bundle-source';
 import { makeMemorySwingStore } from '@agoric/swing-store-simple';
+import {
+  SES1ReplaceGlobalMeter,
+  SES1TameMeteringShim,
+} from '@agoric/tame-metering';
 
 // eslint-disable-next-line import/extensions
 import kernelSourceFunc from './bundles/kernel';
@@ -107,9 +111,6 @@ function makeEvaluate(e) {
       transforms,
     });
     transforms.forEach(t => t.closeOverSES && t.closeOverSES(c));
-    // Global shims need to take effect before realm shims.
-    const shims = (rootOptions.shims || []).concat(realmOptions.shims || []);
-    shims.forEach(shim => c.evaluate(shim));
     return {
       evaluateExpr(source, endowments = {}, options = {}) {
         return c.evaluate(`(${source}\n)`, endowments, options);
@@ -135,13 +136,16 @@ function makeEvaluate(e) {
 
 function makeSESEvaluator() {
   const evaluateOptions = makeDefaultEvaluateOptions();
-  const { transforms, ...otherOptions } = evaluateOptions;
+  const { transforms, shims = [], ...otherOptions } = evaluateOptions;
   const s = SES.makeSESRootRealm({
     ...otherOptions,
     transforms,
     consoleMode: 'allow',
     errorStackMode: 'allow',
+    shims: [SES1TameMeteringShim, ...shims],
+    configurableGlobals: true,
   });
+  const replaceGlobalMeter = SES1ReplaceGlobalMeter(s);
   transforms.forEach(t => {
     t.closeOverSES && t.closeOverSES(s);
   });
@@ -159,13 +163,28 @@ function makeSESEvaluator() {
       confine: s.global.SES.confine,
       confineExpr: s.global.SES.confineExpr,
       rootOptions: evaluateOptions,
-      makeCompartment: s.global.Realm.makeCompartment,
+      makeCompartment: (...args) => {
+        const c = s.global.Realm.makeCompartment(...args);
+        // FIXME: This call should be unnecessary.
+        // We currently need it because fresh Compartments
+        // do not inherit the configured stable globals.
+        Object.defineProperties(
+          c.global,
+          Object.getOwnPropertyDescriptors(s.global),
+        );
+        return c;
+      },
     },
     '@agoric/harden': true,
     '@agoric/nat': Nat,
   });
   return src => {
-    return s.evaluate(src, { require: r })().default;
+    // FIXME: Note that this replaceGlobalMeter endowment is not any
+    // worse than before metering existed.  However, it probably is
+    // only necessary to be added to the kernel, rather than all
+    // static vats once we add metering support to the dynamic vat
+    // implementation.
+    return s.evaluate(src, { require: r, replaceGlobalMeter })().default;
   };
 }
 

diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -1,3 +1,4 @@
+/* global replaceGlobalMeter */
 import harden from '@agoric/harden';
 import { makeMarshal, QCLASS } from '@agoric/marshal';
 import Nat from '@agoric/nat';
@@ -114,6 +115,10 @@ export default function buildKernel(kernelEndowments) {
       .then(f)
       .then(undefined, logerr);
     await queueEmptyP;
+    if (typeof replaceGlobalMeter !== 'undefined') {
+      // Turn off the global meter now that we've run the user code.
+      replaceGlobalMeter(null);
+    }
     whenDone();
   }