changeset 6873:42ca9122d003 streaming

using DicomSequentialReader in OrthancMoveRequestHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 28 May 2026 18:24:26 +0200
parents 305778086d85
children aa4e5201fb9f
files OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp OrthancServer/Sources/OrthancMoveRequestHandler.cpp OrthancServer/Sources/ServerContext.cpp OrthancServer/Sources/ServerContext.h OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp
diffstat 6 files changed, 68 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp	Thu May 28 18:24:26 2026 +0200
@@ -317,11 +317,8 @@
                                                                                             bool hasLossyQuality,
                                                                                             unsigned int lossyQuality) const
   {
-    // TODO
-    return new DicomSequentialReader(
-      DicomSequentialReader::SourceType_Transcoder, executor_,
-      targetSyntax, mode, hasLossyQuality, lossyQuality,
-      transcoderReader_, windowSize_, windowCapacity_);
+    // TODO-Streaming : No optimization seems possible, we need to go through the transcoder anyway
+    return CreateForTranscodedParsedDicomFile(targetSyntax, mode, hasLossyQuality, lossyQuality);
   }
 
 
--- a/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Thu May 28 18:24:26 2026 +0200
@@ -27,13 +27,13 @@
 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
 #include "../../OrthancFramework/Sources/DicomNetworking/DicomConnectionInfo.h"
 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
+#include "../../OrthancFramework/Sources/DataSource/DicomSequentialReader.h"
 #include "../../OrthancFramework/Sources/Logging.h"
 #include "../../OrthancFramework/Sources/MetricsRegistry.h"
 
 #include "OrthancConfiguration.h"
 #include "ServerContext.h"
 #include "ServerJobs/DicomModalityStoreJob.h"
-#include "ServerJobs/ThreadedInstancesLoader.h"
 
 
 namespace Orthanc
@@ -42,14 +42,31 @@
   {
     // Anonymous namespace to avoid clashes between compilation modules
 
+    class MoveReaderUserData : public IDynamicObject
+    {
+    private:
+      std::string instanceId_;
+
+    public:
+      MoveReaderUserData(const std::string& instanceId) :
+        instanceId_(instanceId)
+      {
+      }
+
+      const std::string& GetInstanceId() const
+      {
+        return instanceId_;
+      }
+    };
+
+
     class SynchronousMove : public IMoveRequestIterator
     {
     private:
       ServerContext& context_;
       std::string localAet_;
       std::vector<std::string> instancesIds_;
-      // std::vector<FileInfo> filesInfo_;
-      std::unique_ptr<ThreadedInstancesLoader> instancesLoader_;
+      std::unique_ptr<DicomSequentialReader> instancesLoader_;
       size_t position_;
       RemoteModalityParameters remote_;
       std::string originatorAet_;
@@ -69,12 +86,9 @@
         originatorAet_(originatorAet),
         originatorId_(originatorId)
       {
-        unsigned int loaderThreads;
-
         {
           OrthancConfiguration::ReaderLock lock;
           remote_ = lock.GetConfiguration().GetModalityUsingAet(targetAet);
-          loaderThreads = lock.GetConfiguration().GetLoaderThreads();
         }
 
         if (remote_.HasLocalAet())
@@ -82,8 +96,6 @@
           localAet_ = remote_.GetLocalAet();  // from the DicomModalities config
         }
 
-        instancesLoader_.reset(new ThreadedInstancesLoader(context_, loaderThreads, false, DicomTransferSyntax_BigEndianExplicit /* dummy value*/, 0, "CSTO"));
-
         std::vector<FileInfo> filesInfo;
         for (size_t i = 0; i < publicIds.size(); i++)
         {
@@ -95,10 +107,14 @@
           context.GetOrderedChildInstances(instancesIds_, filesInfo, resourceId, resourceType);
         }
 
+        instancesLoader_.reset(context_.GetDicomSequentialReaderFactory().CreateForOriginalRawMemoryBuffer());
+
         for (size_t i = 0; i < instancesIds_.size(); ++i)
         {
-          instancesLoader_->PreloadDicomInstance(instancesIds_[i], filesInfo[i]);
+          instancesLoader_->Submit(filesInfo[i], new MoveReaderUserData(instancesIds_[i]));
         }
+
+        instancesLoader_->Start();
       }
 
       virtual unsigned int GetSubOperationCount() const ORTHANC_OVERRIDE
@@ -113,10 +129,26 @@
           return Status_Failure;
         }
 
+        if (instancesLoader_.get() == NULL ||
+            !instancesLoader_->HasNext())
+        {
+          throw OrthancException(ErrorCode_InternalError);
+        }
+
         const std::string& id = instancesIds_[position_++];
 
-        std::string dicom;
-        instancesLoader_->WaitDicomInstance(dicom, id);
+        std::unique_ptr<DicomSequentialReader::Item> next(instancesLoader_->Next());
+        assert(next.get() != NULL &&
+               next->HasUserData());
+
+        {
+          // This is just a sanity check, the class "MoveReaderUserData" could be removed
+          const MoveReaderUserData& userData = dynamic_cast<const MoveReaderUserData&>(next->GetUserData());
+          if (userData.GetInstanceId() != id)
+          {
+            throw OrthancException(ErrorCode_InternalError);
+          }
+        }
 
         if (connection_.get() == NULL)
         {
@@ -124,8 +156,11 @@
           connection_.reset(new DicomStoreUserConnection(params));
         }
 
