Merge pull request #1954 from Agoric/mfig/optimize-trips

Report number of significant round trips
Agoric · Nov 6, 2020 · e4ea0c4 · e4ea0c4
2 parents cce515f + e0b5040
commit e4ea0c4
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/packages/cosmic-swingset/lib/ag-solo/outbound.js b/packages/cosmic-swingset/lib/ag-solo/outbound.js
@@ -2,7 +2,18 @@ import anylogger from 'anylogger';
 
 const log = anylogger('outbound');
 
-const knownTargets = new Map(); // target => { deliverator, highestSent, highestAck }
+/**
+ * @typedef {Object} TargetRecord
+ * @property {(newMessages: Array<[number, string]>, acknum: number) => void} deliverator
+ * @property {number} highestSent
+ * @property {number} highestAck
+ * @property {number} trips
+ */
+
+/**
+ * @type {Map<string, TargetRecord>}
+ */
+const knownTargets = new Map();
 
 export function deliver(mbs) {
   const data = mbs.exportToData();
@@ -26,8 +37,11 @@ export function deliver(mbs) {
     // console.debug(` ${newMessages.length} new messages`);
     const acknum = data[target].inboundAck;
     if (newMessages.length || acknum !== t.highestAck) {
+      if (newMessages.length) {
+        t.trips += 1;
+      }
       log(
-        `invoking deliverator; ${newMessages.length} new messages for ${target}`,
+        `invoking deliverator; ${newMessages.length} new messages for ${target} (trips=${t.trips})`,
       );
       t.deliverator(newMessages, acknum);
       if (newMessages.length) {
@@ -42,5 +56,7 @@ export function addDeliveryTarget(target, deliverator) {
   if (knownTargets.has(target)) {
     throw new Error(`target ${target} already added`);
   }
-  knownTargets.set(target, { deliverator, highestSent: 0, highestAck: 0 });
+  /** @type {TargetRecord} */
+  const targetRecord = { deliverator, highestSent: 0, highestAck: 0, trips: 0 };
+  knownTargets.set(target, targetRecord);
 }