diff options
| author | Stefan Boberg <[email protected]> | 2025-03-06 17:27:59 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2025-03-06 17:27:59 +0100 |
| commit | 66e5d1f4e288e0c32f854ebe3b63584b42b83554 (patch) | |
| tree | d67e9d358419b5baccd429d54988414e0d7cd7a6 /src/zenutil/filebuildstorage.cpp | |
| parent | reduced memory churn using fixed_xxx containers (#236) (diff) | |
| download | zen-66e5d1f4e288e0c32f854ebe3b63584b42b83554.tar.xz zen-66e5d1f4e288e0c32f854ebe3b63584b42b83554.zip | |
switched std::vector -> eastl::vector
Diffstat (limited to 'src/zenutil/filebuildstorage.cpp')
| -rw-r--r-- | src/zenutil/filebuildstorage.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/zenutil/filebuildstorage.cpp b/src/zenutil/filebuildstorage.cpp index a4bb759e7..37bf82afe 100644 --- a/src/zenutil/filebuildstorage.cpp +++ b/src/zenutil/filebuildstorage.cpp @@ -114,10 +114,10 @@ public: SimulateLatency(0, 0); } - virtual std::pair<IoHash, std::vector<IoHash>> PutBuildPart(const Oid& BuildId, - const Oid& BuildPartId, - std::string_view PartName, - const CbObject& MetaData) override + virtual std::pair<IoHash, eastl::vector<IoHash>> PutBuildPart(const Oid& BuildId, + const Oid& BuildPartId, + std::string_view PartName, + const CbObject& MetaData) override { SimulateLatency(MetaData.GetSize(), 0); Stopwatch ExecutionTimer; @@ -155,7 +155,7 @@ public: } WriteBuild(BuildId, Writer.Save()); - std::vector<IoHash> NeededAttachments = GetNeededAttachments(MetaData); + eastl::vector<IoHash> NeededAttachments = GetNeededAttachments(MetaData); SimulateLatency(0, sizeof(IoHash) * NeededAttachments.size()); @@ -184,7 +184,7 @@ public: return BuildPartObject; } - virtual std::vector<IoHash> FinalizeBuildPart(const Oid& BuildId, const Oid& BuildPartId, const IoHash& PartHash) override + virtual eastl::vector<IoHash> FinalizeBuildPart(const Oid& BuildId, const Oid& BuildPartId, const IoHash& PartHash) override { SimulateLatency(0, 0); @@ -202,8 +202,8 @@ public: fmt::format("Failed finalizing build part {}: Expected hash {}, got {}", BuildPartId, PartHash, RawHash)); } - CbObject BuildPartObject = CbObject(SharedBuffer(Payload)); - std::vector<IoHash> NeededAttachments(GetNeededAttachments(BuildPartObject)); + CbObject BuildPartObject = CbObject(SharedBuffer(Payload)); + eastl::vector<IoHash> NeededAttachments(GetNeededAttachments(BuildPartObject)); SimulateLatency(0, NeededAttachments.size() * sizeof(IoHash)); @@ -235,12 +235,12 @@ public: SimulateLatency(0, 0); } - virtual std::vector<std::function<void()>> PutLargeBuildBlob(const Oid& BuildId, - const IoHash& RawHash, - ZenContentType ContentType, - uint64_t PayloadSize, - std::function<IoBuffer(uint64_t Offset, uint64_t Size)>&& Transmitter, - std::function<void(uint64_t, bool)>&& OnSentBytes) override + virtual eastl::vector<std::function<void()>> PutLargeBuildBlob(const Oid& BuildId, + const IoHash& RawHash, + ZenContentType ContentType, + uint64_t PayloadSize, + std::function<IoBuffer(uint64_t Offset, uint64_t Size)>&& Transmitter, + std::function<void(uint64_t, bool)>&& OnSentBytes) override { ZEN_UNUSED(BuildId); ZEN_UNUSED(ContentType); @@ -274,8 +274,8 @@ public: fmt::format("Failed opening temporary file '{}': {} ({})", Workload->TempFile.GetPath(), Ec.message(), Ec.value())); } - std::vector<std::function<void()>> WorkItems; - uint64_t Offset = 0; + eastl::vector<std::function<void()>> WorkItems; + uint64_t Offset = 0; while (Offset < PayloadSize) { uint64_t Size = Min(32u * 1024u * 1024u, PayloadSize - Offset); @@ -348,7 +348,7 @@ public: return IoBuffer{}; } - virtual std::vector<std::function<void()>> GetLargeBuildBlob( + virtual eastl::vector<std::function<void()>> GetLargeBuildBlob( const Oid& BuildId, const IoHash& RawHash, uint64_t ChunkSize, @@ -377,8 +377,8 @@ public: Workload->Receiver = std::move(Receiver); Workload->BytesRemaining = BlobSize; - std::vector<std::function<void()>> WorkItems; - uint64_t Offset = 0; + eastl::vector<std::function<void()>> WorkItems; + uint64_t Offset = 0; while (Offset < BlobSize) { uint64_t Size = Min(ChunkSize, BlobSize - Offset); @@ -418,7 +418,7 @@ public: SimulateLatency(0, 0); } - virtual std::vector<ChunkBlockDescription> FindBlocks(const Oid& BuildId) override + virtual eastl::vector<ChunkBlockDescription> FindBlocks(const Oid& BuildId) override { ZEN_UNUSED(BuildId); SimulateLatency(0, 0); @@ -428,7 +428,7 @@ public: DirectoryContent Content; GetDirectoryContent(GetBlobsMetadataFolder(), DirectoryContentFlags::IncludeFiles, Content); - std::vector<ChunkBlockDescription> Result; + eastl::vector<ChunkBlockDescription> Result; for (const std::filesystem::path& MetaDataFile : Content.Files) { IoHash ChunkHash; @@ -450,7 +450,7 @@ public: return Result; } - virtual std::vector<ChunkBlockDescription> GetBlockMetadata(const Oid& BuildId, std::span<const IoHash> BlockHashes) override + virtual eastl::vector<ChunkBlockDescription> GetBlockMetadata(const Oid& BuildId, std::span<const IoHash> BlockHashes) override { ZEN_UNUSED(BuildId); SimulateLatency(0, 0); @@ -458,7 +458,7 @@ public: auto _ = MakeGuard([&]() { m_Stats.TotalExecutionTimeUs += ExecutionTimer.GetElapsedTimeUs(); }); m_Stats.TotalRequestCount++; - std::vector<ChunkBlockDescription> Result; + eastl::vector<ChunkBlockDescription> Result; for (const IoHash& BlockHash : BlockHashes) { std::filesystem::path MetaDataFile = GetBlobMetadataPath(BlockHash); @@ -555,9 +555,9 @@ protected: return BuildObject; } - std::vector<IoHash> GetNeededAttachments(CbObjectView BuildPartObject) + eastl::vector<IoHash> GetNeededAttachments(CbObjectView BuildPartObject) { - std::vector<IoHash> NeededAttachments; + eastl::vector<IoHash> NeededAttachments; BuildPartObject.IterateAttachments([&](CbFieldView FieldView) { const IoHash AttachmentHash = FieldView.AsBinaryAttachment(); const std::filesystem::path BlockPath = GetBlobPayloadPath(AttachmentHash); |