+        const IMemoryBuffer& dicom = next->GetRawMemoryBuffer();
+
         std::string sopClassUid, sopInstanceUid;  // Unused
-        context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_, dicom,
+        context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_,
+                                              dicom.GetData(), dicom.GetSize(),
                                               true, originatorAet_, originatorId_);
 
         return Status_Success;
--- a/OrthancServer/Sources/ServerContext.cpp	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Thu May 28 18:24:26 2026 +0200
@@ -616,8 +616,15 @@
       }
 
       {
+        unsigned int loaderThreads;
+
+        {
+          OrthancConfiguration::ReaderLock lock;
+          loaderThreads = lock.GetConfiguration().GetLoaderThreads();
+        }
+
         std::unique_ptr<ThreadPool> pool(new ThreadPool);
-        pool->SetCountThreads(16);  // TODO-Streaming - Parameter
+        pool->SetCountThreads(loaderThreads);  // TODO-Streaming - Check
         pool->SetLoggingThreadName("READER");
         pool->SetDequeueTimeout(100);
         pool->Start();
@@ -1910,19 +1917,19 @@
   void ServerContext::PerformCStoreWithTranscoding(std::string& sopClassUid,
                                                    std::string& sopInstanceUid,
                                                    DicomStoreUserConnection& connection,
-                                                   const std::string& dicom,
+                                                   const void* dicomData,
+                                                   size_t dicomSize,
                                                    bool hasMoveOriginator,
                                                    const std::string& moveOriginatorAet,
                                                    uint16_t moveOriginatorId)
   {
-    const void* data = dicom.empty() ? NULL : dicom.c_str();
     const RemoteModalityParameters& modality = connection.GetParameters().GetRemoteModality();
 
     // Filter out outgoing C-Store instances
     {
       boost::shared_lock<boost::shared_mutex> lock(listenersMutex_);
 
-      std::unique_ptr<OutgoingDicomInstance> outgoingInstance(OutgoingDicomInstance::CreateFromBuffer(dicom));
+      std::unique_ptr<OutgoingDicomInstance> outgoingInstance(OutgoingDicomInstance::CreateFromBuffer(dicomData, dicomSize));
       outgoingInstance->SetDestination(DicomInstanceDestination(connection.GetParameters().GetRemoteModality().GetHost(),
                                                                 connection.GetParameters().GetRemoteModality().GetApplicationEntityTitle()));
 
@@ -1951,12 +1958,12 @@
     if (!transcodeDicomProtocol_ ||
         !modality.IsTranscodingAllowed())
     {
-      connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(),
+      connection.Store(sopClassUid, sopInstanceUid, dicomData, dicomSize,
                        hasMoveOriginator, moveOriginatorAet, moveOriginatorId);
     }
     else
     {
-      connection.Transcode(sopClassUid, sopInstanceUid, *transcoder_, data, dicom.size(), preferredTransferSyntax_,
+      connection.Transcode(sopClassUid, sopInstanceUid, *transcoder_, dicomData, dicomSize, preferredTransferSyntax_,
                            hasMoveOriginator, moveOriginatorAet, moveOriginatorId);
     }
   }
--- a/OrthancServer/Sources/ServerContext.h	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancServer/Sources/ServerContext.h	Thu May 28 18:24:26 2026 +0200
@@ -553,7 +553,8 @@
     void PerformCStoreWithTranscoding(std::string& sopClassUid,
                                       std::string& sopInstanceUid,
                                       DicomStoreUserConnection& connection,
-                                      const std::string& dicom,
+                                      const void* dicomData,
+                                      size_t dicomSize,
                                       bool hasMoveOriginator,
                                       const std::string& moveOriginatorAet,
                                       uint16_t moveOriginatorId);
--- a/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp	Thu May 28 18:24:26 2026 +0200
@@ -69,7 +69,8 @@
     }
 
     std::string sopClassUid, sopInstanceUid;
-    context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_, dicom,
+    context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_,
+                                          dicom.empty() ? NULL : dicom.c_str(), dicom.size(),
                                           HasMoveOriginator(), moveOriginatorAet_, moveOriginatorId_);
 
     if (storageCommitment_)
--- a/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp	Thu May 28 17:06:57 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp	Thu May 28 18:24:26 2026 +0200
@@ -55,7 +55,8 @@
       instance.ReadDicom(dicom);
 
       std::string sopClassUid, sopInstanceUid;  // Unused
-      context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, lock.GetConnection(), dicom,
+      context_.PerformCStoreWithTranscoding(sopClassUid, sopInstanceUid, lock.GetConnection(),
+                                            dicom.empty() ? NULL : dicom.c_str(), dicom.size(),
                                             false /* Not a C-MOVE */, "", 0);
     }
     catch (OrthancException& e)