Mercurial > hg > orthanc
changeset 6869:874a093dd254 streaming
reducing memory footprint of StorageAreaDataSource::Range
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 26 May 2026 18:41:02 +0200 |
| parents | 276cc0b60611 |
| children | e48f923cdab8 |
| files | OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp OrthancFramework/Sources/DataSource/DicomSequentialReader.h OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp OrthancFramework/Sources/DataSource/StorageAreaDataSource.h |
| diffstat | 4 files changed, 17 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp Tue May 26 18:32:55 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp Tue May 26 18:41:02 2026 +0200 @@ -128,7 +128,7 @@ case SourceType_StorageArea: { std::unique_ptr<StorageAreaDataSource::Range> range(new StorageAreaDataSource::Range(protection.release())); - return new Item(range->GetSharedBuffer()); + return new Item(range->GetBuffer()); } case SourceType_Dicom:
--- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.h Tue May 26 18:32:55 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.h Tue May 26 18:41:02 2026 +0200 @@ -48,9 +48,11 @@ explicit Item(const boost::shared_ptr<IMemoryBuffer>& raw); + private: Item(ParsedDicomFile* parsed /* takes ownership */, IMemoryBuffer* raw /* takes ownership */); + public: ParsedDicomFile& GetParsedDicomFile(); const IMemoryBuffer& GetRawMemoryBuffer();
--- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Tue May 26 18:32:55 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Tue May 26 18:41:02 2026 +0200 @@ -43,8 +43,8 @@ class StorageAreaDataSource::Value : public IDynamicObject { private: - std::unique_ptr<IMemoryBuffer> buffer_; - bool checkMD5_; + boost::shared_ptr<IMemoryBuffer> buffer_; + bool checkMD5_; public: explicit Value(IMemoryBuffer* buffer, @@ -58,10 +58,10 @@ } } - const IMemoryBuffer& GetBuffer() const + const boost::shared_ptr<IMemoryBuffer>& GetBuffer() const { assert(buffer_.get() != NULL); - return *buffer_; + return buffer_; } bool IsCheckMD5() const @@ -208,7 +208,7 @@ if (value.IsCheckMD5()) { std::string md5; - Toolbox::ComputeMD5(md5, value.GetBuffer().GetData(), value.GetBuffer().GetSize()); + Toolbox::ComputeMD5(md5, value.GetBuffer()->GetData(), value.GetBuffer()->GetSize()); if (md5 != attachment_.GetCompressedMD5()) { @@ -237,7 +237,7 @@ ZlibCompressor zlib; std::string content; - zlib.Uncompress(content, value.GetBuffer().GetData(), value.GetBuffer().GetSize()); + zlib.Uncompress(content, value.GetBuffer()->GetData(), value.GetBuffer()->GetSize()); if (value.IsCheckMD5()) { @@ -271,7 +271,7 @@ size_t StorageAreaDataSource::GetValueSize(const IDynamicObject& value) const { const Value& tmp = dynamic_cast<const Value&>(value); - return tmp.GetBuffer().GetSize(); + return tmp.GetBuffer()->GetSize(); } @@ -282,7 +282,7 @@ } - const IMemoryBuffer& StorageAreaDataSource::Range::GetBuffer() const + const boost::shared_ptr<IMemoryBuffer>& StorageAreaDataSource::Range::GetBuffer() const { if (item_.get() != NULL) { @@ -292,7 +292,7 @@ else if (buffer_.get() != NULL) { assert(item_.get() == NULL); - return *buffer_; + return buffer_; } else { @@ -340,24 +340,6 @@ } - boost::shared_ptr<IMemoryBuffer> StorageAreaDataSource::Range::GetSharedBuffer() const - { - if (buffer_.get() != NULL) - { - return buffer_; - } - else if (item_.get() != NULL) - { - // TODO-Streaming : Any way to shared the value with the "Item"? - return boost::shared_ptr<IMemoryBuffer>(StringMemoryBuffer::CreateFromBuffer(GetData(), GetSize())); - } - else - { - throw OrthancException(ErrorCode_InternalError); - } - } - - IDataIdentifier* StorageAreaDataSource::CreateRangeRequest(const std::string& uuid, FileContentType type, uint64_t start,
--- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Tue May 26 18:32:55 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Tue May 26 18:41:02 2026 +0200 @@ -73,29 +73,27 @@ std::unique_ptr<DataSourceAnswer::Item> item_; // Holding item puts backpressure on the data source (can be NULL) boost::shared_ptr<IMemoryBuffer> buffer_; // To be used if "item_ == NULL" - const IMemoryBuffer& GetBuffer() const; - public: explicit Range(DataSourceAnswer::Item* item /* takes ownership */); explicit Range(IMemoryBuffer* buffer /* takes ownership */); + const boost::shared_ptr<IMemoryBuffer>& GetBuffer() const; + const void* GetData() const { - return GetBuffer().GetData(); + return GetBuffer()->GetData(); } const size_t GetSize() const { - return GetBuffer().GetSize(); + return GetBuffer()->GetSize(); } void Copy(std::string& target) const { - GetBuffer().CopyToString(target); + GetBuffer()->CopyToString(target); } - - boost::shared_ptr<IMemoryBuffer> GetSharedBuffer() const; }; static IDataIdentifier* CreateRangeRequest(const std::string& uuid,
