verbose working for service

Author: planetchili

IntelPresentMon/KernelProcess/KernelProcess.args.json

@@ -34,7 +34,7 @@
     },
     {
       "Id": "49b6fc1f-b969-4280-b0d8-17a213e80f16",
-      "Command": "--log-verbose-modules core_window v8async"
+      "Command": "--log-verbose-modules core_window v8async etwq"
     },
     {
       "Id": "bab48d6d-3a48-4b3b-9ed9-903e381824c6",

IntelPresentMon/KernelProcess/winmain.cpp

@@ -210,17 +210,24 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 		as::io_context ioctx;
 		std::optional<bp2::basic_process<as::io_context::executor_type>> svcChild;
 		if (opt.svcAsChild) {
-			svcChild = bp2::windows::default_launcher{}(
-				ioctx, "PresentMonService.exe"s, std::vector{
+			// compile fixed CLI options
+			auto args = std::vector<std::string>{
 				"--control-pipe"s, *opt.controlPipe,
 				"--nsm-prefix"s, "pm-frame-nsm"s,
 				"--intro-nsm"s, *opt.shmName,
 				"--etw-session-name"s, *opt.etwSessionName,
 				"--log-level"s, util::log::GetLevelName(util::log::GlobalPolicy::Get().GetLogLevel()),
 				"--log-pipe-name"s, logSvcPipe,
-				"--enable-stdio-log"s
-			});
-
+				"--enable-stdio-log"s,
+			};
+			// append verbose module options
+			if (opt.logVerboseModules) {
+				args.push_back("--log-verbose-modules"s);
+				args.append_range(*opt.logVerboseModules | vi::transform(util::log::GetVerboseModuleName));
+			}
+			// launch service child process
+			svcChild = bp2::windows::default_launcher{}(ioctx, "PresentMonService.exe"s, std::move(args));
+			// wait for pipe availability of service api
 			if (!::pmon::util::win::WaitForNamedPipe(*opt.controlPipe + "-in", 1500)) {
 				pmlog_error("timeout waiting for child service control pipe to go online");
 				return -1;
@@ -377,7 +384,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 				"--p2c-log-trace-level"s, util::log::GetLevelName(*opt.logTraceLevel),
 				"--p2c-act-name"s, actName,
 				"--p2c-log-pipe-name"s, cefLogPipe
-				});
+			});
 			// launch the CEF browser process, which in turn launches all the other processes in the CEF process constellation
 			auto cefChild = [&] {
 				if (util::win::WeAreElevated()) {

IntelPresentMon/PresentMonService/CliOptions.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "../CommonUtilities/cli/CliFramework.h"
 #include "../CommonUtilities/log/Level.h"
+#include "../CommonUtilities/log/Verbose.h"
 #include "GlobalIdentifiers.h"
 
 namespace clio
@@ -11,6 +12,7 @@ namespace clio
 	{
 	private:
 		CLI::CheckedTransformer logLevelTf_{ GetLevelMapNarrow(), CLI::ignore_case };
+		CLI::CheckedTransformer logVmodTf_{ GetVerboseModuleMapNarrow(), CLI::ignore_case };
 
 	private: Group gc_{ this, "Connection", "Control client connection" }; public:
 		Option<std::string> etwSessionName{ this, "--etw-session-name", "", "Name to use when creating the ETW session" };
@@ -34,6 +36,7 @@ namespace clio
 		Flag disableIpcLog{ this, "--disable-ipc-log", "Disable logging to named pipe connection" };
 		Option<Level> logLevel{ this, "--log-level", Level::Error, "Severity to log at", logLevelTf_ };
 		Flag logNamePid{ this, "--log-name-pid", "Append PID to log files instead of timestamp" };
+		Option<std::vector<V>> logVerboseModules{ this, "--log-verbose-modules", {}, "Verbose logging modules to enable", logVmodTf_ };
 
 	private: Group gt_{ this, "Testing", "Automated testing features" }; public:
 		Flag enableTestControl{ this, "--enable-test-control", "Enable test control over stdio" };

IntelPresentMon/PresentMonService/LogSetup.cpp

@@ -77,6 +77,11 @@ namespace logsetup
 			if (opt.logLevel || reg.logLevel.Exists()) {
 				GlobalPolicy::Get().SetLogLevel(opt.logLevel ? *opt.logLevel : reg.logLevel);
 			}
+			if (opt.logVerboseModules) {
+				for (auto mod : *opt.logVerboseModules) {
+					GlobalPolicy::Get().ActivateVerboseModule(mod);
+				}
+			}
 			if (!opt.enableStdioLog) {
 				pChannel->AttachComponent({}, "drv:std");
 			}