Memory tracking improvements (#262)

* added LLM tag to properly tag RPC allocations
* annotated some more httpsys functions with memory tags
* only emit memory scope events if the active tag is different from the new tag

4 files changed, 21 insertions, 1 deletions

diff --git a/src/zencore/memtrack/tagtrace.cpp b/src/zencore/memtrack/tagtrace.cpp
index 797da0fab..575b1fe53 100644
--- a/src/zencore/memtrack/tagtrace.cpp
+++ b/src/zencore/memtrack/tagtrace.cpp
@@ -67,6 +67,9 @@ FMemScope::FMemScope(FLLMTag InTag, bool bShouldActivate /*= true*/)
 void
 FMemScope::ActivateScope(int32_t InTag)
 {
+	if (InTag == GActiveTag)
+		return;
+
 	if (auto LogScope = FMemoryMemoryScopeFields::LogScopeType::ScopedEnter<FMemoryMemoryScopeFields>())
 	{
 		if (const auto& __restrict MemoryScope = *(FMemoryMemoryScopeFields*)(&LogScope))
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index 9e8044a58..54308a00b 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -845,6 +845,8 @@ HttpAsyncWorkRequest::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesTr
 void
 HttpAsyncWorkRequest::AsyncWorkItem::Execute()
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	ZEN_TRACE_CPU("httpsys::async_execute");
 
 	try
@@ -1726,6 +1728,8 @@ HttpSysServerRequest::ReadPayload()
 void
 HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	ZEN_ASSERT(IsHandled() == false);
 
 	auto Response = new HttpMessageResponseRequest(m_HttpTx, (uint16_t)ResponseCode);
@@ -1743,6 +1747,8 @@ HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode)
 void
 HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::span<IoBuffer> Blobs)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	ZEN_ASSERT(IsHandled() == false);
 
 	auto Response = new HttpMessageResponseRequest(m_HttpTx, (uint16_t)ResponseCode, ContentType, Blobs);
@@ -1760,6 +1766,8 @@ HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentTy
 void
 HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::u8string_view ResponseString)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	ZEN_ASSERT(IsHandled() == false);
 
 	auto Response =
@@ -1778,6 +1786,8 @@ HttpSysServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentTy
 void
 HttpSysServerRequest::WriteResponseAsync(std::function<void(HttpServerRequest&)>&& ContinuationHandler)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	if (m_HttpTx.Server().IsAsyncResponseEnabled())
 	{
 		m_NextCompletionHandler = new HttpAsyncWorkRequest(m_HttpTx, std::move(ContinuationHandler));
@@ -1875,6 +1885,8 @@ InitialRequestHandler::IssueRequest(std::error_code& ErrorCode)
 HttpSysRequestHandler*
 InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesTransferred)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	auto _ = MakeGuard([&] { m_IsInitialRequest = false; });
 
 	switch (IoResult)
@@ -2085,6 +2097,8 @@ HttpSysServer::RegisterService(HttpService& Service)
 Ref<HttpServer>
 CreateHttpSysServer(HttpSysConfig Config)
 {
+	ZEN_MEMSCOPE(GetHttpsysTag());
+
 	return Ref<HttpServer>(new HttpSysServer(Config));
 }
 
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp
index fd116ba8e..925c7b42d 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/cache/httpstructuredcache.cpp
@@ -51,6 +51,8 @@ GetCacheHttpTag()
 	return CacheHttpTag;
 }
 
+extern const FLLMTag& GetCacheRpcTag();
+
 using namespace std::literals;
 
 //////////////////////////////////////////////////////////////////////////
@@ -1647,6 +1649,8 @@ HttpStructuredCacheService::ReplayRequestRecorder(const CacheRequestContext&  Co
 void
 HttpStructuredCacheService::HandleRpcRequest(HttpServerRequest& Request, std::string_view UriNamespace)
 {
+	ZEN_MEMSCOPE(GetCacheRpcTag());
+
 	ZEN_TRACE_CPU("z$::Http::HandleRpcRequest");
 
 	const bool HasUpstream = m_UpstreamCache.IsActive();
diff --git a/src/zenstore/cas.cpp b/src/zenstore/cas.cpp
index 7beac31e1..73c10a6db 100644
--- a/src/zenstore/cas.cpp
+++ b/src/zenstore/cas.cpp
@@ -29,7 +29,6 @@
 
 #include <filesystem>
 #include <functional>
-#include <unordered_map>
 
 //////////////////////////////////////////////////////////////////////////