cleanup stats collection

Author: drom

lib/handle-vcd-parser-ready.js

@@ -28,23 +28,26 @@ const fileInUrl = require('./file-in-url.js');
 const getFullWaveQL = require('./get-full-wave-ql.js');
 const parseTimescale = require('./parse-time-scale.js');
 
-const genStats = ($, statPanelDiv) => async (e) => {
-  // console.log('rx: stats', $);
-  const {data} = e.data;
-  let timeStamp = '?';
+const getTimeStamp = ($) => {
   if ($.enddefinitions) {
     const timescaleString = $.enddefinitions.timescale;
     const m = timescaleString.trim().match(/^(\d+)\s*(\w+)$/);
     const time = $.memI64[memmap.time] * BigInt(m[1]);
-    timeStamp = time.toLocaleString() + ' ' + m[2];
-    $.cnt1.pstate.time = Number(time);
+    return time.toLocaleString() + ' ' + m[2];
   }
-  statPanelDiv.innerHTML = stringify(statusPanel.mlStats($, data, timeStamp));
+  return '?';
 };
 
-const genLoadVcdDone = ($, statPanelDiv) => async () => {
-  console.log('rx: loadVcdDone'); // eslint-disable-line no-console
-  statPanelDiv.innerHTML = stringify(statusPanel.mlDone());
+const genStats = ($, statPanelDiv) => async (e) => {
+  // console.log('rx: stats', $);
+  const {data} = e.data;
+  statPanelDiv.innerHTML = stringify(statusPanel.mlStats($, data, getTimeStamp($)));
+};
+
+const genLoadVcdDone = ($, statPanelDiv) => async (e) => {
+  // console.log('rx: loadVcdDone'); // eslint-disable-line no-console
+  const {data} = e.data;
+  statPanelDiv.innerHTML = stringify(statusPanel.mlDone($, data, getTimeStamp($)));
   // traceGlPages($);
 };
 
@@ -148,7 +151,6 @@ const handleVcdParserReady = ($) => async () => {
 
   // cnt1.start(deso);
   if (vcdUrl) {
-    $.state.loadVcdT0 = Date.now();
     $.vcdromWorker.postMessage({cmd: 'loadVcd', data: vcdUrl});
   }
 };

lib/stream-data.js

@@ -18,7 +18,7 @@ const streamData = async ($, dataFileName) => {
   });
   const reader = resp.body.getReader();
 
-  const stats = {numChunks: 0, maxLength: 0, totalLength: 0};
+  const stats = {numChunks: 0, maxLength: 0, totalLength: 0, realT0: Date.now()};
 
   for (let i = 0; i < 10000; i++) {
     const { value, done } = await reader.read();

lib/vcdrom-worker.js

@@ -34,20 +34,12 @@ const main = async () => {
     loadWasm: async () => {
       console.log('rx: loadWasm');
       await loadWasm($, vcd2wasm);
-      $.memory = $.wasmInstance.exports.memory;
-      addWasmMemoryViews($);
       postMessage({cmd: 'wasmMemory', data: $.memory});
     },
     loadVcd: async (e) => {
       console.log('rx: loadVcd');
-      const t1 = Date.now();
       const stats = await streamData($, e.data.data);
-      const t2 = Date.now();
-      stats.tStream = t2 - t1;
-      stats.tLoad = t1 - t0;
-      stats[0] = 1000 * stats.totalLength / stats.tStream;
-      // console.log(stats);
-      postMessage({cmd: 'loadVcdDone'});
+      postMessage({cmd: 'loadVcdDone', data: stats});
     }
   };