improve the logging

Author: planetchili

IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.cpp

@@ -188,10 +188,8 @@ namespace pwr::nv
                     // TODO: consider logging failure (lower logging level perhaps)
                 }
             }
-
         }
 
-
         // insert telemetry into history
         std::lock_guard lock{ historyMutex };
         history.Push(info);

IntelPresentMon/Core/source/infra/LogSetup.cpp

@@ -119,8 +119,8 @@ namespace p2c
 					infra::util::FolderResolver::Folder::App, L"logs\\");
 			}
 			// always enable the logfile for client
-			const auto logfileNameClient = bool(opt.cefType) ? std::format(L"log-{}-{}.txt",
-				str::ToWide(*opt.cefType), GetCurrentProcessId()) : L"log.txt"s;
+			const auto logfileNameClient = bool(opt.cefType) ? std::format(L"pmlog-{}-{}.txt",
+				str::ToWide(*opt.cefType), GetCurrentProcessId()) : L"pmlog.txt"s;
 			const auto logfilePathClient = std::filesystem::path{ logFolder } / logfileNameClient;
 			pChan->AttachComponent(std::make_shared<BasicFileDriver>(std::make_shared<TextFormatter>(),
 				std::make_shared<SimpleFileStrategy>(logfilePathClient)), "drv:file");
@@ -165,7 +165,7 @@ namespace p2c
 				}
 			}
 			// enable logfile for middleware if we're not doing the copy connection
