changeset 6836:9ae0a5b7772f streaming

added placeholder calls to DataSourceReader::SetCapacity()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 May 2026 12:09:16 +0200
parents 727365eb11a5
children 5ac81cbba1c2
files OrthancFramework/Sources/DataSource/DataSourceReader.cpp OrthancFramework/Sources/DataSource/DataSourceReader.h OrthancServer/Sources/ServerContext.cpp
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DataSourceReader.cpp	Thu May 21 11:45:33 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DataSourceReader.cpp	Thu May 21 12:09:16 2026 +0200
@@ -185,7 +185,7 @@
   }
 
 
-  void DataSourceReader::SetMaximumMemory(uint64_t maximumMemory)
+  void DataSourceReader::SetCapacity(uint64_t maximumMemory)
   {
     budget_ = boost::make_shared<Internals::DataSourceMemoryBudget>(maximumMemory);
   }
--- a/OrthancFramework/Sources/DataSource/DataSourceReader.h	Thu May 21 11:45:33 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DataSourceReader.h	Thu May 21 12:09:16 2026 +0200
@@ -59,7 +59,11 @@
 
     void CreateCache(size_t capacity);
 
-    void SetMaximumMemory(uint64_t maximumMemory);
+    /**
+     * Apply backpressure by limiting memory for pending read
+     * tasks. Further reads block until memory is released.
+     **/
+    void SetCapacity(uint64_t maximumMemory);
 
     boost::shared_ptr<DataSourceAnswer> Submit(DataSourceRequest* request /* takes ownership */);
 
--- a/OrthancServer/Sources/ServerContext.cpp	Thu May 21 11:45:33 2026 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Thu May 21 12:09:16 2026 +0200
@@ -568,7 +568,8 @@
         pool->Start();
 
         storageAreaReader_.reset(new DataSourceReader(pool, new StorageAreaDataSource(area_)));
-        storageAreaReader_->CreateCache(128 * MEGABYTE); // 128 MB - TODO-Streaming - Parameter
+        storageAreaReader_->SetCapacity(1 * GIGABYTE);  // 1 GB - TODO-Streaming - Parameter
+        storageAreaReader_->CreateCache(256 * MEGABYTE); // 256 MB - TODO-Streaming - Parameter
       }
 
       {
@@ -579,7 +580,8 @@
         pool->Start();
 
         dicomReader_.reset(new DataSourceReader(pool, new DicomDataSource(storageAreaReader_)));
-        dicomReader_->CreateCache(128 * MEGABYTE); // 128 MB - TODO-Streaming - Parameter
+        dicomReader_->SetCapacity(1 * GIGABYTE);  // 1 GB - TODO-Streaming - Parameter
+        dicomReader_->CreateCache(256 * MEGABYTE); // 256 MB - TODO-Streaming - Parameter
       }
 
       if (transcoder_.get() != NULL)
@@ -591,7 +593,8 @@
         transcoderThreadPool_->Start();
 
         transcoderReader_.reset(new DataSourceReader(transcoderThreadPool_, new TranscoderDataSource(transcoder_, storageAreaReader_)));
-        transcoderReader_->CreateCache(128 * MEGABYTE); // 128 MB - TODO-Streaming - Parameter
+        transcoderReader_->SetCapacity(1 * GIGABYTE);  // 1 GB - TODO-Streaming - Parameter
+        transcoderReader_->CreateCache(256 * MEGABYTE); // 256 MB - TODO-Streaming - Parameter
       }
     }
     catch (OrthancException&)