3 files changed, 35 insertions, 0 deletions
diff --git a/src/zenutil/include/zenutil/logging/rotatingfilesink.h b/src/zenutil/include/zenutil/logging/rotatingfilesink.h
index ca4649ba8..e01b86cb7 100644
--- a/src/zenutil/include/zenutil/logging/rotatingfilesink.h
+++ b/src/zenutil/include/zenutil/logging/rotatingfilesink.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <zencore/memory/llm.h>
 #include <zenutil/basicfile.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
@@ -24,6 +25,7 @@ public:
 	, m_MaxSize(MaxSize)
 	, m_MaxFiles(MaxFiles)
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
 		std::error_code Ec;
 		if (RotateOnOpen)
 		{
@@ -73,6 +75,8 @@ public:
 
 	virtual void log(const spdlog::details::log_msg& msg) override
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		try
 		{
 			spdlog::memory_buf_t Formatted;
@@ -108,6 +112,8 @@ public:
 	}
 	virtual void flush() override
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		try
 		{
 			RwLock::SharedLockScope Lock(m_Lock);
@@ -124,6 +130,8 @@ public:
 
 	virtual void set_pattern(const std::string& pattern) override
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		try
 		{
 			RwLock::ExclusiveLockScope _(m_Lock);
@@ -136,6 +144,8 @@ public:
 	}
 	virtual void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		try
 		{
 			RwLock::ExclusiveLockScope _(m_Lock);
@@ -150,6 +160,8 @@ public:
 private:
 	void Rotate(RwLock::ExclusiveLockScope&, std::error_code& OutEc)
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		m_CurrentFile.Close();
 
 		OutEc = RotateFiles(m_BaseFilename, m_MaxFiles);
@@ -170,6 +182,8 @@ private:
 
 	bool TrySinkIt(const spdlog::details::log_msg& msg, spdlog::memory_buf_t& OutFormatted)
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		RwLock::SharedLockScope Lock(m_Lock);
 		if (!m_CurrentFile.IsOpen())
 		{
@@ -193,6 +207,8 @@ private:
 
 	bool TrySinkIt(const spdlog::memory_buf_t& Formatted)
 	{
+		ZEN_MEMSCOPE(ELLMTag::Logging);
+
 		RwLock::SharedLockScope Lock(m_Lock);
 		if (!m_CurrentFile.IsOpen())
 		{
diff --git a/src/zenutil/logging.cpp b/src/zenutil/logging.cpp
index 4f8c5e59e..6314c407f 100644
--- a/src/zenutil/logging.cpp
+++ b/src/zenutil/logging.cpp
@@ -13,6 +13,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include <zencore/compactbinary.h>
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
+#include <zencore/memory/llm.h>
 #include <zencore/string.h>
 #include <zenutil/logging/fullformatter.h>
 #include <zenutil/logging/jsonformatter.h>
@@ -42,6 +43,8 @@ InitializeLogging(const LoggingOptions& LogOptions)
 void
 BeginInitializeLogging(const LoggingOptions& LogOptions)
 {
+	ZEN_MEMSCOPE(ELLMTag::Logging);
+
 	zen::logging::InitializeLogging();
 	zen::logging::EnableVTMode();
 
@@ -162,6 +165,8 @@ BeginInitializeLogging(const LoggingOptions& LogOptions)
 void
 FinishInitializeLogging(const LoggingOptions& LogOptions)
 {
+	ZEN_MEMSCOPE(ELLMTag::Logging);
+
 	logging::level::LogLevel LogLevel = logging::level::Info;
 
 	if (LogOptions.IsDebug)
diff --git a/src/zenutil/openprocesscache.cpp b/src/zenutil/openprocesscache.cpp
index 256d5fb4a..88bbce8a6 100644
--- a/src/zenutil/openprocesscache.cpp
+++ b/src/zenutil/openprocesscache.cpp
@@ -3,6 +3,7 @@
 #include "zenutil/openprocesscache.h"
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
+#include <zencore/memory/llm.h>
 
 #if ZEN_PLATFORM_WINDOWS
 #	include <zencore/windows.h>
@@ -14,6 +15,14 @@
 
 namespace zen {
 
+const FLLMTag&
+GetProcCacheTag()
+{
+	static FLLMTag CacheHttpTag("proccache");
+
+	return CacheHttpTag;
+}
+
 OpenProcessCache::OpenProcessCache()
 #if ZEN_PLATFORM_WINDOWS
 : m_GcThread(&OpenProcessCache::GcWorker, this)
@@ -60,6 +69,9 @@ OpenProcessCache::GetProcessHandle(Oid SessionId, int ProcessPid)
 	{
 		return nullptr;
 	}
+
+	ZEN_MEMSCOPE(GetProcCacheTag());
+
 #if ZEN_PLATFORM_WINDOWS
 	ZEN_ASSERT(ProcessPid != 0);
 	{
@@ -171,6 +183,8 @@ OpenProcessCache::GCHandles()
 void
 OpenProcessCache::GcWorker()
 {
+	ZEN_MEMSCOPE(GetProcCacheTag());
+
 	SetCurrentThreadName("ProcessCache_GC");
 
 	while (!m_GcExitEvent.Wait(500))