Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Loaders/LoaderStateMachine.cpp @ 1314:9b126de2cde2 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Since the observer system now uses shared_ptr and many registrations are done in the constructors, and since we cannot called shared_from_this() in the constructors, it is mandatory to split construction from registration. This has been done by making many ctors protected and replacing them by factory methods that directly return shared_ptrs + added PostConstructor method when base classes perform shared_from_this() calls too.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 16 Mar 2020 11:19:50 +0100
parents 9bea7e15b519
children
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/LoaderStateMachine.cpp	Mon Mar 16 11:12:39 2020 +0100
+++ b/Framework/Deprecated/Loaders/LoaderStateMachine.cpp	Mon Mar 16 11:19:50 2020 +0100
@@ -174,12 +174,16 @@
     LOG(TRACE) 
       << "LoaderStateMachine(" << std::hex << this 
       << std::dec << ")::LoaderStateMachine()";
+  }
 
-    std::unique_ptr<ILoadersContext::ILock> lock(loadersContext_.Lock());
+  void LoaderStateMachine::PostConstructor()
+  {
+    std::unique_ptr<OrthancStone::ILoadersContext::ILock>
+      lock(loadersContext_.Lock());
 
     OrthancStone::IObservable& observable = lock->GetOracleObservable();
 
-    // TODO => Move this out of constructor WHY?
+    // TODO => Move this out of constructor
     Register<OrthancStone::OrthancRestApiCommand::SuccessMessage>(
       observable, &LoaderStateMachine::HandleSuccessMessage);
     Register<OrthancStone::GetOrthancImageCommand::SuccessMessage>(