Backmerge from main

Author: markgalvan-intel

IntelPresentMon/AppCef/source/util/CefValues.h

@@ -63,15 +63,15 @@ namespace p2c::client::util
 		}
 		else if constexpr (std::is_integral_v<T>)
 		{
-			return CefV8Value::CreateInt(int32(val));
+			return CefV8Value::CreateInt(int(val));
 		}
 		else if constexpr (std::is_floating_point_v<T>)
 		{
 			return CefV8Value::CreateDouble(double(val));
 		}
 		else if constexpr (std::is_enum_v<T>)
 		{
-			return CefV8Value::CreateInt(int32(val));
+			return CefV8Value::CreateInt(int(val));
 		}
 		else if constexpr (std::is_same_v<std::string, T> || std::is_same_v<std::wstring, T>)
 		{

IntelPresentMon/CommonUtilities/cli/CliFramework.h

@@ -87,6 +87,11 @@ namespace pmon::util::cli
 		{
 			pOption_ = pParent->app_.add_option(std::move(names), data_, std::move(description));
 		}
+		Option(const Option&) = delete;
+		Option & operator=(const Option&) = delete;
+		Option(Option&&) = delete;
+		Option & operator=(Option&&) = delete;
+		~Option() = default;
 		const T& operator*() const
 		{
 			return data_;

IntelPresentMon/Core/source/pmon/RawFrameDataWriter.cpp

@@ -100,7 +100,8 @@ namespace p2c::pmon
             if (available) {
                 const auto typeId = metric.GetDataTypeInfo().GetFrameType();
                 // DISPLAYED_TIME and DISPLAY_LATENCY should just show zeros when NaN is encountered
-                const bool zeroForNA = metricId == PM_METRIC_DISPLAYED_TIME || PM_METRIC_DISPLAY_LATENCY;
+                const bool zeroForNA = (metricId == PM_METRIC_DISPLAYED_TIME)
+                    || (metricId == PM_METRIC_DISPLAY_LATENCY);
                 // special case for TIME, it needs to be relative to TIME of first frame and scaled ms => s
                 if (metricId == PM_METRIC_TIME) {
                     pAnnotation = std::make_unique<TypedAnnotation_<TimeAnnotationType_>>();
@@ -336,7 +337,7 @@ namespace p2c::pmon
                     // tracking frame times
                     pStatsTracker->Push(pQueryElementContainer->ExtractFrameTimeFromBlob(pBlob));
                 }
-                pQueryElementContainer->WriteFrame(procTracker, procName, file, pBlob);
+                pQueryElementContainer->WriteFrame(procTracker.GetPid(), procName, file, pBlob);
             }
         } while (blobs.AllBlobsPopulated()); // if container filled, means more might be left
         file << std::flush;

IntelPresentMon/Core/source/pmon/metric/MetricFetcher.h

@@ -9,8 +9,14 @@ namespace p2c::pmon::met
     class MetricFetcher
     {
     public:
+        MetricFetcher() = default;
         virtual ~MetricFetcher();
         virtual std::wstring ReadStringValue();
         virtual std::optional<float> ReadValue() = 0;
+
+        MetricFetcher(const MetricFetcher&) = delete;
+        MetricFetcher & operator=(const MetricFetcher&) = delete;
+        MetricFetcher(MetricFetcher&&) = delete;
+        MetricFetcher & operator=(MetricFetcher&&) = delete;
     };
 }

IntelPresentMon/Interprocess/source/IntrospectionCloneAllocators.h

@@ -16,6 +16,7 @@ namespace pmon::ipc::intro
 		ProbeAllocator(const ProbeAllocator<void>& other)
 			: pTotalSize(other.pTotalSize)
 		{}