-			if (!opt.logMiddlewareCopy) {
+			if (!opt.logMiddlewareCopy && *opt.cefType == "renderer") {
 				if (auto sta = pmSetupFileLogging(logFolder.string().c_str(),
 					(PM_DIAGNOSTIC_LEVEL)pol.GetLogLevel(),
 					(PM_DIAGNOSTIC_LEVEL)pol.GetTraceLevel(),

IntelPresentMon/PresentMonAPI2/Internal.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "PresentMonAPI.h"
+#include "PresentMonDiagnostics.h"
 #include "../CommonUtilities/log/Log.h"
 #include "../CommonUtilities/log/LineTable.h"
 #include "../CommonUtilities/log/GlobalPolicy.h"
@@ -38,4 +39,5 @@ PRESENTMON_API2_EXPORT LoggingSingletons pmLinkLogging_(
 // function to flush the dll's log channel worker queue when before exiting
 PRESENTMON_API2_EXPORT void pmFlushEntryPoint_() noexcept;
 // set middleware to log using OutputDebugString
-PRESENTMON_API2_EXPORT void pmSetupODSLogging_();
+PRESENTMON_API2_EXPORT void pmSetupODSLogging_(PM_DIAGNOSTIC_LEVEL logLevel,
+	PM_DIAGNOSTIC_LEVEL stackTraceLevel, bool exceptionTrace);

IntelPresentMon/PresentMonAPI2/PresentMonAPI.cpp

@@ -5,10 +5,12 @@
 #include "../Interprocess/source/PmStatusError.h"
 #include "Internal.h"
 #include "PresentMonAPI.h"
+#include "PresentMonDiagnostics.h"
 #include "../PresentMonMiddleware/LogSetup.h"
 #include "../Versioning/PresentMonAPIVersion.h"
 
 
+
 using namespace pmon;
 using namespace pmon::mid;
 
@@ -77,6 +79,7 @@ PRESENTMON_API2_EXPORT PM_STATUS pmOpenSession_(PM_SESSION_HANDLE* pHandle, cons
  		pMiddleware = std::make_shared<ConcreteMiddleware>(std::move(pipeName), std::move(introNsm));
 		*pHandle = pMiddleware.get();
 		handleMap_[*pHandle] = std::move(pMiddleware);
+		pmlog_info("Middleware successfully opened session with service");
 		return PM_STATUS_SUCCESS;
 	}
 	catch (...) {
@@ -136,9 +139,11 @@ PRESENTMON_API2_EXPORT void pmFlushEntryPoint_() noexcept
 	pmon::util::log::FlushEntryPoint();
 }
 
-PRESENTMON_API2_EXPORT void pmSetupODSLogging_()
+PRESENTMON_API2_EXPORT void pmSetupODSLogging_(PM_DIAGNOSTIC_LEVEL logLevel,
+	PM_DIAGNOSTIC_LEVEL stackTraceLevel, bool exceptionTrace)
 {
-	pmon::util::log::SetupODSChannel();
+	pmon::util::log::SetupODSChannel((pmon::util::log::Level)logLevel,
+		(pmon::util::log::Level)stackTraceLevel, exceptionTrace);
 }
 
 // public endpoints

IntelPresentMon/PresentMonAPI2/PresentMonDiagnostics.cpp

@@ -1,4 +1,5 @@
 #include "PresentMonDiagnostics.h"
+#include "../CommonUtilities/win/WinAPI.h"
 #include "../CommonUtilities/log/DiagnosticDriver.h"
 #include "../CommonUtilities/log/Log.h"
 #include "../CommonUtilities/Exception.h"
@@ -129,11 +130,12 @@ PRESENTMON_API2_EXPORT PM_STATUS pmDiagnosticUnblockWaitingThread()
 PRESENTMON_API2_EXPORT PM_STATUS pmSetupFileLogging(const char* path, PM_DIAGNOSTIC_LEVEL logLevel,
 	PM_DIAGNOSTIC_LEVEL stackTraceLevel, bool exceptionTrace)
 {
-	auto fsPath = std::filesystem::path(path);
+	const auto fsPath = std::filesystem::path(path);
 	if (!std::filesystem::is_directory(fsPath)) {
 		return PM_STATUS_NONEXISTENT_FILE_PATH;
 	}
-	log::SetupFileChannel(std::move(fsPath), GetLogLevel_(logLevel),
+	auto file = fsPath / std::format("pmlog-mid-{}.txt", GetCurrentProcessId());
+	log::SetupFileChannel(std::move(file), GetLogLevel_(logLevel),
 		GetLogLevel_(stackTraceLevel), exceptionTrace);
 	return PM_STATUS_SUCCESS;
 }

IntelPresentMon/PresentMonAPI2Loader/Implementation.cpp

@@ -58,7 +58,7 @@ _CrtMemState(*pFunc_pmCreateHeapCheckpoint__)() = nullptr;
 LoggingSingletons(*pFunc_pmLinkLogging__)(std::shared_ptr<pmon::util::log::IChannel>,
 	std::function<pmon::util::log::IdentificationTable&()>) = nullptr;
 void(*pFunc_pmFlushEntryPoint__)() = nullptr;
-void(*pFunc_pmSetupODSLogging__)() = nullptr;
+void(*pFunc_pmSetupODSLogging__)(PM_DIAGNOSTIC_LEVEL, PM_DIAGNOSTIC_LEVEL, bool) = nullptr;
 
 
 // internal loader state globals
@@ -312,14 +312,15 @@ PRESENTMON_API2_EXPORT void pmFlushEntryPoint_() noexcept
 		pFunc_pmFlushEntryPoint__();
 	}
 }
-PRESENTMON_API2_EXPORT void pmSetupODSLogging_()
+PRESENTMON_API2_EXPORT void pmSetupODSLogging_(PM_DIAGNOSTIC_LEVEL logLevel,
+	PM_DIAGNOSTIC_LEVEL stackTraceLevel, bool exceptionTrace)
 {
 	if (!middlewareLoadedSuccessfully_) {
 		if (auto status = LoadLibrary_(); status != PM_STATUS_SUCCESS) {
 			throw LoaderExcept_(status);
 		}
 	}
-	pFunc_pmSetupODSLogging__();
+	pFunc_pmSetupODSLogging__(logLevel, stackTraceLevel, exceptionTrace);
 }
 PRESENTMON_API2_EXPORT PM_STATUS pmDiagnosticSetup(const PM_DIAGNOSTIC_CONFIGURATION* pConfig)
 {