Merge pull request #518 from GameTechDev/feature/verbose2

Feature/verbose2

Author: markgalvan-intel

IntelPresentMon/AppCef/source/NanoCefProcessHandler.cpp

@@ -17,6 +17,8 @@
 
 using namespace pmon::util;
 using namespace std::chrono_literals;
+namespace rn = std::ranges;
+namespace vi = std::views;
 
 namespace p2c::client::cef
 {
@@ -86,6 +88,12 @@ namespace p2c::client::cef
                 pChildCommandLine->AppendSwitchWithValue(std::move(name), std::move(val));
             }
         }
+        // special handling or CLI options that are vectors with map transformer (verbose modules)
+        // TODO: figure out how to get this special case working with the auto forwarding mechanism
+        for (auto mod : *opt.logVerboseModules) {
+            pChildCommandLine->AppendSwitchWithValue(opt.logVerboseModules.GetName(),
+                log::GetVerboseModuleName(mod));
+        }
         // initiate logging ipc connection for renderer children
         if (pChildCommandLine->GetSwitchValue("type") == "renderer") {
             // inject logging ipc pipe cli option to child

IntelPresentMon/AppCef/source/util/AsyncEndpointManager.cpp

@@ -8,13 +8,13 @@
 #include <include/base/cef_callback.h>
 #include <include/wrapper/cef_closure_task.h>
 #include <include/wrapper/cef_helpers.h>
-#include "CefValues.h"
 #include <CommonUtilities\str\String.h>
 
 
 namespace p2c::client::util
 {
 	using ::pmon::util::str::ToWide;
+	using v = log::V;
 
 	void AsyncEndpointManager::DispatchInvocation(const std::string& key, CallbackContext ctx, CefRefPtr<CefV8Value> pObj, CefBrowser& browser, cef::DataBindAccessor& accessor)
 	{
@@ -30,8 +30,8 @@ namespace p2c::client::util
 			);
 			lck.unlock();
 
-			if constexpr (v::v8async) {
-				pmlog_verb(v::v8async)(std::format("JS async call {{{}}} from V8 to endpoint [{}] with payload:\n{}",
+			if (log::GlobalPolicy::VCheck(v::v8async)) {
+				pmlog_(log::Level::Verbose).note(std::format("JS async call {{{}}} from V8 to endpoint [{}] with payload:\n{}",
 					uid, key, Traverse(V8ToCefValue(*pObj)).Dump()));
 			}
 			else {
@@ -88,12 +88,12 @@ namespace p2c::client::util
 		{
 			auto invocation = std::move(i->second);
 
-			if constexpr (v::v8async) {
-				pmlog_verb(v::v8async)(std::format("Async call {{{}}} resolved with payload: \n{}",
+			if (log::GlobalPolicy::VCheck(v::v8async)) {
+				pmlog_(log::Level::Verbose).note(std::format("Async call {{{}}} resolved with payload: \n{}",
 					uid, Traverse(pArgs).Dump()));
 			}
 			else {
-				pmlog_verb(v::v8async)(std::format("Async call {{{}}} resolved", uid));
+				pmlog_dbg(std::format("Async call {{{}}} resolved", uid));
 			}
 
 			invocations.erase(i);

IntelPresentMon/AppCef/source/util/CliOptions.h

@@ -10,6 +10,7 @@ namespace p2c::client::util::cli
 	{
 	private:
 		CLI::CheckedTransformer logLevelTf_{ log::GetLevelMapNarrow(), CLI::ignore_case };
+		CLI::CheckedTransformer logVmodTf_{ log::GetVerboseModuleMapNarrow(), CLI::ignore_case };
 
 	private: Group gd_{ this, "Debugging", "Aids in debugging this tool" }; public:
 		Option<std::string> url{ this, "--p2c-url", "", "URL to load instead of app files" };
@@ -29,6 +30,7 @@ namespace p2c::client::util::cli
 		Option<std::string> logDenyList{ this, "--p2c-log-deny-list", "", "Path to log deny list (with trace overrides)", CLI::ExistingFile };
 		Option<std::string> logAllowList{ this, "--p2c-log-allow-list", "", "Path to log allow list (with trace overrides)", CLI::ExistingFile };
 		Option<std::string> logFolder{ this, "--p2c-log-folder", "", "Path to directory in which to store log files", CLI::ExistingDirectory };
+		Option<std::vector<log::V>> logVerboseModules{ this, "--p2c-log-verbose-modules", {}, "Verbose logging modules to enable", logVmodTf_ };
 
 	private: Group gi_{ this, "Internal", "Internal options, do not supply manually" }; public:
 		Option<std::string> cefType{ this, "--type", "", "Type of the current chromium process" };
@@ -40,7 +42,7 @@ namespace p2c::client::util::cli
 
 	private:
 		MutualExclusion excl_{ logDenyList, logAllowList };
-		NoForward noForward_{ cefType, logPipeName };
+		NoForward noForward_{ cefType, logPipeName, logVerboseModules };
 		AllowExtras ext_{ this };
 	};
 }

IntelPresentMon/AppCef/source/util/LogSetup.cpp

@@ -111,6 +111,11 @@ namespace p2c::client::util
 			if (opt.logLevel) {
 				pol.SetLogLevel(*opt.logLevel);
 			}
+			if (opt.logVerboseModules) {
+				for (auto mod : *opt.logVerboseModules) {
+					pol.ActivateVerboseModule(mod);
+				}
+			}
 			if (opt.logTraceLevel) {
 				pol.SetTraceLevel(*opt.logTraceLevel);
 			}

IntelPresentMon/AppCef/source/util/Logging.h

@@ -1,19 +1,2 @@
 #pragma once
-//#define PMLOG_BUILD_LEVEL Verbose
-//#define VVV_V8ASYNC
-#include <CommonUtilities/log/Log.h>
-
-
-namespace p2c::v
-{
-#ifndef VVV_V8ASYNC // system for async calls and signals between V8 and C++
-	inline constexpr bool v8async = false;
-#else
-	inline constexpr bool v8async = true;
-#endif
-#ifndef VVV_HOTKEY // system that processes raw keyboard input
-	inline constexpr bool hotkey = false;
-#else
-	inline constexpr bool hotkey = true;
-#endif	
-}
+#include <CommonUtilities/log/Log.h>

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -62,6 +62,7 @@
     <ClInclude Include="log\TextFormatter.h" />
     <ClInclude Include="log\MarshallDriver.h" />
     <ClInclude Include="log\TimePoint.h" />
+    <ClInclude Include="log\Verbose.h" />
     <ClInclude Include="Macro.h" />
     <ClInclude Include="Math.h" />
     <ClInclude Include="Memory.h" />
@@ -141,6 +142,7 @@
     <ClCompile Include="log\MarshallDriver.cpp" />
     <ClCompile Include="log\NamedPipeMarshallSender.cpp" />
     <ClCompile Include="log\TimePoint.cpp" />
+    <ClCompile Include="log\Verbose.cpp" />
     <ClCompile Include="mt\Thread.cpp" />
     <ClCompile Include="pipe\CoroMutex.cpp" />
     <ClCompile Include="pipe\Pipe.cpp" />

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters

@@ -279,6 +279,9 @@
     <ClInclude Include="rng\OptionalMinMax.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="log\Verbose.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="cli\CliFramework.cpp">
@@ -437,6 +440,9 @@
     <ClCompile Include="win\com\WbemSink.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="log\Verbose.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="vcpkg.json" />

IntelPresentMon/CommonUtilities/log/GlobalPolicy.cpp

@@ -77,4 +77,24 @@ namespace pmon::util::log
 	{
 		subsystem_ = sys;
 	}
+	void GlobalPolicy::ActivateVerboseModule(V mod) noexcept
+	{
+		activeVerboseModules_ |= (1ull << uint64_t(mod));
+	}
+	void GlobalPolicy::DeactivateVerboseModule(V mod) noexcept
+	{
+		activeVerboseModules_ &= ~(1ull << uint64_t(mod));
+	}
+	bool GlobalPolicy::CheckVerboseModule(V mod) const noexcept
+	{
+		return activeVerboseModules_ & (1ull << uint64_t(mod));
+	}
+	void GlobalPolicy::ClearVerboseModules() noexcept
+	{
+		activeVerboseModules_ = 0;
+	}
+	void GlobalPolicy::StoreVerboseModules(uint64_t modset) noexcept
+	{
+		activeVerboseModules_.store(modset);
+	}
 }

IntelPresentMon/CommonUtilities/log/GlobalPolicy.h

@@ -2,6 +2,7 @@
 #include <atomic>
 #include "Level.h"
 #include "Subsystem.h"
+#include "Verbose.h"
 
 namespace pmon::util::log
 {
@@ -22,7 +23,16 @@ namespace pmon::util::log
 		void SetSehTracing(bool on) noexcept;
 		Subsystem GetSubsystem() const noexcept;
 		void SetSubsystem(Subsystem) noexcept;
+		void ActivateVerboseModule(V mod) noexcept;
+		void DeactivateVerboseModule(V mod) noexcept;
+		bool CheckVerboseModule(V mod) const noexcept;
+		void ClearVerboseModules() noexcept;
+		void StoreVerboseModules(uint64_t modset) noexcept;
 		static GlobalPolicy& Get() noexcept;
+		static bool VCheck(V mod) noexcept
+		{
+			return Get().CheckVerboseModule(mod);
+		}
 	private:
 		// functions
 		GlobalPolicy() noexcept;
@@ -33,5 +43,6 @@ namespace pmon::util::log
 		std::atomic<bool> exceptionTracePolicy_ = false;
 		std::atomic<bool> sehTraceOn_ = false;
 		std::atomic<Subsystem> subsystem_ = Subsystem::None;
+		std::atomic<uint64_t> activeVerboseModules_ = 0;
 	};
 }

IntelPresentMon/CommonUtilities/log/Level.cpp

@@ -15,6 +15,7 @@ namespace pmon::util::log
 			case Level::Performance: return "Performance";
 			case Level::Debug: return "Debug";
 			case Level::Verbose: return "Verbose";
+			case Level::Verbose2: return "Verbose2";
 			default: return "Unknown";
 			}
 		} catch (...) {}
@@ -28,7 +29,7 @@ namespace pmon::util::log
 		for (int n = (int)Level::Fatal; n <= (int)Level::Verbose; n++) {
 			const auto lvl = Level(n);
 			auto key = ToLower(GetLevelName(lvl));
-			if (key != "unknown") {
+			if (key != "Unknown") {
 				map[std::move(key)] = lvl;
 			}
 		}