registry control of service verbose modules

Author: planetchili

IntelPresentMon/CommonUtilities/log/GlobalPolicy.cpp

@@ -79,18 +79,22 @@ namespace pmon::util::log
 	}
 	void GlobalPolicy::ActivateVerboseModule(V mod) noexcept
 	{
-		activeVerboseModules_ |= (1 << int(mod));
+		activeVerboseModules_ |= (1ull << uint64_t(mod));
 	}
 	void GlobalPolicy::DeactivateVerboseModule(V mod) noexcept
 	{
-		activeVerboseModules_ &= ~(1 << int(mod));
+		activeVerboseModules_ &= ~(1ull << uint64_t(mod));
 	}
 	bool GlobalPolicy::CheckVerboseModule(V mod) const noexcept
 	{
-		return activeVerboseModules_ & (1 << int(mod));
+		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

@@ -27,6 +27,7 @@ namespace pmon::util::log
 		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
 		{

IntelPresentMon/PresentMonService/LogSetup.cpp

@@ -71,17 +71,21 @@ namespace logsetup
 			// shortcuts for command line and registry
 			const auto& opt = clio::Options::Get();
 			const auto& reg = Reg::Get();
+			auto& pol = GlobalPolicy::Get();
 			// get the channel
 			auto pChannel = GetDefaultChannel();
 			// configure logging based on command line
 			if (opt.logLevel || reg.logLevel.Exists()) {
-				GlobalPolicy::Get().SetLogLevel(opt.logLevel ? *opt.logLevel : reg.logLevel);
+				pol.SetLogLevel(opt.logLevel ? *opt.logLevel : reg.logLevel);
 			}
 			if (opt.logVerboseModules) {
 				for (auto mod : *opt.logVerboseModules) {
-					GlobalPolicy::Get().ActivateVerboseModule(mod);
+					pol.ActivateVerboseModule(mod);
 				}
 			}
+			else if (reg.logVerboseModules.Exists()) {
+				pol.StoreVerboseModules(reg.logVerboseModules);
+			}
 			if (!opt.enableStdioLog) {
 				pChannel->AttachComponent({}, "drv:std");
 			}

IntelPresentMon/PresentMonService/Registry.h

@@ -9,6 +9,7 @@ struct Reg : public reg::RegistryBase<Reg, HKEY_LOCAL_MACHINE>
 	Value<log::Level> logLevel{ this, "logLevel" };
 	Value<std::string> logDir{ this, "logDir" };
 	Value<std::string> middlewarePath{ this, pmon::gid::middlewarePathKey };
+	Value<uint64_t> logVerboseModules{ this, "logVerboseModules" };
 
 	static constexpr const wchar_t* keyPath_ = pmon::gid::registryPath;
 };