Merge pull request #40 from intel-innersource/feature/non-zero-avg

Feature/non zero avg

Author: markgalvan-intel

IntelPresentMon/AppCef/Web/src/views/LoadoutConfigView.vue

@@ -193,7 +193,7 @@ export default Vue.extend({
   flex: 3;
 }
 .widget-row .widget-cell.col-stat {
-  width: 90px;
+  width: 110px;
 }
 .widget-row .widget-cell.col-type {
   width: 120px;

IntelPresentMon/CommonUtilities/str/String.cpp

@@ -1,9 +1,10 @@
 // Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "String.h"
-#include <stdlib.h>
 #include <sstream>
 #include <iomanip>
+// TODO: replace with with properly wrapped winapi include
+#include <Windows.h>
 
 namespace pmon::util::str
 {
@@ -27,25 +28,34 @@ namespace pmon::util::str
 
 	std::wstring ToWide(const std::string& narrow)
 	{
+		if (narrow.empty()) {
+			return {};
+		}
 		std::wstring wide;
+		// TODO: replace with resize_and_overwrite when it becomes widely available
 		wide.resize(narrow.size() + 1);
-		size_t actual;
-		mbstowcs_s(&actual, wide.data(), wide.size(), narrow.c_str(), _TRUNCATE);
-		if (actual > 0)
-		{
-			wide.resize(actual - 1);
+		const auto actual = MultiByteToWideChar(CP_UTF8, 0, narrow.data(), (int)narrow.size(), wide.data(), (int)wide.size());
+		if (actual > 0) {
+			wide.resize(actual);
 			return wide;
 		}
+		// TODO: log error here
 		return {};
 	}
 
 	std::string ToNarrow(const std::wstring& wide)
 	{
 		std::string narrow;
+		// TODO: replace with resize_and_overwrite when it becomes widely available
 		narrow.resize(wide.size() * 2);
-		size_t actual;
-		wcstombs_s(&actual, narrow.data(), narrow.size(), wide.c_str(), _TRUNCATE);
-		narrow.resize(actual - 1);
-		return narrow;
+		const auto actual = WideCharToMultiByte(CP_UTF8, 0, wide.data(), (int)wide.size(),
+			narrow.data(), (int)narrow.size(), nullptr, nullptr);
+		if (actual > 0) {
+			narrow.resize(actual);
+			return narrow;
+		}
+		// TODO: (maybe) check for insufficient buffer error and do redo with two-pass (or just double buffer again)
+		// TODO: log error here
+		return {};
 	}
 }

IntelPresentMon/Interprocess/source/metadata/EnumStat.h

@@ -17,4 +17,5 @@
 		X_(STAT, MID_LERP, "Mid Lerp", "mlp", "Linear interpolation between the two observations nearest to the middle of the sliding window") \
 		X_(STAT, NEWEST_POINT, "Newest Point", "npt", "Value in the most recent observation in the sliding window") \
 		X_(STAT, OLDEST_POINT, "Oldest Point", "opt", "Value in the least recent observation in the sliding window") \
-		X_(STAT, COUNT, "Count", "cnt", "Count of observations in the sliding window matching a predicate (e.g. counting # of observations for which a field is boolean true)")
+		X_(STAT, COUNT, "Count", "cnt", "Count of observations in the sliding window matching a predicate (e.g. counting # of observations for which a field is boolean true)") \
+		X_(STAT, NON_ZERO_AVG, "Non-zero Average", (const char*)u8"øavg", "Average or mean of frame samples over the sliding window, excluding all zero values")

IntelPresentMon/Interprocess/source/metadata/EnumUnit.h

@@ -23,7 +23,7 @@
 		X_(UNIT, KILOHERTZ, "Kilohertz", "kHz", "Frequency in thousands of cycles per second") \
 		X_(UNIT, MEGAHERTZ, "Megahertz", "MHz", "Frequency in millions of cycles per second") \
 		X_(UNIT, GIGAHERTZ, "Gigahertz", "GHz", "Frequency in billions of cycles per second") \
-		X_(UNIT, CELSIUS, "Degrees Celsius", "C", "Temperature in degrees Celsius") \
+		X_(UNIT, CELSIUS, "Degrees Celsius", (const char*)u8"°C", "Temperature in degrees Celsius") \
 		X_(UNIT, RPM, "Revolutions per Minute", "RPM", "Angular speed in revolutions per minute") \
 		X_(UNIT, BITS_PER_SECOND, "Bits per Second", "bps", "Bandwidth / data throughput in bits per second") \
 		X_(UNIT, KILOBITS_PER_SECOND, "Kilobits per Second", "kbps", "Bandwidth / data throughput in kilobits per second") \

IntelPresentMon/Interprocess/source/metadata/MetricList.h

@@ -36,7 +36,7 @@
 \
 		X_(PM_METRIC_GPU_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_DISPLAY_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
-		X_(PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
+		X_(PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NON_ZERO_AVG, PM_STAT_PERCENTILE_01, PM_STAT_PERCENTILE_05, PM_STAT_PERCENTILE_10, PM_STAT_MAX) \
 		X_(PM_METRIC_INPUT_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 \
 		X_(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, PM_METRIC_TYPE_STATIC, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, PM_STAT_NONE) \

IntelPresentMon/PMInstaller/PresentMon.wxs

@@ -4,7 +4,7 @@
         Id="*"
         Name="Intel(R) PresentMon"
         Language="1033"
-        Version="0.7.0.0"
+        Version="2.0.0.0"
         Manufacturer="Intel(R) Corporation"
         UpgradeCode="CD0D489E-0FE7-452D-90D9-F94F3F5FF410">
 

IntelPresentMon/PresentMonAPI2/PresentMonAPI.h

@@ -191,6 +191,7 @@ extern "C" {
 		PM_STAT_NEWEST_POINT,
 		PM_STAT_OLDEST_POINT,
 		PM_STAT_COUNT,
+		PM_STAT_NON_ZERO_AVG,
 	};
 
 	enum PM_DATA_TYPE

IntelPresentMon/PresentMonMiddleware/source/ConcreteMiddleware.cpp

@@ -7,6 +7,7 @@
 #include <cassert>
 #include <cstdlib>
 #include <Shlwapi.h>
+#include <numeric>
 #include "../../PresentMonUtils/NamedPipeHelper.h"
 #include "../../PresentMonUtils/QPCUtils.h"
 #include "../../PresentMonAPI2/Internal.h"
@@ -1126,6 +1127,13 @@ void ReportMetrics(
                 output /= inData.size();
                 return;
             }
+            else if (stat == PM_STAT_NON_ZERO_AVG)
+            {
+                std::vector<double> non_zero_data;
+                std::copy_if(inData.begin(), inData.end(), std::back_inserter(non_zero_data),
+                    [](double value) { return value != 0.0; });
+                output = !non_zero_data.empty() ? std::accumulate(non_zero_data.begin(), non_zero_data.end(), 0.0) / non_zero_data.size() : 0.0;
+            }
             else if (stat == PM_STAT_MID_POINT)
             {
                 size_t middle_index = inData.size() / 2;

IntelPresentMon/Streamer/StreamClient.cpp

@@ -228,7 +228,7 @@ const PmNsmFrameData* StreamClient::PeekPreviousFrame()
 
 PM_STATUS StreamClient::ConsumePtrToNextNsmFrameData(const PmNsmFrameData** pNsmData)
 {
-    if (*pNsmData == nullptr) {
+    if (pNsmData == nullptr) {
         return PM_STATUS::PM_STATUS_FAILURE;
     }