diff options
Diffstat (limited to 'src/zenutil/chunkedcontent.cpp')
| -rw-r--r-- | src/zenutil/chunkedcontent.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/zenutil/chunkedcontent.cpp b/src/zenutil/chunkedcontent.cpp index 13b8dd0d2..351e2837e 100644 --- a/src/zenutil/chunkedcontent.cpp +++ b/src/zenutil/chunkedcontent.cpp @@ -28,9 +28,9 @@ namespace { ChunkedContentData& InOutChunkedContent, tsl::robin_map<IoHash, uint32_t, IoHash::Hasher>& ChunkHashToChunkIndex, const IoHash& RawHash, - std::span<const uint32_t> ChunkSequence, - std::span<const IoHash> ChunkHashes, - std::span<const uint64_t> ChunkRawSizes) + eastl::span<const uint32_t> ChunkSequence, + eastl::span<const IoHash> ChunkHashes, + eastl::span<const uint64_t> ChunkRawSizes) { ZEN_ASSERT(ChunkHashes.size() == ChunkRawSizes.size()); InOutChunkedContent.ChunkCounts.push_back(gsl::narrow<uint32_t>(ChunkSequence.size())); @@ -529,7 +529,7 @@ LoadChunkedFolderContentToCompactBinary(CbObjectView Input) } ChunkedFolderContent -MergeChunkedFolderContents(const ChunkedFolderContent& Base, std::span<const ChunkedFolderContent> Overlays) +MergeChunkedFolderContents(const ChunkedFolderContent& Base, eastl::span<const ChunkedFolderContent> Overlays) { ZEN_TRACE_CPU("MergeChunkedFolderContents"); @@ -564,7 +564,7 @@ MergeChunkedFolderContents(const ChunkedFolderContent& Base, std::span<const Chu tsl::robin_map<IoHash, uint32_t, IoHash::Hasher> RawHashToSequenceRawHashIndex; - auto BuildOverlayPaths = [](std::span<const ChunkedFolderContent> Overlays) -> tsl::robin_set<std::string> { + auto BuildOverlayPaths = [](eastl::span<const ChunkedFolderContent> Overlays) -> tsl::robin_set<std::string> { tsl::robin_set<std::string> Result; for (const ChunkedFolderContent& OverlayContent : Overlays) { @@ -581,7 +581,7 @@ MergeChunkedFolderContents(const ChunkedFolderContent& Base, std::span<const Chu tsl::robin_map<IoHash, uint32_t, IoHash::Hasher>& ChunkHashToChunkIndex, tsl::robin_map<IoHash, uint32_t, IoHash::Hasher>& RawHashToSequenceRawHashIndex, const tsl::robin_map<std::string, std::filesystem::path>& GenericPathToActualPath, - std::span<const ChunkedFolderContent> Overlays) { + eastl::span<const ChunkedFolderContent> Overlays) { const ChunkedContentLookup OverlayLookup = BuildChunkedContentLookup(OverlayContent); tsl::robin_set<std::string> BaseOverlayPaths = BuildOverlayPaths(Overlays); for (uint32_t PathIndex = 0; PathIndex < OverlayContent.Paths.size(); PathIndex++) @@ -604,12 +604,12 @@ MergeChunkedFolderContents(const ChunkedFolderContent& Base, std::span<const Chu { RawHashToSequenceRawHashIndex.insert( {RawHash, gsl::narrow<uint32_t>(Result.ChunkedContent.SequenceRawHashes.size())}); - const uint32_t SequenceRawHashIndex = OverlayLookup.RawHashToSequenceIndex.at(RawHash); - const uint32_t OrderIndexOffset = OverlayLookup.SequenceIndexChunkOrderOffset[SequenceRawHashIndex]; - const uint32_t ChunkCount = OverlayContent.ChunkedContent.ChunkCounts[SequenceRawHashIndex]; - ChunkingStatistics Stats; - std::span<const uint32_t> OriginalChunkOrder = - std::span<const uint32_t>(OverlayContent.ChunkedContent.ChunkOrders).subspan(OrderIndexOffset, ChunkCount); + const uint32_t SequenceRawHashIndex = OverlayLookup.RawHashToSequenceIndex.at(RawHash); + const uint32_t OrderIndexOffset = OverlayLookup.SequenceIndexChunkOrderOffset[SequenceRawHashIndex]; + const uint32_t ChunkCount = OverlayContent.ChunkedContent.ChunkCounts[SequenceRawHashIndex]; + ChunkingStatistics Stats; + eastl::span<const uint32_t> OriginalChunkOrder = + eastl::span<const uint32_t>(OverlayContent.ChunkedContent.ChunkOrders).subspan(OrderIndexOffset, ChunkCount); AddChunkSequence(Stats, Result.ChunkedContent, ChunkHashToChunkIndex, @@ -639,7 +639,7 @@ MergeChunkedFolderContents(const ChunkedFolderContent& Base, std::span<const Chu } ChunkedFolderContent -DeletePathsFromChunkedContent(const ChunkedFolderContent& BaseContent, std::span<const std::filesystem::path> DeletedPaths) +DeletePathsFromChunkedContent(const ChunkedFolderContent& BaseContent, eastl::span<const std::filesystem::path> DeletedPaths) { ZEN_TRACE_CPU("DeletePathsFromChunkedContent"); @@ -674,12 +674,12 @@ DeletePathsFromChunkedContent(const ChunkedFolderContent& BaseContent, std::span { RawHashToSequenceRawHashIndex.insert( {RawHash, gsl::narrow<uint32_t>(Result.ChunkedContent.SequenceRawHashes.size())}); - const uint32_t SequenceRawHashIndex = BaseLookup.RawHashToSequenceIndex.at(RawHash); - const uint32_t OrderIndexOffset = BaseLookup.SequenceIndexChunkOrderOffset[SequenceRawHashIndex]; - const uint32_t ChunkCount = BaseContent.ChunkedContent.ChunkCounts[SequenceRawHashIndex]; - ChunkingStatistics Stats; - std::span<const uint32_t> OriginalChunkOrder = - std::span<const uint32_t>(BaseContent.ChunkedContent.ChunkOrders).subspan(OrderIndexOffset, ChunkCount); + const uint32_t SequenceRawHashIndex = BaseLookup.RawHashToSequenceIndex.at(RawHash); + const uint32_t OrderIndexOffset = BaseLookup.SequenceIndexChunkOrderOffset[SequenceRawHashIndex]; + const uint32_t ChunkCount = BaseContent.ChunkedContent.ChunkCounts[SequenceRawHashIndex]; + ChunkingStatistics Stats; + eastl::span<const uint32_t> OriginalChunkOrder = + eastl::span<const uint32_t>(BaseContent.ChunkedContent.ChunkOrders).subspan(OrderIndexOffset, ChunkCount); AddChunkSequence(Stats, Result.ChunkedContent, ChunkHashToChunkIndex, |