Mercurial > hg > orthanc
changeset 6824:b9ecf4edf9c5 streaming
added thread name
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 21 May 2026 07:57:26 +0200 |
| parents | 80073731929d |
| children | adebd0adab8d |
| files | OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp OrthancServer/Sources/ServerContext.cpp OrthancServer/Sources/ServerContext.h OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp OrthancServer/Sources/ServerToolbox.cpp OrthancServer/UnitTestsSources/ServerIndexTests.cpp OrthancServer/UnitTestsSources/ServerJobsTests.cpp |
| diffstat | 12 files changed, 31 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp Thu May 21 07:57:26 2026 +0200 @@ -219,7 +219,7 @@ std::unique_ptr<ParsedDicomFile> modified; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); modified.reset(dicom->Clone()); }
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Thu May 21 07:57:26 2026 +0200 @@ -383,7 +383,7 @@ DicomWebJsonVisitor visitor; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); DicomDataSource::Dicom::Lock lock(*dicom); lock.GetContent().Apply(visitor); } @@ -426,7 +426,7 @@ std::unique_ptr<TranscodingCallable> callable(new TranscodingCallable); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); std::unique_ptr<ParsedDicomFile> clone(dicom->Clone()); callable->AcquireParsed(*clone); // "clone" is invalid below this point } @@ -517,7 +517,7 @@ Json::Value answer; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); DicomDataSource::Dicom::Lock lock(*dicom); lock.GetContent().DatasetToJson(answer, format, flags, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength); @@ -639,7 +639,7 @@ unsigned int numberOfFrames; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); DicomDataSource::Dicom::Lock lock(*dicom); numberOfFrames = lock.GetContent().GetFramesCount(); } @@ -926,7 +926,7 @@ * interpretation, and with windowing parameters. **/ - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); DicomDataSource::Dicom::Lock lock(*dicom); handler.Handle(call, decoded, &lock.GetContent(), frame); } @@ -1411,7 +1411,7 @@ NumpyVisitor visitor(0 /* no depth, 2D frame */, rescale); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId)); DicomDataSource::Dicom::Lock lock(*dicom); visitor.WriteFrame(lock.GetContent(), frame); } @@ -1441,7 +1441,7 @@ const bool rescale = call.GetBooleanArgument("rescale", true); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId)); DicomDataSource::Dicom::Lock lock(*dicom); const unsigned int depth = lock.GetContent().GetFramesCount(); @@ -1499,7 +1499,7 @@ unsigned int framesCount = ordering.GetFramesCount(i); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instanceId)); DicomDataSource::Dicom::Lock lock(*dicom); for (unsigned int frame = 0; frame < framesCount; frame++) @@ -1619,7 +1619,7 @@ MimeType mime; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(publicId)); DicomDataSource::Dicom::Lock lock(*dicom); lock.GetContent().GetRawFrame(raw, mime, frame); } @@ -2855,7 +2855,7 @@ std::string id = call.GetUriComponent("id", ""); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); DicomDataSource::Dicom::Lock lock(*dicom); lock.GetContent().SendPathValue(call.GetOutput(), call.GetTrailingUri()); } @@ -3827,7 +3827,7 @@ std::string pdf; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); DicomDataSource::Dicom::Lock lock(*dicom); if (lock.GetContent().ExtractPdf(pdf))
--- a/OrthancServer/Sources/ServerContext.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Thu May 21 07:57:26 2026 +0200 @@ -564,6 +564,7 @@ { boost::shared_ptr<ThreadPool> pool(new ThreadPool); pool->SetCountThreads(4); // TODO-Streaming - Parameter + pool->SetLoggingThreadName("STORAGE"); pool->SetDequeueTimeout(100); pool->Start(); @@ -574,6 +575,7 @@ { boost::shared_ptr<ThreadPool> pool(new ThreadPool); pool->SetCountThreads(2); // TODO-Streaming - Parameter + pool->SetLoggingThreadName("DICOM"); pool->SetDequeueTimeout(100); pool->Start(); @@ -585,6 +587,7 @@ { transcoderThreadPool_.reset(new ThreadPool); transcoderThreadPool_->SetCountThreads(2); // TODO-Streaming - Parameter + transcoderThreadPool_->SetLoggingThreadName("TRANSCODER"); transcoderThreadPool_->SetDequeueTimeout(100); transcoderThreadPool_->Start(); @@ -1474,8 +1477,7 @@ } - DicomDataSource::Dicom* ServerContext::ReadParsedDicom(const std::string& instancePublicId, - bool keepRawBuffer) + DicomDataSource::Dicom* ServerContext::ReadParsedDicom(const std::string& instancePublicId) { FileInfo attachment; int64_t revision; @@ -1487,7 +1489,7 @@ " of instance " + instancePublicId); } - return DicomDataSource::ReadWhole(*dicomReader_, attachment, keepRawBuffer, checkMD5_); + return DicomDataSource::ReadWhole(*dicomReader_, attachment, false, checkMD5_); }
--- a/OrthancServer/Sources/ServerContext.h Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.h Thu May 21 07:57:26 2026 +0200 @@ -384,8 +384,7 @@ void ReadDicom(std::string& dicom, const std::string& instancePublicId); - DicomDataSource::Dicom* ReadParsedDicom(const std::string& instancePublicId, - bool keepRawBuffer); + DicomDataSource::Dicom* ReadParsedDicom(const std::string& instancePublicId); void ReadDicomForHeader(std::string& dicom, const std::string& instancePublicId);
--- a/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Thu May 21 07:57:26 2026 +0200 @@ -97,7 +97,7 @@ try { - std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance)); modified.reset(dicom->Clone()); } catch (OrthancException&) @@ -201,7 +201,7 @@ DicomMap dicom; { - std::unique_ptr<DicomDataSource::Dicom> loadedDicom(GetContext().ReadParsedDicom(instances.front(), false)); + std::unique_ptr<DicomDataSource::Dicom> loadedDicom(GetContext().ReadParsedDicom(instances.front())); DicomDataSource::Dicom::Lock lock(*loadedDicom); OrthancConfiguration::DefaultExtractDicomSummary(dicom, lock.GetContent());
--- a/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Thu May 21 07:57:26 2026 +0200 @@ -87,7 +87,7 @@ std::unique_ptr<ParsedDicomFile> modified; { - std::unique_ptr<DicomDataSource::Dicom> dicom(context_.ReadParsedDicom(instance.GetId(), false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context_.ReadParsedDicom(instance.GetId())); modified.reset(dicom->Clone()); }
--- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Thu May 21 07:57:26 2026 +0200 @@ -187,7 +187,7 @@ { for (std::set<std::string>::const_iterator it = instancesToReconstruct_.begin(); it != instancesToReconstruct_.end(); ++it) { - std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(*it, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(*it)); DicomDataSource::Dicom::Lock lock(*dicom); const ParsedDicomFile& modifiedDicom = lock.GetContent(); @@ -223,7 +223,7 @@ try { - std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance)); DicomDataSource::Dicom::Lock lock(*dicom); const ParsedDicomFile& original = lock.GetContent();
--- a/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Thu May 21 07:57:26 2026 +0200 @@ -72,7 +72,7 @@ try { - std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance)); modified.reset(dicom->Clone()); } catch (OrthancException&)
--- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Thu May 21 07:57:26 2026 +0200 @@ -291,7 +291,7 @@ // from the file storage, and that the actual SOP // class/instance UIDs do match - std::unique_ptr<DicomDataSource::Dicom> dicom(context_.ReadParsedDicom(orthancId[0], false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context_.ReadParsedDicom(orthancId[0])); DicomDataSource::Dicom::Lock lock(*dicom); if (lock.GetContent().GetTagValue(a, DICOM_TAG_SOP_CLASS_UID) &&
--- a/OrthancServer/Sources/ServerToolbox.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/Sources/ServerToolbox.cpp Thu May 21 07:57:26 2026 +0200 @@ -294,7 +294,7 @@ if (limitToThisLevelDicomTags && instances.size() > 0) // in this case, we only need to rebuild one instance ! { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instances.front(), false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(instances.front())); DicomDataSource::Dicom::Lock lock(*dicom); context.GetIndex().ReconstructInstance(lock.GetContent(), true, limitToLevel); @@ -304,7 +304,7 @@ for (std::list<std::string>::const_iterator it = instances.begin(); it != instances.end(); ++it) { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(*it, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(*it)); DicomDataSource::Dicom::Lock lock(*dicom); // Delay the reconstruction of DICOM-as-JSON to its next access through "ServerContext"
--- a/OrthancServer/UnitTestsSources/ServerIndexTests.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/UnitTestsSources/ServerIndexTests.cpp Thu May 21 07:57:26 2026 +0200 @@ -1002,7 +1002,7 @@ ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); DicomDataSource::Dicom::Lock lock(*dicom); std::string tmp; @@ -1059,7 +1059,7 @@ ASSERT_EQ("overwritten", tmp["0010,0010"]["Value"].asString()); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); DicomDataSource::Dicom::Lock lock(*dicom); std::string tmp; @@ -1078,7 +1078,7 @@ ASSERT_EQ("name", tmp["0010,0010"]["Value"].asString()); { - std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id)); DicomDataSource::Dicom::Lock lock(*dicom); std::string tmp;
--- a/OrthancServer/UnitTestsSources/ServerJobsTests.cpp Wed May 20 18:30:27 2026 +0200 +++ b/OrthancServer/UnitTestsSources/ServerJobsTests.cpp Thu May 21 07:57:26 2026 +0200 @@ -1021,7 +1021,7 @@ std::string study, series; { - std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance, false)); + std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(instance)); DicomDataSource::Dicom::Lock lock(*dicom); study = lock.GetContent().GetHasher().HashStudy();
