Merge pull request #512 from GameTechDev/feature/multi-client-enhance

Feature/multi client enhance

Author: markgalvan-intel

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -84,6 +84,8 @@
     <ClInclude Include="ref\StaticReflection.h" />
     <ClInclude Include="ref\WrapReflect.h" />
     <ClInclude Include="reg\Registry.h" />
+    <ClInclude Include="rng\MemberSlice.h" />
+    <ClInclude Include="rng\OptionalMinMax.h" />
     <ClInclude Include="rng\PairToRange.h" />
     <ClInclude Include="str\String.h" />
     <ClInclude Include="third\reflect.hpp" />

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters

@@ -273,6 +273,12 @@
     <ClInclude Include="win\com\WbemSink.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="rng\MemberSlice.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rng\OptionalMinMax.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="cli\CliFramework.cpp">

IntelPresentMon/CommonUtilities/Meta.h

@@ -4,9 +4,11 @@
 
 namespace pmon::util
 {
-    // Helper: dependent_false for static_assert in templates.
+    // Helper: DependentFalse for static_assert in templates.
     template<typename T>
-    struct dependent_false : std::false_type {};
+    struct DependentFalseT : std::false_type {};
+    template<typename T>
+    inline constexpr bool DependentFalse = DependentFalseT<T>::value;
 
     // deconstruct member pointer into the object type the pointer works with and the member type
     template <typename T> struct MemberPointerInfo;

IntelPresentMon/CommonUtilities/rng/MemberSlice.h

@@ -0,0 +1,34 @@
+#pragma once
+#include <concepts>
+#include <ranges>
+#include <type_traits>
+#include <utility>
+#include "../Meta.h"
+
+namespace pmon::util::rng
+{
+    // Takes a range R and a pointer-to-data-member `mp`.
+    // If range elements have that member, returns a view of it.
+    // If range elements are pair-like with `.second` having that member,
+    // it returns a view of `.second.*mp`.
+    template<std::ranges::input_range R, class MP>
+        requires std::is_member_object_pointer_v<std::remove_cvref_t<MP>>
+    auto MemberSlice(R&& r, MP mp)
+    {
+        // Transform projection that preserves reference categories and cv
+        auto proj = [mp]<class E>(E&& e) -> decltype(auto) {
+            // Direct member on the element
+            if constexpr (requires { (std::forward<E>(e)).*mp; }) {
+                return (std::forward<E>(e)).*mp;
+            }
+            // Member on mapped value of a pair-like element
+            else if constexpr (requires { (std::forward<E>(e)).second.*mp; }) {
+                return (std::forward<E>(e)).second.*mp;
+            }
+            else {
+                static_assert(DependentFalse<E>, "MemberSlice: element type does not match the member pointer");
+            }
+        };
+        return std::forward<R>(r) | std::views::transform(proj);
+    }
+}

IntelPresentMon/CommonUtilities/rng/OptionalMinMax.h

@@ -0,0 +1,44 @@
+#pragma once
+#include <ranges>
+#include <optional>
+#include <utility>
+#include <type_traits>
+
+namespace pmon::util::rng
+{
+    namespace {
+        template<class R>
+        using OptionalRangeValueType_ =
+            typename std::remove_cvref_t<std::ranges::range_reference_t<R>>::value_type;
+    }
+
+    // OptionalMin: min over present values; nullopt if none present
+    template<class R, class Comp = std::ranges::less>
+    auto OptionalMin(R&& r, Comp comp = {}) -> std::optional<OptionalRangeValueType_<R>>
+    {
+        using T = OptionalRangeValueType_<R>;
+        std::optional<T> acc;
+        for (auto&& o : r) {
+            if (!o) continue;
+            if (!acc || std::invoke(comp, *o, *acc)) {
+                acc = *o;
+            }
+        }
+        return acc;
+    }
+
+    // OptionalMax: max over present values; nullopt if none present
+    template<class R, class Comp = std::ranges::less>
+    auto OptionalMax(R&& r, Comp comp = {}) -> std::optional<OptionalRangeValueType_<R>>
+    {
+        using T = OptionalRangeValueType_<R>;
+        std::optional<T> acc;
+        for (auto&& o : r) {
+            if (!o) continue;
+            if (!acc || std::invoke(comp, *acc, *o)) {
+                acc = *o;
+            }
+        }
+        return acc;
+    }
+}

IntelPresentMon/Interprocess/source/act/SymmetricActionServer.h

@@ -24,6 +24,8 @@ namespace pmon::ipc::act
     class SymmetricActionServer
     {
         using SessionContextType = typename ExecCtx::SessionContextType;
+        using SessionsMap = std::unordered_map<uint32_t, SessionContextType>;
+
     public:
         SymmetricActionServer(ExecCtx context, std::string basePipeName,
             uint32_t reservedPipeInstanceCount, std::string securityString)
@@ -34,6 +36,10 @@ namespace pmon::ipc::act
             ctx_{ std::move(context) },
             worker_{ std::format("symact-{}-srv", MakeWorkerName_(basePipeName_)), &SymmetricActionServer::Run_, this}
         {
+            // Only set pSessionMap if ExecCtx can be assigned a const SessionsMap*
+            if constexpr (requires(ExecCtx& e, const SessionsMap* pSessions) { e.pSessionMap = pSessions; }) {
+                ctx_.pSessionMap = &sessions_;
+            }
             assert(reservedPipeInstanceCount_ > 0);
         }
         SymmetricActionServer(const SymmetricActionServer&) = delete;
@@ -155,7 +161,7 @@ namespace pmon::ipc::act
         std::string security_;
         as::io_context ioctx_;
         // maps session uid => session (uid is same as session recv (in) pipe id)
-        std::unordered_map<uint32_t, SessionContextType> sessions_;
+        SessionsMap sessions_;
         ExecCtx ctx_;
         mt::Thread worker_;
     };

IntelPresentMon/PresentMonAPI2/PresentMonAPI.cpp

@@ -226,8 +226,7 @@ PRESENTMON_API2_EXPORT PM_STATUS pmFreeIntrospectionRoot(const PM_INTROSPECTION_
 PRESENTMON_API2_EXPORT PM_STATUS pmSetTelemetryPollingPeriod(PM_SESSION_HANDLE handle, uint32_t deviceId, uint32_t timeMs)
 {
 	try {
-		LookupMiddleware_(handle).SetTelemetryPollingPeriod(deviceId, timeMs);
-		return PM_STATUS_SUCCESS;
+		return LookupMiddleware_(handle).SetTelemetryPollingPeriod(deviceId, timeMs);
 	}
 	catch (...) {
 		const auto code = util::GeneratePmStatus();
@@ -239,8 +238,7 @@ PRESENTMON_API2_EXPORT PM_STATUS pmSetTelemetryPollingPeriod(PM_SESSION_HANDLE h
 PRESENTMON_API2_EXPORT PM_STATUS pmSetEtwFlushPeriod(PM_SESSION_HANDLE handle, uint32_t periodMs)
 {
 	try {
-		LookupMiddleware_(handle).SetEtwFlushPeriod(periodMs ? std::optional{ periodMs } : std::nullopt);
-		return PM_STATUS_SUCCESS;
+		return LookupMiddleware_(handle).SetEtwFlushPeriod(periodMs ? std::optional{ periodMs } : std::nullopt);
 	}
 	catch (...) {
 		const auto code = util::GeneratePmStatus();

IntelPresentMon/PresentMonAPI2/PresentMonAPI.h

@@ -10,7 +10,7 @@
 #include <cstdint>
 
 #define PM_API_VERSION_MAJOR 3
-#define PM_API_VERSION_MINOR 1
+#define PM_API_VERSION_MINOR 2
 
 #ifdef __cplusplus
 extern "C" {
@@ -399,10 +399,14 @@ extern "C" {
 	PRESENTMON_API2_EXPORT PM_STATUS pmGetIntrospectionRoot(PM_SESSION_HANDLE handle, const PM_INTROSPECTION_ROOT** ppRoot);
 	// free the introspection tree structure
 	PRESENTMON_API2_EXPORT PM_STATUS pmFreeIntrospectionRoot(const PM_INTROSPECTION_ROOT* pRoot);
-	// sets the rate at which hardware telemetry (including CPU) is polled on a per-device basis
-	PRESENTMON_API2_EXPORT PM_STATUS pmSetTelemetryPollingPeriod(PM_SESSION_HANDLE handle, uint32_t deviceId, uint32_t timeMs);
+	// sets the rate at which hardware telemetry (including CPU) is polled
+	PRESENTMON_API2_EXPORT PM_STATUS pmSetTelemetryPollingPeriod(PM_SESSION_HANDLE handle, uint32_t reserved, uint32_t timeMs);
+#define PM_TELEMETRY_PERIOD_MIN 4
+#define PM_TELEMETRY_PERIOD_MAX 5000
 	// sets the rate at which ETW event buffers are flushed, affecting the delay of frame data reported by PresentMon
+	// a value of zero indicates to use current service setting (default or value requested by other client)
 	PRESENTMON_API2_EXPORT PM_STATUS pmSetEtwFlushPeriod(PM_SESSION_HANDLE handle, uint32_t periodMs);
+#define PM_ETW_FLUSH_PERIOD_MAX 1000
 	// register a dynamic query used for polling metric data with (optional) statistic processing such as average or percentile
 	PRESENTMON_API2_EXPORT PM_STATUS pmRegisterDynamicQuery(PM_SESSION_HANDLE sessionHandle, PM_DYNAMIC_QUERY_HANDLE* pHandle, PM_QUERY_ELEMENT* pElements, uint64_t numElements, double windowSizeMs, double metricOffsetMs);
 	// free the resources associated with a registered dynamic query