# HG changeset patch # User Sebastien Jodogne # Date 1779207091 -7200 # Node ID f29bf471d4a54017a32667ff15984e4d4d384c25 # Parent e496596c3e4c4721bfc37a4d1bf9b31975d00b52 full removal of ServerContext::DicomCacheLocker diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Tue May 19 18:11:31 2026 +0200 @@ -24,8 +24,6 @@ #include "../PrecompiledHeadersServer.h" #include "../ResourceFinder.h" -#include - #include "OrthancRestApi.h" #include "../../../OrthancFramework/Sources/CompatibilityMath.h" diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Tue May 19 18:11:31 2026 +0200 @@ -1559,72 +1559,6 @@ } - ServerContext::DicomCacheLocker::DicomCacheLocker(ServerContext& context, - const std::string& instancePublicId) : - context_(context), - instancePublicId_(instancePublicId) - { - accessor_.reset(new ParsedDicomCache::Accessor(context_.dicomCache_, instancePublicId)); - - if (!accessor_->IsValid()) - { - accessor_.reset(NULL); - - // Throttle to avoid loading several large DICOM files simultaneously (since the ParsedDicomCache is 128MB, loading multiple 50MB files would throw them out directly after loading) - largeDicomLocker_.reset(new Semaphore::Locker(context.largeDicomThrottler_)); - - context_.ReadDicom(buffer_, instancePublicId_); - - dicom_.reset(new ParsedDicomFile(buffer_)); - dicomSize_ = buffer_.size(); - } - - assert(accessor_.get() != NULL || - dicom_.get() != NULL); - } - - - ServerContext::DicomCacheLocker::~DicomCacheLocker() - { - if (dicom_.get() != NULL) - { - try - { - context_.dicomCache_.Acquire(instancePublicId_, dicom_.release(), dicomSize_); - } - catch (OrthancException&) // NOLINT(bugprone-empty-catch) - { - } - } - } - - - ParsedDicomFile& ServerContext::DicomCacheLocker::GetDicom() const - { - if (dicom_.get() != NULL) - { - return *dicom_; - } - else - { - assert(accessor_.get() != NULL); - return accessor_->GetDicom(); - } - } - - const std::string& ServerContext::DicomCacheLocker::GetBuffer() - { - if (buffer_.size() > 0) - { - return buffer_; - } - else - { - context_.ReadDicom(buffer_, instancePublicId_); - return buffer_; - } - } - void ServerContext::SetStoreMD5ForAttachments(bool storeMD5) { LOG(INFO) << "Storing MD5 for attachments: " << (storeMD5 ? "yes" : "no"); diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.h Tue May 19 18:11:31 2026 +0200 @@ -296,28 +296,6 @@ boost::shared_ptr transcodingThreadPool_; public: - class DicomCacheLocker : public boost::noncopyable - { - private: - ServerContext& context_; - std::string instancePublicId_; - std::unique_ptr accessor_; - std::unique_ptr dicom_; - size_t dicomSize_; - std::unique_ptr largeDicomLocker_; - std::string buffer_; - - public: - DicomCacheLocker(ServerContext& context, - const std::string& instancePublicId); - - ~DicomCacheLocker(); - - ParsedDicomFile& GetDicom() const; - - const std::string& GetBuffer(); - }; - ServerContext(IDatabaseWrapper& database, IPluginStorageArea& area, bool unitTesting, diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp --- a/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Tue May 19 18:11:31 2026 +0200 @@ -97,8 +97,8 @@ try { - ServerContext::DicomCacheLocker locker(GetContext(), instance); - modified.reset(locker.GetDicom().Clone(true)); + std::unique_ptr dicom(GetContext().ReadParsedDicom(instance, false)); + modified.reset(dicom->Clone()); } catch (OrthancException&) { @@ -201,8 +201,10 @@ DicomMap dicom; { - ServerContext::DicomCacheLocker locker(GetContext(), instances.front()); - OrthancConfiguration::DefaultExtractDicomSummary(dicom, locker.GetDicom()); + std::unique_ptr loadedDicom(GetContext().ReadParsedDicom(instances.front(), false)); + DicomDataSource::Dicom::Lock lock(*loadedDicom); + + OrthancConfiguration::DefaultExtractDicomSummary(dicom, lock.GetContent()); } const std::set moduleTags = removals_; diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Tue May 19 18:11:31 2026 +0200 @@ -87,8 +87,8 @@ std::unique_ptr modified; { - ServerContext::DicomCacheLocker lock(context_, instance.GetId()); - modified.reset(lock.GetDicom().Clone(true)); + std::unique_ptr dicom(context_.ReadParsedDicom(instance.GetId(), false)); + modified.reset(dicom->Clone()); } try diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp --- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Tue May 19 18:11:31 2026 +0200 @@ -185,8 +185,10 @@ { for (std::set::const_iterator it = instancesToReconstruct_.begin(); it != instancesToReconstruct_.end(); ++it) { - ServerContext::DicomCacheLocker locker(GetContext(), *it); - const ParsedDicomFile& modifiedDicom = locker.GetDicom(); + std::unique_ptr dicom(GetContext().ReadParsedDicom(*it, false)); + DicomDataSource::Dicom::Lock lock(*dicom); + + const ParsedDicomFile& modifiedDicom = lock.GetContent(); GetContext().GetIndex().ReconstructInstance(modifiedDicom, false, ResourceType_Instance /* dummy */); } @@ -219,8 +221,10 @@ try { - ServerContext::DicomCacheLocker locker(GetContext(), instance); - const ParsedDicomFile& original = locker.GetDicom(); + std::unique_ptr dicom(GetContext().ReadParsedDicom(instance, false)); + DicomDataSource::Dicom::Lock lock(*dicom); + + const ParsedDicomFile& original = lock.GetContent(); originalHasher.reset(new DicomInstanceHasher(original.GetHasher())); modified.reset(original.Clone(true)); diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp --- a/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Tue May 19 18:11:31 2026 +0200 @@ -72,8 +72,8 @@ try { - ServerContext::DicomCacheLocker locker(GetContext(), instance); - modified.reset(locker.GetDicom().Clone(true)); + std::unique_ptr dicom(GetContext().ReadParsedDicom(instance, false)); + modified.reset(dicom->Clone()); } catch (OrthancException&) { diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp --- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Tue May 19 18:11:31 2026 +0200 @@ -290,9 +290,12 @@ // Make sure that the DICOM file can be re-read by DCMTK // from the file storage, and that the actual SOP // class/instance UIDs do match - ServerContext::DicomCacheLocker locker(context_, orthancId[0]); - if (locker.GetDicom().GetTagValue(a, DICOM_TAG_SOP_CLASS_UID) && - locker.GetDicom().GetTagValue(b, DICOM_TAG_SOP_INSTANCE_UID) && + + std::unique_ptr dicom(context_.ReadParsedDicom(orthancId[0], false)); + DicomDataSource::Dicom::Lock lock(*dicom); + + if (lock.GetContent().GetTagValue(a, DICOM_TAG_SOP_CLASS_UID) && + lock.GetContent().GetTagValue(b, DICOM_TAG_SOP_INSTANCE_UID) && b == sopInstanceUids_[index]) { if (a == sopClassUids_[index]) diff -r e496596c3e4c -r f29bf471d4a5 OrthancServer/Sources/ServerToolbox.cpp --- a/OrthancServer/Sources/ServerToolbox.cpp Tue May 19 17:31:53 2026 +0200 +++ b/OrthancServer/Sources/ServerToolbox.cpp Tue May 19 18:11:31 2026 +0200 @@ -294,26 +294,31 @@ if (limitToThisLevelDicomTags && instances.size() > 0) // in this case, we only need to rebuild one instance ! { - ServerContext::DicomCacheLocker locker(context, instances.front()); - context.GetIndex().ReconstructInstance(locker.GetDicom(), true, limitToLevel); + std::unique_ptr dicom(context.ReadParsedDicom(instances.front(), false)); + DicomDataSource::Dicom::Lock lock(*dicom); + + context.GetIndex().ReconstructInstance(lock.GetContent(), true, limitToLevel); } else { for (std::list::const_iterator it = instances.begin(); it != instances.end(); ++it) { - ServerContext::DicomCacheLocker locker(context, *it); + std::unique_ptr dicom(context.ReadParsedDicom(*it, false)); + DicomDataSource::Dicom::Lock lock(*dicom); // Delay the reconstruction of DICOM-as-JSON to its next access through "ServerContext" context.GetIndex().DeleteAttachment(*it, FileContentType_DicomAsJson, false /* no revision */, -1 /* dummy revision */, "" /* dummy MD5 */); - context.GetIndex().ReconstructInstance(locker.GetDicom(), false, ResourceType_Instance /* dummy */); + context.GetIndex().ReconstructInstance(lock.GetContent(), false, ResourceType_Instance /* dummy */); if (reconstructFiles) { + std::unique_ptr clone(lock.GetContent().Clone(true)); + std::string resultPublicId; // ignored - std::unique_ptr dicomInstancetoStore(DicomInstanceToStore::CreateFromParsedDicomFile(locker.GetDicom())); + std::unique_ptr dicomInstancetoStore(DicomInstanceToStore::CreateFromParsedDicomFile(*clone)); // TODO: TranscodeAndStore and specifically ServerIndex::Store have been "poluted" by the isReconstruct parameter // we should very likely refactor it