handle that more than one block can be written to in parallel

1 files changed, 20 insertions, 19 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 3ba75cd9c..2869191fd 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -1832,25 +1832,26 @@ ZenCacheDiskLayer::CacheBucket::PutInlineCacheValue(const IoHash& HashKey, const
 		EntryFlags |= DiskLocation::kCompressed;
 	}
 
-	BlockStoreLocation	 BlockStoreLocation = m_BlockStore.WriteChunk(Value.Value.Data(), Value.Value.Size(), m_PayloadAlignment);
-	DiskLocation		 Location(BlockStoreLocation, m_PayloadAlignment, EntryFlags);
-	const DiskIndexEntry DiskIndexEntry{.Key = HashKey, .Location = Location};
-	m_SlogFile.Append(DiskIndexEntry);
-	m_TotalSize.fetch_add(BlockStoreLocation.Size, std::memory_order::relaxed);
-	RwLock::ExclusiveLockScope __(m_IndexLock);
-	if (auto It = m_Index.find(HashKey); It != m_Index.end())
-	{
-		// TODO: should check if write is idempotent and bail out if it is?
-		// this would requiring comparing contents on disk unless we add a
-		// content hash to the index entry
-		IndexEntry& Entry = It.value();
-		Entry.Location	  = Location;
-		Entry.LastAccess.store(GcClock::TickCount(), std::memory_order_relaxed);
-	}
-	else
-	{
-		m_Index.insert({HashKey, {Location, GcClock::TickCount()}});
-	}
+	m_BlockStore.WriteChunk(Value.Value.Data(), Value.Value.Size(), m_PayloadAlignment, [&](BlockStoreLocation BlockStoreLocation) {
+		DiskLocation		 Location(BlockStoreLocation, m_PayloadAlignment, EntryFlags);
+		const DiskIndexEntry DiskIndexEntry{.Key = HashKey, .Location = Location};
+		m_SlogFile.Append(DiskIndexEntry);
+		m_TotalSize.fetch_add(BlockStoreLocation.Size, std::memory_order::relaxed);
+		RwLock::ExclusiveLockScope __(m_IndexLock);
+		if (auto It = m_Index.find(HashKey); It != m_Index.end())
+		{
+			// TODO: should check if write is idempotent and bail out if it is?
+			// this would requiring comparing contents on disk unless we add a
+			// content hash to the index entry
+			IndexEntry& Entry = It.value();
+			Entry.Location	  = Location;
+			Entry.LastAccess.store(GcClock::TickCount(), std::memory_order_relaxed);
+		}
+		else
+		{
+			m_Index.insert({HashKey, {Location, GcClock::TickCount()}});
+		}
+	});
 }
 
 //////////////////////////////////////////////////////////////////////////