improve verbose property tracing

Author: planetchili

IntelPresentMon/CommonUtilities/Meta.h

@@ -4,9 +4,8 @@
 
 namespace pmon::util
 {
-    template <typename T> struct MemberPointerInfo;
-
     // deconstruct member pointer into the object type the pointer works with and the member type
+    template <typename T> struct MemberPointerInfo;
     template <typename S, typename M>
     struct MemberPointerInfo<M S::*> {
         using StructType = S;
@@ -38,4 +37,19 @@ namespace pmon::util
     template <template <typename...> typename Template, typename T>
     concept IsContainer = IsContainerLike<T> && std::is_same_v<T, Template<typename T::value_type>>;
 
+    // trait to deduce/extract the signature details of a function by pointer
+    namespace impl {
+        template <typename T>
+        struct FunctionPtrTraitsImpl_;
+        template <typename R, typename... Args>
+        struct FunctionPtrTraitsImpl_<R(*)(Args...)> {
+            using ReturnType = R;
+            using ParameterTypes = std::tuple<Args...>;
+            template<size_t N>
+            using ParameterType = std::tuple_element_t<N, ParameterTypes>;
+            static constexpr size_t ParameterCount = sizeof...(Args);
+        };
+    }
+    template <typename T>
+    struct FunctionPtrTraits : impl::FunctionPtrTraitsImpl_<std::remove_cvref_t<T>> {};
 }

PresentData/Debug.cpp

@@ -16,6 +16,8 @@
 #include "ETW/Microsoft_Windows_Win32k.h"
 #include "ETW/NT_Process.h"
 
+#include "../IntelPresentMon/CommonUtilities/Meta.h"
+
 #include <assert.h>
 #include <dxgi.h>
 
@@ -224,21 +226,8 @@ void PrintEventHeaderHelper_(EVENT_RECORD* eventRecord, EventMetadata* metadata,
 {
     wprintf(L" %s=", propName);
 
-    const auto propFuncVoid = reinterpret_cast<const void*>(propFunc);
-         if (propFuncVoid == reinterpret_cast<const void*>(PrintBool))                PrintBool(metadata->GetEventData<uint32_t>(eventRecord, propName) != 0);
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintU32))                 PrintU32(metadata->GetEventData<uint32_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintU64))                 PrintU64(metadata->GetEventData<uint64_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintU64x))                PrintU64x(metadata->GetEventData<uint64_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintString))              PrintString(metadata->GetEventData<std::string>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintWString))             PrintWString(metadata->GetEventData<std::wstring>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintTime))                PrintTime(metadata->GetEventData<uint64_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintTimeDelta))           PrintTimeDelta(metadata->GetEventData<uint64_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintQueuePacketType))     PrintQueuePacketType(metadata->GetEventData<uint32_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintDmaPacketType))       PrintDmaPacketType(metadata->GetEventData<uint32_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintPresentFlags))        PrintPresentFlags(metadata->GetEventData<uint32_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintPresentHistoryModel)) PrintPresentHistoryModel(metadata->GetEventData<uint32_t>(eventRecord, propName));
-    else if (propFuncVoid == reinterpret_cast<const void*>(PrintInputType))           PrintInputType(metadata->GetEventData<uint8_t>(eventRecord, propName));
-    else assert(false && "unknown prop function for verbose PrintEventHeader");
+    using ParamType = pmon::util::FunctionPtrTraits<F>::template ParameterType<0>;
+    propFunc(metadata->GetEventData<std::remove_cvref_t<ParamType>>(eventRecord, propName));
 
     if constexpr (sizeof...(T)) {
         PrintEventHeaderHelper_(eventRecord, metadata, rest...);

PresentData/TraceConsumer.cpp

@@ -283,3 +283,8 @@ std::wstring EventDataDesc::GetData<std::wstring>() const
 {
     return GetEventString<std::wstring>(*this);
 }
+
+template<> bool EventDataDesc::GetData<bool>() const
+{
+    return (bool)GetData<uint32_t>();
+}

PresentData/TraceConsumer.hpp

@@ -63,6 +63,8 @@ struct EventDataDesc {
 
 template<> std::string EventDataDesc::GetData<std::string>() const;
 template<> std::wstring EventDataDesc::GetData<std::wstring>() const;
+// specialization for bool because it is actually stored as uint32_t
+template<> bool EventDataDesc::GetData<bool>() const;
 
 struct EventMetadata {
     std::unordered_map<EventMetadataKey, std::vector<uint8_t>, EventMetadataKeyHash, EventMetadataKeyEqual> metadata_;