+		ProbeAllocator& operator=(const ProbeAllocator&) = delete;
 		T* allocate(size_t count)
 		{
 			*pTotalSize += sizeof(T) * count + util::GetPadding<T>(*pTotalSize);
@@ -43,6 +44,7 @@ namespace pmon::ipc::intro
 			pTotalSize(other.pTotalSize),
 			pBytes{ other.pBytes }
 		{}
+		BlockAllocator& operator=(const BlockAllocator&) = delete;
 		T* allocate(size_t count)
 		{
 			*pTotalSize += util::GetPadding<T>(*pTotalSize);

IntelPresentMon/Interprocess/source/metadata/EnumStat.h

@@ -4,15 +4,18 @@
 // enum annotation (enum_name_fragment, key_name_fragment, name, short_name, description)
 #define ENUM_KEY_LIST_STAT(X_) \
 		X_(STAT, NONE, "None", "", "Null stat, typically used when querying static or consuming frame events") \
-		X_(STAT, AVG, "Average", "avg", "Average or mean of frame samples over the sliding window") \
-		X_(STAT, PERCENTILE_99, "99th Percentile", "99%", "Value below which 99% of the observations within the sliding window fall (worst 1% value)") \
-		X_(STAT, PERCENTILE_95, "95th Percentile", "95%", "Value below which 95% of the observations within the sliding window fall (worst 5% value)") \
-		X_(STAT, PERCENTILE_90, "90th Percentile", "90%", "Value below which 90% of the observations within the sliding window fall (worst 10% value)") \
-		X_(STAT, MAX, "Maximum", "max", "Maximum value of frame samples within the sliding window") \
-		X_(STAT, MIN, "Minimum", "min", "Minimum value of frame samples within the sliding window") \
-		X_(STAT, MID_POINT, "Midpoint", "raw", "Point sample of the frame data nearest to the middle of the sliding window") \
-		X_(STAT, MID_LERP, "Mid Lerp", "mlp", "Linear interpolation between the two points nearest to the middle of the sliding window") \
-		X_(STAT, NEWEST_POINT, "Newest Point", "npt", "Value in the most recent frame in the sliding window") \
-		X_(STAT, OLDEST_POINT, "Oldest Point", "opt", "Value in the least recent frame in the sliding window") \
-		X_(STAT, COUNT, "Count", "cnt", "Count of frames in the sliding window matching a predicate (e.g. counting # of frames for which a field is boolean true)") \
+		X_(STAT, AVG, "Average", "avg", "Average or mean of observations over the sliding window") \
+		X_(STAT, PERCENTILE_99, "99th Percentile", "99%", "Value below which 99% of the observations within the sliding window fall") \
+		X_(STAT, PERCENTILE_95, "95th Percentile", "95%", "Value below which 95% of the observations within the sliding window fall") \
+		X_(STAT, PERCENTILE_90, "90th Percentile", "90%", "Value below which 90% of the observations within the sliding window fall") \
+		X_(STAT, PERCENTILE_01, "1st Percentile", "1%", "Value below which 1% of the observations within the sliding window fall") \
+		X_(STAT, PERCENTILE_05, "5th Percentile", "5%", "Value below which 5% of the observations within the sliding window fall") \
+		X_(STAT, PERCENTILE_10, "10th Percentile", "10%", "Value below which 10% of the observations within the sliding window fall") \
+		X_(STAT, MAX, "Maximum", "max", "Maximum value of observations within the sliding window") \
+		X_(STAT, MIN, "Minimum", "min", "Minimum value of observations within the sliding window") \
+		X_(STAT, MID_POINT, "Midpoint", "raw", "Point sample of the observation nearest to the middle of the sliding window") \
+		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, 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/StatsShortcuts.h

@@ -2,4 +2,5 @@
 #include "../../../PresentMonAPI2/PresentMonAPI.h"
 
 #define FULL_STATS PM_STAT_AVG, PM_STAT_PERCENTILE_99, PM_STAT_PERCENTILE_95, \
-	PM_STAT_PERCENTILE_90, PM_STAT_MAX, PM_STAT_MIN, PM_STAT_MID_POINT
+	PM_STAT_PERCENTILE_90, PM_STAT_PERCENTILE_01, PM_STAT_PERCENTILE_05, \
+	PM_STAT_PERCENTILE_10, PM_STAT_MAX, PM_STAT_MIN, PM_STAT_MID_POINT