# HG changeset patch # User Sebastien Jodogne # Date 1776112074 -7200 # Node ID b560cf57b0168595f123f56b95e4f4c7569d5eff # Parent 11acf3bfafb3e00afdab36df4c5656b6401d64c4 build optimization diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Compression/HierarchicalZipWriter.h --- a/OrthancFramework/Sources/Compression/HierarchicalZipWriter.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Compression/HierarchicalZipWriter.h Mon Apr 13 22:27:54 2026 +0200 @@ -28,7 +28,6 @@ #include #include -#include #include #if ORTHANC_BUILD_UNIT_TESTS == 1 diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp --- a/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -31,7 +31,7 @@ #include "DicomIntegerPixelAccessor.h" #include "../OrthancException.h" -#include + #include #include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/DicomFormat/DicomValue.cpp --- a/OrthancFramework/Sources/DicomFormat/DicomValue.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/DicomFormat/DicomValue.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -29,8 +29,6 @@ #include "../SerializationToolbox.h" #include "../Toolbox.h" -#include - namespace Orthanc { DicomValue::DicomValue() : diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/DicomNetworking/DicomServer.cpp --- a/OrthancFramework/Sources/DicomNetworking/DicomServer.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/DicomNetworking/DicomServer.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -33,6 +33,7 @@ #include "DicomAssociationParameters.h" #include "Internals/CommandDispatcher.h" +#include #include #if ORTHANC_ENABLE_SSL == 1 diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp --- a/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -93,8 +93,6 @@ #include /* for variable dcmAllStorageSOPClassUIDs */ #include /* for class DcmAssociationConfiguration */ -#include - static OFBool opt_rejectWithoutImplementationUID = OFFalse; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp --- a/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -83,8 +83,6 @@ #include "../../Logging.h" #include "../../OrthancException.h" -#include - namespace Orthanc { diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/FileStorage/MemoryStorageArea.cpp --- a/OrthancFramework/Sources/FileStorage/MemoryStorageArea.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/FileStorage/MemoryStorageArea.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -30,6 +30,9 @@ #include "../StringMemoryBuffer.h" #include "../Toolbox.h" +#include + + namespace Orthanc { MemoryStorageArea::~MemoryStorageArea() diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/FileStorage/StorageAccessor.cpp --- a/OrthancFramework/Sources/FileStorage/StorageAccessor.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/FileStorage/StorageAccessor.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -39,6 +39,7 @@ #endif #include +#include static const std::string METRICS_CREATE_DURATION = "orthanc_storage_create_duration_ms"; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/HttpServer/HttpFileSender.cpp --- a/OrthancFramework/Sources/HttpServer/HttpFileSender.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/HttpServer/HttpFileSender.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -29,8 +29,6 @@ #include "../Toolbox.h" #include "../SystemToolbox.h" -#include - namespace Orthanc { void HttpFileSender::SetContentType(MimeType contentType) diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/HttpServer/HttpServer.h --- a/OrthancFramework/Sources/HttpServer/HttpServer.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/HttpServer/HttpServer.h Mon Apr 13 22:27:54 2026 +0200 @@ -44,10 +44,6 @@ # error The macro ORTHANC_ENABLE_PUGIXML must be defined #endif -#if ORTHANC_ENABLE_PUGIXML == 1 -# include "IWebDavBucket.h" -#endif - #include "IIncomingHttpRequestFilter.h" #include "../MetricsRegistry.h" @@ -62,6 +58,8 @@ namespace Orthanc { + class HttpOutput; + class IWebDavBucket; class OrthancException; class IHttpExceptionFormatter : public boost::noncopyable diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Images/Font.cpp --- a/OrthancFramework/Sources/Images/Font.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Images/Font.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -142,7 +142,7 @@ #if ORTHANC_SANDBOXED == 0 - void Font::LoadFromFile(const boost::filesystem::path& path) + void Font::LoadFromFile(const std::string& path) { std::string font; SystemToolbox::ReadFile(font, path); diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Images/Font.h --- a/OrthancFramework/Sources/Images/Font.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Images/Font.h Mon Apr 13 22:27:54 2026 +0200 @@ -33,10 +33,6 @@ #include #include -#if ORTHANC_SANDBOXED == 0 -# include -#endif - namespace Orthanc { @@ -79,7 +75,7 @@ void LoadFromMemory(const std::string& font); #if ORTHANC_SANDBOXED == 0 - void LoadFromFile(const boost::filesystem::path& path); + void LoadFromFile(const std::string& path); #endif const std::string& GetName() const; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Images/FontRegistry.cpp --- a/OrthancFramework/Sources/Images/FontRegistry.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Images/FontRegistry.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -49,7 +49,7 @@ #if ORTHANC_SANDBOXED == 0 - void FontRegistry::AddFromFile(const boost::filesystem::path& path) + void FontRegistry::AddFromFile(const std::string& path) { std::unique_ptr f(new Font); f->LoadFromFile(path); diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Images/FontRegistry.h --- a/OrthancFramework/Sources/Images/FontRegistry.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Images/FontRegistry.h Mon Apr 13 22:27:54 2026 +0200 @@ -41,7 +41,7 @@ void AddFromMemory(const std::string& font); #if ORTHANC_SANDBOXED == 0 - void AddFromFile(const boost::filesystem::path& path); + void AddFromFile(const std::string& path); #endif size_t GetSize() const; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/Lua/LuaFunctionCall.cpp --- a/OrthancFramework/Sources/Lua/LuaFunctionCall.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/Lua/LuaFunctionCall.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -34,7 +34,6 @@ #include #include -#include namespace Orthanc { diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/MetricsRegistry.cpp --- a/OrthancFramework/Sources/MetricsRegistry.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/MetricsRegistry.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -31,6 +31,8 @@ #include "Logging.h" #include "OrthancException.h" +#include + namespace Orthanc { @@ -650,12 +652,18 @@ } - void MetricsRegistry::Timer::Start() + struct MetricsRegistry::Timer::PImpl + { + boost::posix_time::ptime start_; + }; + + + void MetricsRegistry::Timer::Start() { if (registry_.IsEnabled()) { active_ = true; - start_ = GetNow(); + pimpl_->start_ = GetNow(); } else { @@ -666,6 +674,7 @@ MetricsRegistry::Timer::Timer(MetricsRegistry ®istry, const std::string &name) : + pimpl_(new PImpl), registry_(registry), name_(name), policy_(MetricsUpdatePolicy_MaxOver10Seconds) @@ -677,6 +686,7 @@ MetricsRegistry::Timer::Timer(MetricsRegistry ®istry, const std::string &name, MetricsUpdatePolicy policy) : + pimpl_(new PImpl), registry_(registry), name_(name), policy_(policy) @@ -689,7 +699,7 @@ { if (active_) { - boost::posix_time::time_duration diff = GetNow() - start_; + boost::posix_time::time_duration diff = GetNow() - pimpl_->start_; try { @@ -701,5 +711,8 @@ LOG(ERROR) << "Exception in destructor: " << e.What(); } } + + assert(pimpl_ != NULL); + delete pimpl_; } } diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/MetricsRegistry.h --- a/OrthancFramework/Sources/MetricsRegistry.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/MetricsRegistry.h Mon Apr 13 22:27:54 2026 +0200 @@ -34,8 +34,8 @@ # error The class MetricsRegistry cannot be used in sandboxed environments #endif +#include #include -#include #include namespace Orthanc @@ -165,11 +165,13 @@ class ORTHANC_PUBLIC Timer : public boost::noncopyable { private: + struct PImpl; // To hold "boost::posix_time::ptime start_" + PImpl* pimpl_; + MetricsRegistry& registry_; std::string name_; MetricsUpdatePolicy policy_; bool active_; - boost::posix_time::ptime start_; void Start(); diff -r 11acf3bfafb3 -r b560cf57b016 OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp --- a/OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -30,6 +30,8 @@ #include "../OrthancException.h" #include "../Logging.h" +#include + namespace Orthanc { diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/CMakeLists.txt --- a/OrthancServer/CMakeLists.txt Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/CMakeLists.txt Mon Apr 13 22:27:54 2026 +0200 @@ -134,20 +134,21 @@ ${CMAKE_SOURCE_DIR}/Sources/ResourceFinder.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/DatabaseDicomTagConstraint.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/DatabaseDicomTagConstraints.cpp + ${CMAKE_SOURCE_DIR}/Sources/Search/DatabaseLookup.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/DatabaseMetadataConstraint.cpp - ${CMAKE_SOURCE_DIR}/Sources/Search/DatabaseLookup.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/DicomTagConstraint.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/HierarchicalMatcher.cpp ${CMAKE_SOURCE_DIR}/Sources/Search/ISqlLookupFormatter.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerContext.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerEnumerations.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerIndex.cpp + ${CMAKE_SOURCE_DIR}/Sources/ServerIndexChange.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/ArchiveJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/CleaningInstancesJob.cpp + ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomGetScuJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomModalityStoreJob.cpp + ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomMoveScuJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomRetrieveScuBaseJob.cpp - ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomGetScuJob.cpp - ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/DicomMoveScuJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/LuaJobManager.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/MergeStudyJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp @@ -160,8 +161,8 @@ ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/OrthancPeerStoreJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/ResourceModificationJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/SplitStudyJob.cpp + ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/StorageCommitmentScpJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/StoreJob.cpp - ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/StorageCommitmentScpJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/ThreadedInstancesLoader.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerJobs/ThreadedSetOfInstancesJob.cpp ${CMAKE_SOURCE_DIR}/Sources/ServerToolbox.cpp diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp --- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -40,6 +40,8 @@ #include "PluginsEnumerations.h" #include +#include + namespace Orthanc { diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Plugins/Engine/OrthancPlugins.cpp --- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -43,6 +43,7 @@ #include "../../../OrthancFramework/Sources/FileStorage/PluginStorageAreaAdapter.h" #include "../../../OrthancFramework/Sources/HttpServer/HttpServer.h" #include "../../../OrthancFramework/Sources/HttpServer/HttpToolbox.h" +#include "../../../OrthancFramework/Sources/HttpServer/IWebDavBucket.h" #include "../../../OrthancFramework/Sources/Images/Image.h" #include "../../../OrthancFramework/Sources/Images/ImageProcessing.h" #include "../../../OrthancFramework/Sources/Images/JpegReader.h" diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h --- a/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h Mon Apr 13 22:27:54 2026 +0200 @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp --- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -32,6 +32,7 @@ #include "../../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" #include "../../../OrthancFramework/Sources/Logging.h" #include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SystemToolbox.h" #include "../OrthancConfiguration.h" #include "../Search/DatabaseLookup.h" #include "../ServerIndexChange.h" diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/LuaScripting.cpp --- a/OrthancServer/Sources/LuaScripting.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/LuaScripting.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -29,6 +29,7 @@ #include "OrthancRestApi/OrthancRestApi.h" #include "OutgoingDicomInstance.h" #include "ServerContext.h" +#include "ServerJobs/LuaJobManager.h" #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" #include "../../OrthancFramework/Sources/HttpServer/StringHttpOutput.h" @@ -42,6 +43,12 @@ namespace Orthanc { + struct LuaScripting::PImpl + { + LuaJobManager jobManager_; + }; + + class LuaScripting::IEvent : public IDynamicObject { public: @@ -644,14 +651,15 @@ } - size_t LuaScripting::ParseOperation(LuaJobManager::Lock& lock, - const std::string& operation, - const Json::Value& parameters) + static size_t ParseOperation(ServerContext& context, + LuaJobManager::Lock& lock, + const std::string& operation, + const Json::Value& parameters) { if (operation == "delete") { LOG(INFO) << "Lua script to delete resource " << parameters["Resource"].asString(); - return lock.AddDeleteResourceOperation(context_); + return lock.AddDeleteResourceOperation(context); } if (operation == "store-scu") @@ -663,7 +671,7 @@ } else { - localAet = context_.GetDefaultLocalApplicationEntityTitle(); + localAet = context.GetDefaultLocalApplicationEntityTitle(); } std::string name = parameters["Modality"].asString(); @@ -675,7 +683,7 @@ } // This is not a C-MOVE: No need to call "StoreScuCommand::SetMoveOriginator()" - return lock.AddStoreScuOperation(context_, localAet, modality); + return lock.AddStoreScuOperation(context, localAet, modality); } if (operation == "store-peer") @@ -700,7 +708,7 @@ std::unique_ptr modification(new DicomModification); modification->ParseModifyRequest(parameters); - return lock.AddModifyInstanceOperation(context_, modification.release()); + return lock.AddModifyInstanceOperation(context, modification.release()); } if (operation == "call-system") @@ -768,7 +776,7 @@ throw OrthancException(ErrorCode_InternalError); } - LuaJobManager::Lock lock(jobManager_, context_.GetJobsEngine()); + LuaJobManager::Lock lock(pimpl_->jobManager_, context_.GetJobsEngine()); bool isFirst = true; size_t previous = 0; // Dummy initialization to avoid warning @@ -788,7 +796,7 @@ } std::string operation = parameters["Operation"].asString(); - size_t index = ParseOperation(lock, operation, operations[i]); + size_t index = ParseOperation(context_, lock, operation, operations[i]); std::string resource = parameters["Resource"].asString(); if (!resource.empty()) @@ -806,7 +814,8 @@ } - LuaScripting::LuaScripting(ServerContext& context) : + LuaScripting::LuaScripting(ServerContext& context) : + pimpl_(new PImpl), context_(context), state_(State_Setup), heartBeatPeriod_(0) @@ -840,6 +849,9 @@ LOG(ERROR) << "Exception in destructor: " << e.What(); } } + + assert(pimpl_ != NULL); + delete pimpl_; } void LuaScripting::HeartBeatThread(LuaScripting* that) @@ -910,7 +922,7 @@ } } - that->jobManager_.GetDicomConnectionManager().CloseIfInactive(); + that->pimpl_->jobManager_.GetDicomConnectionManager().CloseIfInactive(); } } @@ -954,7 +966,7 @@ state_ = State_Done; } - jobManager_.AwakeTrailingSleep(); + pimpl_->jobManager_.AwakeTrailingSleep(); if (eventThread_.joinable()) { @@ -1148,4 +1160,10 @@ // Lua has its own event thread and queue to dissociate it completely from the main JobEventsThread pendingEvents_.Enqueue(new LuaJobEvent(event)); } + + + TimeoutDicomConnectionManager& LuaScripting::GetDicomConnectionManager() + { + return pimpl_->jobManager_.GetDicomConnectionManager(); + } } diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/LuaScripting.h --- a/OrthancServer/Sources/LuaScripting.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/LuaScripting.h Mon Apr 13 22:27:54 2026 +0200 @@ -25,16 +25,16 @@ #include "ServerIndexChange.h" #include "JobEvent.h" -#include "ServerJobs/LuaJobManager.h" #include "../../OrthancFramework/Sources/MultiThreading/SharedMessageQueue.h" #include "../../OrthancFramework/Sources/Lua/LuaContext.h" namespace Orthanc { - class ServerContext; + class DicomInstanceToStore; class OutgoingDicomInstance; - class DicomInstanceToStore; + class ServerContext; + class TimeoutDicomConnectionManager; class LuaScripting : public boost::noncopyable { @@ -65,18 +65,16 @@ static int GetOrthancConfiguration(lua_State *state); static int SetStableStatus(lua_State* state); - size_t ParseOperation(LuaJobManager::Lock& lock, - const std::string& operation, - const Json::Value& parameters); - void InitializeJob(); void SubmitJob(); + struct PImpl; + PImpl *pimpl_; // To store the heavyweight "LuaJobManager" + boost::recursive_mutex mutex_; LuaContext lua_; ServerContext& context_; - LuaJobManager jobManager_; State state_; boost::thread eventThread_; boost::thread heartBeatThread_; @@ -137,9 +135,6 @@ void SignalJobEvent(const JobEvent& event); - TimeoutDicomConnectionManager& GetDicomConnectionManager() - { - return jobManager_.GetDicomConnectionManager(); - } + TimeoutDicomConnectionManager& GetDicomConnectionManager(); }; } diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/OrthancConfiguration.cpp --- a/OrthancServer/Sources/OrthancConfiguration.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/OrthancConfiguration.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -35,6 +35,7 @@ #include "ServerIndex.h" +#include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/OrthancInitialization.h --- a/OrthancServer/Sources/OrthancInitialization.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/OrthancInitialization.h Mon Apr 13 22:27:54 2026 +0200 @@ -25,6 +25,7 @@ #include "../../OrthancFramework/Sources/FileStorage/IStorageArea.h" #include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" #include "Database/IDatabaseWrapper.h" namespace Orthanc diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -26,13 +26,14 @@ #include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" #include "../../../OrthancFramework/Sources/Compression/ZipReader.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" #include "../../../OrthancFramework/Sources/Logging.h" #include "../../../OrthancFramework/Sources/MetricsRegistry.h" #include "../../../OrthancFramework/Sources/SerializationToolbox.h" -#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" #include "../DicomInstanceToStore.h" #include "../OrthancConfiguration.h" #include "../ServerContext.h" +#include "../ServerJobs/ThreadedSetOfInstancesJob.h" #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h Mon Apr 13 22:27:54 2026 +0200 @@ -23,17 +23,16 @@ #pragma once -#include "../../../OrthancFramework/Sources/DicomParsing/DicomModification.h" #include "../../../OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h" #include "../../../OrthancFramework/Sources/MetricsRegistry.h" #include "../../../OrthancFramework/Sources/RestApi/RestApi.h" -#include "../ServerJobs/ThreadedSetOfInstancesJob.h" #include "../ServerEnumerations.h" #include namespace Orthanc { + class ThreadedSetOfInstancesJob; class ServerContext; class ServerIndex; class DicomInstanceToStore; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/Search/DatabaseDicomTagConstraint.cpp --- a/OrthancServer/Sources/Search/DatabaseDicomTagConstraint.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/Search/DatabaseDicomTagConstraint.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -30,7 +30,6 @@ # include "../../Plugins/Engine/PluginsEnumerations.h" #endif -#include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/Search/DatabaseMetadataConstraint.cpp --- a/OrthancServer/Sources/Search/DatabaseMetadataConstraint.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/Search/DatabaseMetadataConstraint.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -26,7 +26,6 @@ #include "../../../OrthancFramework/Sources/OrthancException.h" -#include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -27,6 +27,7 @@ #include "../../OrthancFramework/Sources/Cache/SharedArchive.h" #include "../../OrthancFramework/Sources/DicomFormat/DicomElement.h" #include "../../OrthancFramework/Sources/DicomFormat/DicomStreamReader.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h" #include "../../OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.h" #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h" #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.h Mon Apr 13 22:27:54 2026 +0200 @@ -29,30 +29,21 @@ #include "ServerIndex.h" #include "ServerJobs/IStorageCommitmentFactory.h" -#include "../../OrthancFramework/Sources/DicomFormat/DicomElement.h" #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h" #include "../../OrthancFramework/Sources/DicomParsing/IDicomTranscoder.h" #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomCache.h" +#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" #include "../../OrthancFramework/Sources/FileStorage/StorageCache.h" +#include "../../OrthancFramework/Sources/JobsEngine/JobsEngine.h" #include "../../OrthancFramework/Sources/MultiThreading/Semaphore.h" -#include - -#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" namespace Orthanc { - class DicomInstanceToStore; - class OutgoingDicomInstance; - class IPluginStorageArea; - class JobsEngine; - class MetricsRegistry; + class DicomElement; + class DicomStoreUserConnection; class OrthancPlugins; - class ParsedDicomFile; - class RestApiOutput; - class SetOfInstancesJob; class SharedArchive; - class SharedMessageQueue; class StorageCommitmentReports; diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/ServerEnumerations.h --- a/OrthancServer/Sources/ServerEnumerations.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/ServerEnumerations.h Mon Apr 13 22:27:54 2026 +0200 @@ -22,12 +22,12 @@ #pragma once +#include "../../OrthancFramework/Sources/Enumerations.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomTag.h" + #include #include -#include "../../OrthancFramework/Sources/Enumerations.h" -#include "../../OrthancFramework/Sources/DicomFormat/DicomTag.h" - namespace Orthanc { enum Verbosity diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/ServerIndexChange.h --- a/OrthancServer/Sources/ServerIndexChange.h Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/ServerIndexChange.h Mon Apr 13 22:27:54 2026 +0200 @@ -25,7 +25,6 @@ #include "ServerEnumerations.h" #include "../../OrthancFramework/Sources/IDynamicObject.h" -#include "../../OrthancFramework/Sources/SystemToolbox.h" #include #include @@ -44,36 +43,15 @@ public: ServerIndexChange(ChangeType changeType, ResourceType resourceType, - const std::string& publicId) : - seq_(-1), - changeType_(changeType), - resourceType_(resourceType), - publicId_(publicId), - date_(SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */)) - { - } + const std::string& publicId); ServerIndexChange(int64_t seq, ChangeType changeType, ResourceType resourceType, const std::string& publicId, - const std::string& date) : - seq_(seq), - changeType_(changeType), - resourceType_(resourceType), - publicId_(publicId), - date_(date) - { - } + const std::string& date); - ServerIndexChange(const ServerIndexChange& other) - : seq_(other.seq_), - changeType_(other.changeType_), - resourceType_(other.resourceType_), - publicId_(other.publicId_), - date_(other.date_) - { - } + ServerIndexChange(const ServerIndexChange& other); ServerIndexChange* Clone() const { @@ -105,15 +83,6 @@ return date_; } - void Format(Json::Value& item) const - { - item = Json::objectValue; - item["Seq"] = static_cast(seq_); - item["ChangeType"] = EnumerationToString(changeType_); - item["ResourceType"] = EnumerationToString(resourceType_); - item["ID"] = publicId_; - item["Path"] = GetBasePath(resourceType_, publicId_); - item["Date"] = date_; - } + void Format(Json::Value& item) const; }; } diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/Sources/SimpleInstanceOrdering.cpp --- a/OrthancServer/Sources/SimpleInstanceOrdering.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/Sources/SimpleInstanceOrdering.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -32,7 +32,6 @@ #include "ResourceFinder.h" #include -#include #include diff -r 11acf3bfafb3 -r b560cf57b016 OrthancServer/UnitTestsSources/LuaServerTests.cpp --- a/OrthancServer/UnitTestsSources/LuaServerTests.cpp Mon Apr 13 21:04:31 2026 +0200 +++ b/OrthancServer/UnitTestsSources/LuaServerTests.cpp Mon Apr 13 22:27:54 2026 +0200 @@ -30,8 +30,6 @@ #include -#include - #if !defined(UNIT_TESTS_WITH_HTTP_CONNEXIONS) # error "Please set UNIT_TESTS_WITH_HTTP_CONNEXIONS to 0 or 1" #endif