feat(xsnap): meter add/remove on map, set

Agoric · May 4, 2021 · 327062f · 327062f
1 parent f649ff7
commit 327062f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/packages/xsnap/api.js b/packages/xsnap/api.js
@@ -3,7 +3,7 @@
 /** The version identifier for our meter type.
  * TODO Bump this whenever there's a change to metering semantics.
  */
-export const METER_TYPE = 'xs-meter-4';
+export const METER_TYPE = 'xs-meter-5';
 
 export const ExitCode = {
   E_UNKNOWN_ERROR: -1,

diff --git a/packages/xsnap/src/xsnap.c b/packages/xsnap/src/xsnap.c
@@ -1400,15 +1400,26 @@ static char* fxReadNetStringError(int code)
 
 static int fxWriteOkay(FILE* outStream, xsUnsignedValue meterIndex, txMachine *the, char* buf, size_t length)
 {
-	char fmt[] = ".{\"compute\":%u,\"allocate\":%u,\"allocateChunksCalls\":%u,\"allocateSlotsCalls\":%u,\"garbageCollectionCount\":%u}\1";
+	char fmt[] = ("." // OK
+				  "{"
+				  "\"compute\":%u,"
+				  "\"allocate\":%u,"
+				  "\"allocateChunksCalls\":%u,"
+				  "\"allocateSlotsCalls\":%u,"
+				  "\"garbageCollectionCount\":%u,"
+				  "\"mapSetAddCount\":%u,"
+				  "\"mapSetRemoveCount\":%u}"
+				  "\1" // separate meter info from result
+				  );
 	char numeral64[] = "12345678901234567890"; // big enough for 64bit numeral
-	char prefix[8 + sizeof fmt + 4 * sizeof numeral64];
+	char prefix[8 + sizeof fmt + 7 * sizeof numeral64];
 	// TODO: fxCollect counter
 	// Prepend the meter usage to the reply.
 	snprintf(prefix, sizeof(prefix) - 1, fmt,
 			 meterIndex, the->allocatedSpace,
 			 the->allocateChunksCallCount, the->allocateSlotsCallCount,
-			 the->garbageCollectionCount);
+			 the->garbageCollectionCount,
+			 the->mapSetAddCount, the->mapSetRemoveCount);
 	return fxWriteNetString(outStream, prefix, buf, length);
 }
 

diff --git a/packages/xsnap/src/xsnap.h b/packages/xsnap/src/xsnap.h
@@ -72,6 +72,8 @@
 	txUnsigned allocateChunksCallCount; \
 	txUnsigned allocateSlotsCallCount; \
 	txUnsigned garbageCollectionCount; \
+	txUnsigned mapSetAddCount; \
+	txUnsigned mapSetRemoveCount; \
 	int promiseJobs; \
 	void* timerJobs; \
 	void* waiterCondition; \

diff --git a/packages/xsnap/test/test-xsnap.js b/packages/xsnap/test/test-xsnap.js
@@ -512,16 +512,21 @@ test('meter details', async t => {
   t.teardown(() => vat.terminate());
   const result = await vat.evaluate(`
   let m = new Map();
+  let s1 = new Set();
   for (ix = 0; ix < 20000; ix++) {
     m.set(ix, 'garbage');
-    // m.delete(m);
+    s1.add(ix);
+  }
+  for (ix = 0; ix < 20000; ix++) {
+    m.delete(ix);
+    s1.delete(ix);
   }
   `);
   const {
     meterUsage: { meterType, ...meters },
   } = result;
   t.log(meters);
-  t.is(meterType, 'xs-meter-4');
+  t.is(meterType, 'xs-meter-5');
   const { entries, fromEntries } = Object;
   t.deepEqual(
     {
@@ -530,6 +535,8 @@ test('meter details', async t => {
       allocateChunksCalls: 'number',
       allocateSlotsCalls: 'number',
       garbageCollectionCount: 'number',
+      mapSetAddCount: 'number',
+      mapSetRemoveCount: 'number',
     },
     fromEntries(entries(meters).map(([p, v]) => [p, typeof v])),
   );