diff options
Diffstat (limited to 'src/zenstore/blockstore.cpp')
| -rw-r--r-- | src/zenstore/blockstore.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/zenstore/blockstore.cpp b/src/zenstore/blockstore.cpp index 7df9117db..8a196db33 100644 --- a/src/zenstore/blockstore.cpp +++ b/src/zenstore/blockstore.cpp @@ -578,7 +578,7 @@ BlockStore::WriteChunk(const void* Data, uint64_t Size, uint32_t Alignment, cons } void -BlockStore::WriteChunks(std::span<IoBuffer> Datas, uint32_t Alignment, const WriteChunksCallback& Callback) +BlockStore::WriteChunks(eastl::span<IoBuffer> Datas, uint32_t Alignment, const WriteChunksCallback& Callback) { ZEN_MEMSCOPE(GetBlocksTag()); ZEN_TRACE_CPU("BlockStore::WriteChunks"); @@ -721,8 +721,8 @@ BlockStore::Flush(bool ForceNewBlock) } bool -BlockStore::IterateBlock(std::span<const BlockStoreLocation> ChunkLocations, - std::span<const size_t> InChunkIndexes, +BlockStore::IterateBlock(eastl::span<const BlockStoreLocation> ChunkLocations, + eastl::span<const size_t> InChunkIndexes, const IterateChunksSmallSizeCallback& SmallSizeCallback, const IterateChunksLargeSizeCallback& LargeSizeCallback, uint64_t LargeSizeLimit) @@ -752,10 +752,10 @@ BlockStore::IterateBlock(std::span<const BlockStoreLocation> ChunkLocations, return ChunkLocations[IndexA].Offset < ChunkLocations[IndexB].Offset; }); - auto GetNextRange = [LargeSizeLimit, - IterateSmallChunkWindowSize, - IterateSmallChunkMaxGapSize, - &ChunkLocations](uint64_t BlockFileSize, std::span<const size_t> ChunkIndexes, size_t StartIndexOffset) -> size_t { + auto GetNextRange = [LargeSizeLimit, IterateSmallChunkWindowSize, IterateSmallChunkMaxGapSize, &ChunkLocations]( + uint64_t BlockFileSize, + eastl::span<const size_t> ChunkIndexes, + size_t StartIndexOffset) -> size_t { size_t ChunkCount = 0; size_t StartIndex = ChunkIndexes[StartIndexOffset]; const BlockStoreLocation& StartLocation = ChunkLocations[StartIndex]; @@ -882,7 +882,7 @@ BlockStore::IterateBlock(std::span<const BlockStoreLocation> ChunkLocations, } bool -BlockStore::IterateChunks(const std::span<const BlockStoreLocation>& ChunkLocations, const IterateChunksCallback& Callback) +BlockStore::IterateChunks(const eastl::span<const BlockStoreLocation>& ChunkLocations, const IterateChunksCallback& Callback) { ZEN_MEMSCOPE(GetBlocksTag()); ZEN_TRACE_CPU("BlockStore::IterateChunks"); @@ -903,9 +903,9 @@ BlockStore::IterateChunks(const std::span<const BlockStoreLocation>& ChunkLocati std::sort(ChunkOrder.begin(), ChunkOrder.end(), [&ChunkLocations](const size_t Lhs, const size_t Rhs) { return ChunkLocations[Lhs].BlockIndex < ChunkLocations[Rhs].BlockIndex; }); - size_t RangeStart = 0; - size_t RangeEnd = 0; - const std::span<size_t> ChunkIndexRange(ChunkOrder); + size_t RangeStart = 0; + size_t RangeEnd = 0; + const eastl::span<size_t> ChunkIndexRange(ChunkOrder); while (RangeStart < ChunkOrder.size()) { const size_t ChunkIndex = ChunkOrder[RangeStart]; @@ -1461,7 +1461,7 @@ TEST_CASE("blockstore.multichunks") BlockStoreLocation Locations[5]; size_t ChunkOffset = 0; - Store.WriteChunks(MultiChunkData, 4, [&](std::span<BlockStoreLocation> InLocations) { + Store.WriteChunks(MultiChunkData, 4, [&](eastl::span<BlockStoreLocation> InLocations) { for (const BlockStoreLocation& Location : InLocations) { Locations[ChunkOffset++] = Location; @@ -1484,7 +1484,7 @@ TEST_CASE("blockstore.multichunks") "ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ_93"; MultiChunkData.push_back(IoBuffer(IoBuffer::Wrap, FifthChunkData.data(), FifthChunkData.size())); - Store.WriteChunks(MultiChunkData, 4, [&](std::span<BlockStoreLocation> InLocations) { + Store.WriteChunks(MultiChunkData, 4, [&](eastl::span<BlockStoreLocation> InLocations) { for (const BlockStoreLocation& Location : InLocations) { CHECK(ChunkOffset < 5); @@ -1595,7 +1595,7 @@ TEST_CASE("blockstore.iterate.chunks") BadLocationOutOfRange, BadBlockIndex}; Latch WorkLatch(1); - Store.IterateChunks(Locations, [&](uint32_t, std::span<const size_t> ChunkIndexes) -> bool { + Store.IterateChunks(Locations, [&](uint32_t, eastl::span<const size_t> ChunkIndexes) -> bool { WorkLatch.AddCount(1); WorkerPool.ScheduleWork([&, ChunkIndexes = eastl::vector<size_t>(ChunkIndexes.begin(), ChunkIndexes.end())]() { auto _ = MakeGuard([&WorkLatch]() { WorkLatch.CountDown(); }); |