@agoric/swingset-vat 0.32.3-dev-64cd079.0 → 0.32.3-dev-bf2d699.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-64cd079.0+64cd079",
+  "version": "0.32.3-dev-bf2d699.0+bf2d699",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -13,6 +13,7 @@
   "scripts": {
     "build": "exit 0",
     "test": "ava",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "SWINGSET_WORKER_TYPE=xs-worker ava",
     "test:xs-worker": "ava test/workers -m 'xsnap vat manager'",
     "lint-fix": "yarn lint:eslint --fix",
@@ -28,15 +29,15 @@
     "ava": "^5.3.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-64cd079.0+64cd079",
-    "@agoric/kmarshal": "0.1.1-dev-64cd079.0+64cd079",
-    "@agoric/store": "0.9.3-dev-64cd079.0+64cd079",
-    "@agoric/swing-store": "0.9.2-dev-64cd079.0+64cd079",
-    "@agoric/swingset-liveslots": "0.10.3-dev-64cd079.0+64cd079",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-64cd079.0+64cd079",
-    "@agoric/time": "0.3.3-dev-64cd079.0+64cd079",
-    "@agoric/vat-data": "0.5.3-dev-64cd079.0+64cd079",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-64cd079.0+64cd079",
+    "@agoric/internal": "0.3.3-dev-bf2d699.0+bf2d699",
+    "@agoric/kmarshal": "0.1.1-dev-bf2d699.0+bf2d699",
+    "@agoric/store": "0.9.3-dev-bf2d699.0+bf2d699",
+    "@agoric/swing-store": "0.9.2-dev-bf2d699.0+bf2d699",
+    "@agoric/swingset-liveslots": "0.10.3-dev-bf2d699.0+bf2d699",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-bf2d699.0+bf2d699",
+    "@agoric/time": "0.3.3-dev-bf2d699.0+bf2d699",
+    "@agoric/vat-data": "0.5.3-dev-bf2d699.0+bf2d699",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-bf2d699.0+bf2d699",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
@@ -103,5 +104,5 @@
   "typeCoverage": {
     "atLeast": 76.47
   },
-  "gitHead": "64cd0794f98d081402a62c1caad6642a5e038e96"
+  "gitHead": "bf2d699d33a52491b887a245fa1a33e54d8b4ebb"
 }

package/src/devices/timer/device-timer.js

@@ -86,6 +86,7 @@ function makeTimerMap(state = undefined) {
     return copyState(schedule);
   }
 
+  /** @param {bigint} time */
   function eventsFor(time) {
     assert.typeof(time, 'bigint');
     for (let i = 0; i < schedule.length && schedule[i].time <= time; i += 1) {
@@ -101,17 +102,29 @@ function makeTimerMap(state = undefined) {
   // There's some question as to whether it's important to invoke the handlers
   // in the order of their deadlines. If so, we should probably ensure that the
   // recorded deadlines don't have finer granularity than the turns.
-  function add(time, handler, repeater = undefined) {
+  /**
+   *
+   * @param {bigint} time
+   * @param {Waker} handler
+   * @param {number} [index]
+   * @returns {bigint}
+   */
+  function add(time, handler, index = undefined) {
     assert.typeof(time, 'bigint');
+    /** @type {IndexedHandler} */
     const handlerRecord =
-      typeof repeater === 'number' ? { handler, index: repeater } : { handler };
+      typeof index === 'number' ? { handler, index } : { handler };
     const { handlers: records } = eventsFor(time);
     records.push(handlerRecord);
     schedule.sort((a, b) => Number(a.time - b.time));
     return time;
   }
 
-  // Remove and return all pairs indexed by numbers up to target
+  /**
+   * Remove and return all pairs indexed by numbers up to target
+   *
+   * @param {bigint} target
+   */
   function removeEventsThrough(target) {
     assert.typeof(target, 'bigint');
     const returnValues = [];
@@ -132,33 +145,29 @@ function makeTimerMap(state = undefined) {
   }
 
   // We don't expect this to be called often, so we don't optimize for it.
+  /**
+   *
+   * @param {Waker} targetHandler
+   * @returns {bigint[]} times that have been removed (may contain duplicates)
+   */
   function remove(targetHandler) {
+    /** @type {bigint[]} */
     const droppedTimes = [];
     let i = 0;
     while (i < schedule.length) {
       const { time, handlers } = schedule[i];
-      if (handlers.length === 1) {
-        if (handlers[0].handler === targetHandler) {
-          schedule.splice(i, 1);
+      // Nothing prevents a particular handler from appearing more than once
+      for (let j = handlers.length - 1; j >= 0; j -= 1) {
+        if (handlers[j].handler === targetHandler) {
+          handlers.splice(j, 1);
           droppedTimes.push(time);
-        } else {
-          i += 1;
         }
+      }
+      if (handlers.length === 0) {
+        // Splice out this element, preserving `i` so we visit any successor.
+        schedule.splice(i, 1);
       } else {
-        // Nothing prevents a particular handler from appearing more than once
-        for (const { handler } of handlers) {
-          // @ts-expect-error xxx Waker vs IndexedHandler
-          if (handler === targetHandler && handlers.indexOf(handler) !== -1) {
-            // @ts-expect-error xxx Waker vs IndexedHandler
-            handlers.splice(handlers.indexOf(handler), 1);
-            droppedTimes.push(time);
-          }
-        }
-        if (handlers.length === 0) {
-          schedule.splice(i, 1);
-        } else {
-          i += 1;
-        }
+        i += 1;
       }
     }
     return droppedTimes;
@@ -277,6 +286,10 @@ export function buildRootDeviceNode(tools) {
       saveState();
       return baseTime;
     },
+    /**
+     * @param {Waker} handler
+     * @returns {bigint[]} times that have been removed (may contain duplicates)
+     */
     removeWakeup(handler) {
       const times = deadlines.remove(handler);
       saveState();
@@ -304,6 +317,10 @@ export function buildRootDeviceNode(tools) {
       saveState();
       return index;
     },
+    /**
+     * @param {number} index
+     * @param {Waker} handler
+     */
     schedule(index, handler) {
       const nextTime = nextScheduleTime(index, repeaters, lastPolled);
       deadlines.add(nextTime, handler, index);

package/tools/manual-timer.js

@@ -8,7 +8,7 @@ import { buildRootObject } from '../src/vats/timer/vat-timer.js';
 /**
  * @import {Timestamp} from '@agoric/time'
  * @import {TimerService} from '@agoric/time'
- * @import {Waker} from '../src/devices/timer/device-timer.js'
+ * @import {TimerDevice, Waker} from '../src/devices/timer/device-timer.js'
  *
  * @typedef {object} ManualTimerCallbacks
  * @property {(newTime: bigint, msg?: string) => void} [advanceTo]
@@ -34,8 +34,7 @@ const setup = callbacks => {
     currentWakeup: undefined,
     currentHandler: undefined,
   };
-  /** @type {any} */
-  const deviceMarker = harden({});
+  const deviceMarker = /** @type {TimerDevice} */ (harden({}));
   const timerDeviceFuncs = harden({
     getLastPolled: () => state.now,
     setWakeup: (when, handler) => {