Merge branch 'main' of https://github.ol.epicgames.net/ue-foundation/zensb/cleanup-main

1 files changed, 20 insertions, 18 deletions

diff --git a/src/zenstore/compactcas.cpp b/src/zenstore/compactcas.cpp
index 50af7246e..2be0542db 100644
--- a/src/zenstore/compactcas.cpp
+++ b/src/zenstore/compactcas.cpp
@@ -199,6 +199,7 @@ CasContainerStrategy::InsertChunk(const void* ChunkData, size_t ChunkSize, const
 	// reads, insert and GC.
 
 	m_BlockStore.WriteChunk(ChunkData, ChunkSize, m_PayloadAlignment, [&](const BlockStoreLocation& Location) {
+		ZEN_MEMSCOPE(GetCasContainerTag());
 		ZEN_TRACE_CPU("CasContainer::UpdateLocation");
 		BlockStoreDiskLocation	DiskLocation(Location, m_PayloadAlignment);
 		const CasDiskIndexEntry IndexEntry{.Key = ChunkHash, .Location = DiskLocation};
@@ -232,7 +233,6 @@ CasContainerStrategy::InsertChunks(std::span<IoBuffer> Chunks, std::span<IoHash>
 	ZEN_ASSERT(Chunks.size() == ChunkHashes.size());
 	std::vector<CasStore::InsertResult> Result(Chunks.size());
 	std::vector<size_t>					NewChunkIndexes;
-	Result.reserve(Chunks.size());
 	{
 		RwLock::SharedLockScope _(m_LocationMapLock);
 		for (size_t ChunkIndex = 0; ChunkIndex < ChunkHashes.size(); ChunkIndex++)
@@ -264,6 +264,7 @@ CasContainerStrategy::InsertChunks(std::span<IoBuffer> Chunks, std::span<IoHash>
 
 	size_t ChunkOffset = 0;
 	m_BlockStore.WriteChunks(Datas, m_PayloadAlignment, [&](std::span<BlockStoreLocation> Locations) {
+		ZEN_MEMSCOPE(GetCasContainerTag());
 		std::vector<CasDiskIndexEntry> IndexEntries;
 		for (const BlockStoreLocation& Location : Locations)
 		{
@@ -345,12 +346,13 @@ CasContainerStrategy::IterateChunks(std::span<IoHash>												  ChunkHashes,
 			}
 		}
 	}
-	if (FoundChunkLocations.size() < 3)
+	if (FoundChunkLocations.size() < 4)
 	{
-		for (size_t ChunkIndex : FoundChunkIndexes)
+		for (size_t Index = 0; Index < FoundChunkIndexes.size(); Index++)
 		{
-			IoBuffer Chunk = m_BlockStore.TryGetChunk(FoundChunkLocations[ChunkIndex]);
-			if (!AsyncCallback(ChunkIndex, Chunk))
+			IoBuffer Chunk		= m_BlockStore.TryGetChunk(FoundChunkLocations[Index]);
+			size_t	 OuterIndex = FoundChunkIndexes[Index];
+			if (!AsyncCallback(OuterIndex, Chunk))
 			{
 				return false;
 			}
@@ -359,6 +361,18 @@ CasContainerStrategy::IterateChunks(std::span<IoHash>												  ChunkHashes,
 	}
 
 	auto DoOneBlock = [&](std::span<const size_t> ChunkIndexes) {
+		if (ChunkIndexes.size() < 4)
+		{
+			for (size_t ChunkIndex : ChunkIndexes)
+			{
+				IoBuffer Chunk = m_BlockStore.TryGetChunk(FoundChunkLocations[ChunkIndex]);
+				if (!AsyncCallback(FoundChunkIndexes[ChunkIndex], Chunk))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 		return m_BlockStore.IterateBlock(
 			FoundChunkLocations,
 			ChunkIndexes,
@@ -378,19 +392,7 @@ CasContainerStrategy::IterateChunks(std::span<IoHash>												  ChunkHashes,
 	Latch			 WorkLatch(1);
 	std::atomic_bool AsyncContinue = true;
 	bool Continue = m_BlockStore.IterateChunks(FoundChunkLocations, [&](uint32_t BlockIndex, std::span<const size_t> ChunkIndexes) {
-		if (ChunkIndexes.size() < 3)
-		{
-			for (size_t ChunkIndex : ChunkIndexes)
-			{
-				IoBuffer Chunk = m_BlockStore.TryGetChunk(FoundChunkLocations[ChunkIndex]);
-				if (!AsyncCallback(FoundChunkIndexes[ChunkIndex], Chunk))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
-		else if (OptionalWorkerPool)
+		if (OptionalWorkerPool && (ChunkIndexes.size() > 3))
 		{
 			WorkLatch.AddCount(1);
 			OptionalWorkerPool->ScheduleWork([&, ChunkIndexes = std::vector<size_t>(ChunkIndexes.begin(), ChunkIndexes.end())]() {