fix: complain if metering is requested but not compiled in

Agoric · Feb 11, 2021 · 857d4ba · 857d4ba
1 parent b418db5
commit 857d4ba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/packages/xsnap/makefiles/lin/xsnap.mk b/packages/xsnap/makefiles/lin/xsnap.mk
@@ -30,6 +30,7 @@ C_OPTIONS = \
 	-DmxRun=1 \
 	-DmxSloppy=1 \
 	-DmxSnapshot=1 \
+	-DmxMetering=1 \
 	-DmxRegExpUnicodePropertyEscapes=1 \
 	-I$(INC_DIR) \
 	-I$(PLT_DIR) \

diff --git a/packages/xsnap/makefiles/win/xsnap.mak b/packages/xsnap/makefiles/win/xsnap.mak
@@ -25,6 +25,7 @@ C_OPTIONS = \
 	/D mxRun=1 \
 	/D mxSloppy=1 \
 	/D mxSnapshot=1 \
+	/D mxMetering=1 \
 	/D mxRegExpUnicodePropertyEscapes=1 \
 	/I$(INC_DIR) \
 	/I$(PLT_DIR) \

diff --git a/packages/xsnap/src/xsnap.c b/packages/xsnap/src/xsnap.c
@@ -175,14 +175,14 @@ static int fxSnapshotWrite(void* stream, void* address, size_t size)
 	#define xsBeginMetering(_THE, _CALLBACK, _STEP)
 	#define xsEndMetering(_THE)
 	#define xsPatchHostFunction(_FUNCTION,_PATCH)
-	#define xsMeterHostFunction(_COUNT)
+	#define xsMeterHostFunction(_COUNT) (void)(_COUNT)
   #define xsBeginCrank(_THE, _LIMIT)
   #define xsEndCrank(_THE) 0
 #endif
 
 static xsUnsignedValue gxCrankMeteringLimit = 0;
 static xsUnsignedValue gxCurrentMeter = 0;
-static xsBooleanValue fxMeteringCallback(xsMachine* the, xsUnsignedValue index)
+xsBooleanValue fxMeteringCallback(xsMachine* the, xsUnsignedValue index)
 {
 	if (gxCurrentMeter > 0 && index > gxCurrentMeter) {
 		// Just throw right out of the main loop and exit.
@@ -254,13 +254,18 @@ int main(int argc, char* argv[])
 			}
 		}
 		else if (!strcmp(argv[argi], "-l")) {
+#if mxMetering
 			argi++;
 			if (argi < argc)
 				gxCrankMeteringLimit = atoi(argv[argi]);
 			else {
 				fxPrintUsage();
 				return 1;
 			}
+#else
+			fprintf(stderr, "%s flag not implemented; mxMetering is not enabled\n", argv[argi]);
+			return 1;
+#endif
 		}
 		else if (!strcmp(argv[argi], "-p"))
 			gxMeteringPrint = 1;

diff --git a/packages/xsnap/src/xsnap.js b/packages/xsnap/src/xsnap.js
@@ -166,7 +166,7 @@ export function xsnap(options) {
         let compute = NaN;
         const semi = message.indexOf(SEMI, 1);
         if (semi >= 0) {
-          // The message is `.938586;`.
+          // The message is `.938586;reply`.
           const computeBuf = message.slice(1, semi);
           const computeStr = decoder.decode(computeBuf);
           compute = JSON.parse(computeStr);