# HG changeset patch # User Sebastien Jodogne # Date 1398863830 -7200 # Node ID 4e3593c3511d598d876ca3968dadaa20326aefce # Parent 3bd0589af992e7cf8a781bb5c31d2a1b4a4d1130 NEWS diff -r 3bd0589af992 -r 4e3593c3511d NEWS --- a/NEWS Wed Apr 30 15:08:51 2014 +0200 +++ b/NEWS Wed Apr 30 15:17:10 2014 +0200 @@ -1,6 +1,7 @@ Pending changes in the mainline =============================== +* Reuse of the previous SCU connection to avoid unecessary handshakes * Dynamic negotiation of SOP classes for C-Store SCU * Fix missing licensing terms about reuse of some DCMTK code diff -r 3bd0589af992 -r 4e3593c3511d OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp --- a/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -86,7 +86,7 @@ boost::this_thread::sleep(boost::posix_time::milliseconds(100)); if (!that->continue_) { - LOG(INFO) << "Finishing the thread watching the global SCU connection"; + //LOG(INFO) << "Finishing the thread watching the global SCU connection"; return; } diff -r 3bd0589af992 -r 4e3593c3511d OrthancServer/ServerContext.cpp --- a/OrthancServer/ServerContext.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/ServerContext.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -67,6 +67,8 @@ dicomCache_(provider_, DICOM_CACHE_SIZE) { scu_.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); + //scu_.SetMillisecondsBeforeClose(1); // The connection is always released + lua_.Execute(Orthanc::EmbeddedResources::LUA_TOOLBOX); } diff -r 3bd0589af992 -r 4e3593c3511d OrthancServer/main.cpp --- a/OrthancServer/main.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/main.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -41,7 +41,7 @@ #include "../Core/Lua/LuaFunctionCall.h" #include "../Core/DicomFormat/DicomArray.h" #include "DicomProtocol/DicomServer.h" -#include "DicomProtocol/DicomUserConnection.h" +#include "DicomProtocol/ReusableDicomUserConnection.h" #include "OrthancInitialization.h" #include "ServerContext.h" #include "OrthancFindRequestHandler.h"