CPUUsage: don't count NaN values

CarterLi · CarterLi · commit 4cabc5684b19 · 2023-11-01T15:55:13.000+08:00
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
@@ -22,7 +22,7 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
     double maxValue = -999, minValue = 999, sumValue = 0;
     uint32_t maxIndex = 999, minIndex = 999;
 
-    uint32_t index = 0;
+    uint32_t index = 0, valueCount = 0;
     FF_LIST_FOR_EACH(double, percent, percentages)
     {
         if (*percent == *percent)
@@ -38,10 +38,11 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
                 minValue = *percent;
                 minIndex = index;
             }
+            ++valueCount;
         }
         ++index;
     }
-    double avgValue = sumValue / (double) percentages.length;
+    double avgValue = sumValue / (double) valueCount;
 
     if(options->moduleArgs.outputFormat.length == 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)`
`22`	`22`	`double maxValue = -999, minValue = 999, sumValue = 0;`
`23`	`23`	`uint32_t maxIndex = 999, minIndex = 999;`
`24`	`24`
`25`		`- uint32_t index = 0;`
	`25`	`+ uint32_t index = 0, valueCount = 0;`
`26`	`26`	`FF_LIST_FOR_EACH(double, percent, percentages)`
`27`	`27`	`{`
`28`	`28`	`if (percent == percent)`
`@@ -38,10 +38,11 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)`
`38`	`38`	`minValue = *percent;`
`39`	`39`	`minIndex = index;`
`40`	`40`	`}`
	`41`	`+ ++valueCount;`
`41`	`42`	`}`
`42`	`43`	`++index;`
`43`	`44`	`}`
`44`		`- double avgValue = sumValue / (double) percentages.length;`
	`45`	`+ double avgValue = sumValue / (double) valueCount;`
`45`	`46`
`46`	`47`	`if(options->moduleArgs.outputFormat.length == 0)`
`47`	`48`	`{`