fixing log configuration in cef and option to enable diag for validation

Author: planetchili

IntelPresentMon/AppCef/source/winmain.cpp

@@ -9,6 +9,7 @@
 #include <Core/source/cli/CliOptions.h>
 #include <CommonUtilities/log/IdentificationTable.h>
 #include <CommonUtilities/generated/build_id.h>
+#include <PresentMonAPIWrapper/DiagnosticHandler.h>
 #include <dwmapi.h>
 
 #pragma comment(lib, "Dwmapi.lib")
@@ -203,8 +204,21 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
         DebugBreak();
     }
     // name this process / thread
-    log::IdentificationTable::AddThisProcess(str::ToWide(Options::Get().cefType.AsOptional().value_or("main-client")));
+    log::IdentificationTable::AddThisProcess(str::ToWide(opt.cefType.AsOptional().value_or("main-client")));
     log::IdentificationTable::AddThisThread(L"main");
+    // connect to the diagnostic layer
+    std::optional<pmapi::DiagnosticHandler> diag;
+    if (opt.enableDiagnostic && opt.cefType && *opt.cefType == "renderer") {
+        diag.emplace(
+            (PM_DIAGNOSTIC_LEVEL)opt.logLevel.AsOptional().value_or(log::GlobalPolicy::Get().GetLogLevel()),
+            PM_DIAGNOSTIC_OUTPUT_FLAGS_DEBUGGER | PM_DIAGNOSTIC_OUTPUT_FLAGS_QUEUE,
+            [](const PM_DIAGNOSTIC_MESSAGE& msg) {
+                auto ts = msg.pTimestamp ? str::ToWide(msg.pTimestamp) : std::wstring{};
+                pmlog_(log::Level(msg.level)).note(
+                    std::format(L"@@ D I A G @@ => <{}> {}", ts, str::ToWide(msg.pText)));
+            }
+        );
+    }
     // configure the logging system (partially based on command line options)
     ConfigureLogging();
 

IntelPresentMon/CommonUtilities/log/Log.h

@@ -27,17 +27,17 @@ namespace pmon::util::log
 #endif
 #endif
 
-#define xinternal_pmlog_(lvl) ((PMLOG_BUILD_LEVEL < lvl) || (::pmon::util::log::GlobalPolicy::Get().GetLogLevel() < lvl)) \
+#define pmlog_(lvl) ((PMLOG_BUILD_LEVEL < lvl) || (::pmon::util::log::GlobalPolicy::Get().GetLogLevel() < lvl)) \
 	? (void)0 : (void)::pmon::util::log::EntryBuilder{ lvl, __FILEW__, __FUNCTIONW__, __LINE__ } \
 	.subsys(::pmon::util::log::GlobalPolicy::Get().GetSubsystem()) \
 	.to(::pmon::util::log::GetDefaultChannel())
-#define pmlog_fatal	xinternal_pmlog_(::pmon::util::log::Level::Fatal).note
-#define pmlog_error	xinternal_pmlog_(::pmon::util::log::Level::Error).note
-#define pmlog_warn	xinternal_pmlog_(::pmon::util::log::Level::Warning).note
-#define pmlog_info	xinternal_pmlog_(::pmon::util::log::Level::Info).note
-#define pmlog_dbg	xinternal_pmlog_(::pmon::util::log::Level::Debug).note
-#define pmlog_verb(vtag) !vtag ? (void)0 : xinternal_pmlog_(::pmon::util::log::Level::Verbose).note
-#define pmlog_perf(ptag) !ptag ? (void)0 : xinternal_pmlog_(::pmon::util::log::Level::Performance).note
+#define pmlog_fatal	pmlog_(::pmon::util::log::Level::Fatal).note
+#define pmlog_error	pmlog_(::pmon::util::log::Level::Error).note
+#define pmlog_warn	pmlog_(::pmon::util::log::Level::Warning).note
+#define pmlog_info	pmlog_(::pmon::util::log::Level::Info).note
+#define pmlog_dbg	pmlog_(::pmon::util::log::Level::Debug).note
+#define pmlog_verb(vtag) !vtag ? (void)0 : pmlog_(::pmon::util::log::Level::Verbose).note
+#define pmlog_perf(ptag) !ptag ? (void)0 : pmlog_(::pmon::util::log::Level::Performance).note
 
 #define pmwatch(expr) watch(L###expr, (expr))
 

IntelPresentMon/Core/source/cli/CliOptions.h

@@ -25,6 +25,7 @@ namespace p2c::cli
 		Flag debugWaitClient{ this, "--p2c-debug-wait-client", "Force main client process to wait for debugger connection" };
 		Flag filesWorking{ this, "--p2c-files-working", "Use the working directory for file storage" };
 		Flag traceExceptions{ this, "--p2c-trace-exceptions", "Add stack trace to all thrown exceptions (including SEH exceptions)" };
+		Flag enableDiagnostic{ this, "--p2c-enable-diagnostic", "Enable debug diagnostic layer forwarding (duplicates exiisting log entries)" };
 
 	private: Group gl_{ this, "Logging", "Customize logging for this tool"}; public:
 		Option<log::Level> logLevel{ this, "--p2c-log-level", log::Level::Error, "Severity to log at", logLevelTf_ };

IntelPresentMon/Core/source/infra/LogSetup.cpp

@@ -75,7 +75,7 @@ namespace p2c
 			auto pChan = GetDefaultChannel();
 			// shortcut for command line
 			const auto& opt = cli::Options::Get();
-			const auto render = !opt.cefType;
+			const auto render = opt.cefType && *opt.cefType == "renderer";
 			// connect dll channel and id table to exe, get access to global settings in dll
 			LoggingSingletons getters;
 			if (render) {