minor logging improvements

Author: planetchili

IntelPresentMon/Interprocess/source/metadata/EnumStatus.h

@@ -10,7 +10,7 @@
 		X_(STATUS, INVALID_ETL_FILE, "Invalid ETL File", "", "") \
 		X_(STATUS, DATA_LOSS, "Data Loss", "", "Data was overwritten before being read by client") \
 		X_(STATUS, NO_DATA, "No Data", "", "No data is available") \
-		X_(STATUS, INVALID_PID, "Invalid PID", "", "PID does not match a process being tracked") \
+		X_(STATUS, INVALID_PID, "Invalid PID", "", "PID does not exist or does not match a process being tracked") \
 		X_(STATUS, STREAM_ALREADY_EXISTS, "Stream Already Exists", "", "Tried to open stream for a process already being tracked") \
 		X_(STATUS, UNABLE_TO_CREATE_NSM, "Unable to Create NSM", "", "Service failed to create shrared memory for data transfer") \
 		X_(STATUS, INVALID_ADAPTER_ID, "Invalid Adapter ID", "", "Graphics adapter ID provided does not match any ID in service") \

IntelPresentMon/PresentMonAPIWrapperCommon/Introspection.cpp

@@ -524,7 +524,7 @@ namespace pmapi::intro
     MetricView Root::FindMetric(PM_METRIC metricId) const
     {
         if (auto i = metricMap.find(metricId); i == metricMap.end()) {
-            pmlog_error(std::format(L"Cannot find metric id={} in introspection data", (int)metricId)).diag();
+            pmlog_error(std::format(L"Cannot find metric id={} in introspection database", (int)metricId)).diag();
             throw LookupException{ std::format("unable to find metric ID={}", (int)metricId) };
         }
         else {

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -10,6 +10,7 @@
 #include <cstdlib>
 #include <Shlwapi.h>
 #include <numeric>
+#include <algorithm>
 #include "../PresentMonUtils/NamedPipeHelper.h"
 #include "../PresentMonUtils/QPCUtils.h"
 #include "../PresentMonAPI2/Internal.h"
@@ -36,6 +37,8 @@ namespace pmon::mid
 {
     using namespace ipc::intro;
     using namespace util;
+    namespace rn = std::ranges;
+    namespace vi = std::views;
 
     static const uint32_t kMaxRespBufferSize = 4096;
 	static const uint64_t kClientFrameDeltaQPCThreshold = 50000000;
@@ -205,6 +208,7 @@ namespace pmon::mid
 
         PM_STATUS status = CallPmService(&requestBuffer, &responseBuffer);
         if (status != PM_STATUS::PM_STATUS_SUCCESS) {
+            pmlog_error(L"Failed to call PmService");
             return status;
         }
 
@@ -213,6 +217,13 @@ namespace pmon::mid
         status = NamedPipeHelper::DecodeStartStreamingResponse(
             &responseBuffer, &startStreamResponse);
         if (status != PM_STATUS::PM_STATUS_SUCCESS) {
+            if (status == PM_STATUS_INVALID_PID) {
+                pmlog_error(std::format(L"failed to begin tracking process: pid [{}] does not exist",
+                    processId)).diag();
+            }
+            else {
+                pmlog_error(std::format(L"failed to begin tracking pid [{}]", processId)).diag();
+            }
             return status;
         }
 
@@ -232,7 +243,7 @@ namespace pmon::mid
             }
         }
 
-        pmlog_info(std::format(L"Streaming started for pid [{}]", processId)).diag();
+        pmlog_info(std::format(L"Started tracking pid [{}]", processId)).diag();
 
         return PM_STATUS_SUCCESS;
     }
@@ -386,11 +397,13 @@ namespace pmon::mid
                 else {
                     // Go through the cached Gpus and see which device the client
                     // wants
-                    for (int i = 0; i < cachedGpuInfo.size(); i++) {
-                        if (qe.deviceId == cachedGpuInfo[i].deviceId) {
-                            cachedGpuInfoIndex = i;
-                            break;
-                        }
+                    if (auto i = rn::find(cachedGpuInfo, qe.deviceId, &DeviceInfo::deviceId);
+                        i != cachedGpuInfo.end()) {
+                        cachedGpuInfoIndex = uint32_t(i - cachedGpuInfo.begin());
+                    }
+                    else {
+                        pmlog_error(std::format(L"unable to find device id [{}] while building dynamic query", qe.deviceId)).diag();
+                        // TODO: shouldn't we throw here?
                     }
                 }
             }

IntelPresentMon/SampleClient/DiagnosticDemo.cpp

@@ -59,14 +59,15 @@ void RunDiagnosticDemo(int mode)
 		// silently fail to register dynamic query properly
 		{
 			PM_QUERY_ELEMENT elements[]{
-				{ .metric = PM_METRIC_CPU_START_TIME, .stat = PM_STAT_AVG }
+				{ .metric = PM_METRIC_CPU_START_TIME, .stat = PM_STAT_AVG },
+				{ .metric = PM_METRIC_GPU_FREQUENCY, .stat = PM_STAT_AVG, .deviceId = 42 },
 			};
 			sesh.RegisterDyanamicQuery(elements);
 		}
 		// hard fail to register dynamic query with bogus metric id
 		try {
 			PM_QUERY_ELEMENT elements[]{
-				{.metric = PM_METRIC(42069), .stat = PM_STAT_AVG}
+				{ .metric = PM_METRIC(42069), .stat = PM_STAT_AVG }
 			};
 			sesh.RegisterDyanamicQuery(elements);
 		}

IntelPresentMon/SampleClient/SampleClient.args.json

@@ -36,7 +36,7 @@
     },
     {
       "Id": "78f46a64-b667-4d83-91f5-48b1332ca0c0",
-      "Command": "--diag-demo 14436"
+      "Command": "--diag-demo 32612"
     },
     {
       "Id": "edf9d064-e8f2-4c3c-8ab3-a70ae989a245",