@jsenv/test 3.0.21 → 3.0.23

package/dist/jsenv_test.js

@@ -3081,7 +3081,6 @@ const startMeasuringTotalCpuUsage = () => {
     system: 0,
     user: 0,
   };
-
   const thisProcess = {
     active: 0,
     system: 0,
@@ -3101,7 +3100,7 @@ const startMeasuringTotalCpuUsage = () => {
     let cpuArray = cpus();
     const ms = Date.now();
     const ellapsedMs = ms - previousMs;
-    const cpuUsagesSample = [];
+    const cpuUsageSampleArray = [];
     let overallSystemMs = 0;
     let overallUserMs = 0;
     let overallInactiveMs = 0;
@@ -3121,7 +3120,7 @@ const startMeasuringTotalCpuUsage = () => {
         system: systemMs / ellapsedMs,
         user: userMs / ellapsedMs,
       };
-      cpuUsagesSample.push(cpuUsageSample);
+      cpuUsageSampleArray.push(cpuUsageSample);
 
       overallSystemMs += systemMs;
       overallUserMs += userMs;
@@ -3138,10 +3137,6 @@ const startMeasuringTotalCpuUsage = () => {
     };
     previousCpuArray = cpuArray;
     previousMs = ms;
-    samples.push({
-      cpuUsagesSample,
-      overallUsageSample,
-    });
 
     const processCpuUsage = cpuUsage();
     const thisProcessSystemMs = Math.round(
@@ -3151,53 +3146,83 @@ const startMeasuringTotalCpuUsage = () => {
       (processCpuUsage.user - previousCpuUsage.user) / 1000,
     );
     previousCpuUsage = processCpuUsage;
-    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
-    thisProcess.active = thisProcessActiveMs / overallMsEllapsed;
-    thisProcess.system = thisProcessSystemMs / overallMsEllapsed;
-    thisProcess.user = thisProcessUserMs / overallMsEllapsed;
 
+    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
+    const thisProcessInactiveMs = overallMsEllapsed - thisProcessActiveMs;
+    const thisProcessSample = {
+      inactive: thisProcessInactiveMs / overallMsEllapsed,
+      active: thisProcessActiveMs / overallMsEllapsed,
+      system: thisProcessSystemMs / overallMsEllapsed,
+      user: thisProcessUserMs / overallMsEllapsed,
+    };
+    samples.push({
+      cpuUsageSampleArray,
+      overallUsageSample,
+      thisProcessSample,
+    });
     if (samples.length === 10) {
-      let index = 0;
-      for (const detail of details) {
-        let systemSum = 0;
-        let userSum = 0;
-        let inactiveSum = 0;
-        let activeSum = 0;
+      {
+        let index = 0;
+        for (const detail of details) {
+          let systemSum = 0;
+          let userSum = 0;
+          let inactiveSum = 0;
+          let activeSum = 0;
+          for (const sample of samples) {
+            const { cpuUsageSampleArray } = sample;
+            const cpuUsageSample = cpuUsageSampleArray[index];
+            inactiveSum += cpuUsageSample.inactive;
+            activeSum += cpuUsageSample.active;
+            systemSum += cpuUsageSample.system;
+            userSum += cpuUsageSample.user;
+          }
+          Object.assign(detail, {
+            inactive: inactiveSum / samples.length,
+            active: activeSum / samples.length,
+            system: systemSum / samples.length,
+            user: userSum / samples.length,
+          });
+          index++;
+        }
+      }
+      {
+        let overallSystemSum = 0;
+        let overallUserSum = 0;
+        let overallInactiveSum = 0;
+        let overallActiveSum = 0;
         for (const sample of samples) {
-          const { cpuUsagesSample } = sample;
-          const cpuUsageSample = cpuUsagesSample[index];
-          inactiveSum += cpuUsageSample.inactive;
-          activeSum += cpuUsageSample.active;
-          systemSum += cpuUsageSample.system;
-          userSum += cpuUsageSample.user;
+          const { overallUsageSample } = sample;
+          overallSystemSum += overallUsageSample.system;
+          overallUserSum += overallUsageSample.user;
+          overallInactiveSum += overallUsageSample.inactive;
+          overallActiveSum += overallUsageSample.active;
         }
-        Object.assign(detail, {
-          inactive: inactiveSum / samples.length,
-          active: activeSum / samples.length,
-          system: systemSum / samples.length,
-          user: userSum / samples.length,
+        Object.assign(overall, {
+          inactive: overallInactiveSum / samples.length,
+          active: overallActiveSum / samples.length,
+          system: overallSystemSum / samples.length,
+          user: overallUserSum / samples.length,
         });
-        index++;
       }
-
-      let overallSystemSum = 0;
-      let overallUserSum = 0;
-      let overallInactiveSum = 0;
-      let overallActiveSum = 0;
-      for (const sample of samples) {
-        const { overallUsageSample } = sample;
-        overallSystemSum += overallUsageSample.system;
-        overallUserSum += overallUsageSample.user;
-        overallInactiveSum += overallUsageSample.inactive;
-        overallActiveSum += overallUsageSample.active;
+      {
+        let thisProcessSystemSum = 0;
+        let thisProcessUserSum = 0;
+        let thisProcessInactiveSum = 0;
+        let thisProcessActiveSum = 0;
+        for (const sample of samples) {
+          const { thisProcessSample } = sample;
+          thisProcessSystemSum += thisProcessSample.system;
+          thisProcessUserSum += thisProcessSample.user;
+          thisProcessInactiveSum += thisProcessSample.inactive;
+          thisProcessActiveSum += thisProcessSample.active;
+        }
+        Object.assign(thisProcess, {
+          inactive: thisProcessInactiveSum / samples.length,
+          active: thisProcessActiveSum / samples.length,
+          system: thisProcessSystemSum / samples.length,
+          user: thisProcessUserSum / samples.length,
+        });
       }
-      Object.assign(overall, {
-        inactive: overallInactiveSum / samples.length,
-        active: overallActiveSum / samples.length,
-        system: overallSystemSum / samples.length,
-        user: overallUserSum / samples.length,
-      });
-      // console.log(formatUsage(globalUsageInfo));
       samples.length = 0;
     }
   }, 15);
@@ -5289,6 +5314,13 @@ const renderErrors = (execution, logOptions) => {
 };
 
 const renderOutro = (testPlanResult, logOptions = {}) => {
+  return `\n${renderBigSection({
+    title: "execution end",
+    content: renderOutroContent(testPlanResult, logOptions),
+  })}\n`;
+};
+
+const renderOutroContent = (testPlanResult, logOptions = {}) => {
   const lines = [];
   const { counters } = testPlanResult;
   const { planified } = counters;
@@ -5348,11 +5380,7 @@ const renderOutro = (testPlanResult, logOptions = {}) => {
     });
     lines.push(memoryUsageLine);
   }
-
-  return `\n${renderBigSection({
-    title: "execution end",
-    content: lines.join("\n"),
-  })}\n`;
+  return lines.join("\n");
 };
 
 const humanizeTiming = (value) => {
@@ -6197,7 +6225,7 @@ To fix this warning:
             },
             afterAll: async () => {
               const title = "Jsenv test results";
-              const summaryText = stripAnsi(renderOutro(testPlanResult));
+              const summaryText = stripAnsi(renderOutroContent(testPlanResult));
               if (testPlanResult.failed) {
                 await githubCheckRun.fail({
                   title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.0.21",
+  "version": "3.0.23",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/execution/execute_test_plan.js

@@ -32,7 +32,7 @@ import { generateCoverage } from "../coverage/generate_coverage.js";
 import { assertAndNormalizeWebServer } from "./web_server_param.js";
 import { githubAnnotationFromError } from "./github_annotation_from_error.js";
 import { run } from "./run.js";
-import { reporterList, renderOutro } from "./reporters/reporter_list.js";
+import { reporterList, renderOutroContent } from "./reporters/reporter_list.js";
 
 /**
  * Execute a list of files and log how it goes.
@@ -744,7 +744,7 @@ To fix this warning:
             },
             afterAll: async () => {
               const title = "Jsenv test results";
-              const summaryText = stripAnsi(renderOutro(testPlanResult));
+              const summaryText = stripAnsi(renderOutroContent(testPlanResult));
               if (testPlanResult.failed) {
                 await githubCheckRun.fail({
                   title,

package/src/execution/reporters/reporter_list.js

@@ -580,7 +580,14 @@ const renderErrors = (execution, logOptions) => {
   });
 };
 
-export const renderOutro = (testPlanResult, logOptions = {}) => {
+const renderOutro = (testPlanResult, logOptions = {}) => {
+  return `\n${renderBigSection({
+    title: "execution end",
+    content: renderOutroContent(testPlanResult, logOptions),
+  })}\n`;
+};
+
+export const renderOutroContent = (testPlanResult, logOptions = {}) => {
   const lines = [];
   const { counters } = testPlanResult;
   const { planified } = counters;
@@ -640,11 +647,7 @@ export const renderOutro = (testPlanResult, logOptions = {}) => {
     });
     lines.push(memoryUsageLine);
   }
-
-  return `\n${renderBigSection({
-    title: "execution end",
-    content: lines.join("\n"),
-  })}\n`;
+  return lines.join("\n");
 };
 
 const humanizeTiming = (value) => {

package/src/helpers/cpu_usage.js

@@ -14,7 +14,6 @@ export const startMeasuringTotalCpuUsage = () => {
     system: 0,
     user: 0,
   };
-
   const thisProcess = {
     active: 0,
     system: 0,
@@ -34,7 +33,7 @@ export const startMeasuringTotalCpuUsage = () => {
     let cpuArray = cpus();
     const ms = Date.now();
     const ellapsedMs = ms - previousMs;
-    const cpuUsagesSample = [];
+    const cpuUsageSampleArray = [];
     let overallSystemMs = 0;
     let overallUserMs = 0;
     let overallInactiveMs = 0;
@@ -54,7 +53,7 @@ export const startMeasuringTotalCpuUsage = () => {
         system: systemMs / ellapsedMs,
         user: userMs / ellapsedMs,
       };
-      cpuUsagesSample.push(cpuUsageSample);
+      cpuUsageSampleArray.push(cpuUsageSample);
 
       overallSystemMs += systemMs;
       overallUserMs += userMs;
@@ -71,10 +70,6 @@ export const startMeasuringTotalCpuUsage = () => {
     };
     previousCpuArray = cpuArray;
     previousMs = ms;
-    samples.push({
-      cpuUsagesSample,
-      overallUsageSample,
-    });
 
     const processCpuUsage = cpuUsage();
     const thisProcessSystemMs = Math.round(
@@ -84,53 +79,83 @@ export const startMeasuringTotalCpuUsage = () => {
       (processCpuUsage.user - previousCpuUsage.user) / 1000,
     );
     previousCpuUsage = processCpuUsage;
-    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
-    thisProcess.active = thisProcessActiveMs / overallMsEllapsed;
-    thisProcess.system = thisProcessSystemMs / overallMsEllapsed;
-    thisProcess.user = thisProcessUserMs / overallMsEllapsed;
 
+    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
+    const thisProcessInactiveMs = overallMsEllapsed - thisProcessActiveMs;
+    const thisProcessSample = {
+      inactive: thisProcessInactiveMs / overallMsEllapsed,
+      active: thisProcessActiveMs / overallMsEllapsed,
+      system: thisProcessSystemMs / overallMsEllapsed,
+      user: thisProcessUserMs / overallMsEllapsed,
+    };
+    samples.push({
+      cpuUsageSampleArray,
+      overallUsageSample,
+      thisProcessSample,
+    });
     if (samples.length === 10) {
-      let index = 0;
-      for (const detail of details) {
-        let systemSum = 0;
-        let userSum = 0;
-        let inactiveSum = 0;
-        let activeSum = 0;
+      per_cpu: {
+        let index = 0;
+        for (const detail of details) {
+          let systemSum = 0;
+          let userSum = 0;
+          let inactiveSum = 0;
+          let activeSum = 0;
+          for (const sample of samples) {
+            const { cpuUsageSampleArray } = sample;
+            const cpuUsageSample = cpuUsageSampleArray[index];
+            inactiveSum += cpuUsageSample.inactive;
+            activeSum += cpuUsageSample.active;
+            systemSum += cpuUsageSample.system;
+            userSum += cpuUsageSample.user;
+          }
+          Object.assign(detail, {
+            inactive: inactiveSum / samples.length,
+            active: activeSum / samples.length,
+            system: systemSum / samples.length,
+            user: userSum / samples.length,
+          });
+          index++;
+        }
+      }
+      all: {
+        let overallSystemSum = 0;
+        let overallUserSum = 0;
+        let overallInactiveSum = 0;
+        let overallActiveSum = 0;
         for (const sample of samples) {
-          const { cpuUsagesSample } = sample;
-          const cpuUsageSample = cpuUsagesSample[index];
-          inactiveSum += cpuUsageSample.inactive;
-          activeSum += cpuUsageSample.active;
-          systemSum += cpuUsageSample.system;
-          userSum += cpuUsageSample.user;
+          const { overallUsageSample } = sample;
+          overallSystemSum += overallUsageSample.system;
+          overallUserSum += overallUsageSample.user;
+          overallInactiveSum += overallUsageSample.inactive;
+          overallActiveSum += overallUsageSample.active;
         }
-        Object.assign(detail, {
-          inactive: inactiveSum / samples.length,
-          active: activeSum / samples.length,
-          system: systemSum / samples.length,
-          user: userSum / samples.length,
+        Object.assign(overall, {
+          inactive: overallInactiveSum / samples.length,
+          active: overallActiveSum / samples.length,
+          system: overallSystemSum / samples.length,
+          user: overallUserSum / samples.length,
         });
-        index++;
       }
-
-      let overallSystemSum = 0;
-      let overallUserSum = 0;
-      let overallInactiveSum = 0;
-      let overallActiveSum = 0;
-      for (const sample of samples) {
-        const { overallUsageSample } = sample;
-        overallSystemSum += overallUsageSample.system;
-        overallUserSum += overallUsageSample.user;
-        overallInactiveSum += overallUsageSample.inactive;
-        overallActiveSum += overallUsageSample.active;
+      this_process: {
+        let thisProcessSystemSum = 0;
+        let thisProcessUserSum = 0;
+        let thisProcessInactiveSum = 0;
+        let thisProcessActiveSum = 0;
+        for (const sample of samples) {
+          const { thisProcessSample } = sample;
+          thisProcessSystemSum += thisProcessSample.system;
+          thisProcessUserSum += thisProcessSample.user;
+          thisProcessInactiveSum += thisProcessSample.inactive;
+          thisProcessActiveSum += thisProcessSample.active;
+        }
+        Object.assign(thisProcess, {
+          inactive: thisProcessInactiveSum / samples.length,
+          active: thisProcessActiveSum / samples.length,
+          system: thisProcessSystemSum / samples.length,
+          user: thisProcessUserSum / samples.length,
+        });
       }
-      Object.assign(overall, {
-        inactive: overallInactiveSum / samples.length,
-        active: overallActiveSum / samples.length,
-        system: overallSystemSum / samples.length,
-        user: overallUserSum / samples.length,
-      });
-      // console.log(formatUsage(globalUsageInfo));
       samples.length = 0;
     }
   }, 15);

package/src/helpers/cpu_usage.test_manual.js

@@ -11,5 +11,7 @@ setInterval(() => {
 
 const totalCpuUsage = startMeasuringTotalCpuUsage();
 setInterval(() => {
-  console.log(formatUsage(totalCpuUsage.overall));
+  console.log(`overall: ${formatUsage(totalCpuUsage.overall)}
+this process: ${formatUsage(totalCpuUsage.thisProcess)}
+`);
 }, 400);