orthanc-stone: Samples/Sdl/Loader.cpp comparison

comparison Samples/Sdl/Loader.cpp @ 622:8a3a25f2d42c

uncoupling oracle from context

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 07 May 2019 12:32:21 +0200
parents	9cd19b28f011
children	42dadae61fa9

comparison

equal deleted inserted replaced

-:8adc8cfb50c7
+:8a3a25f2d42c
 virtual Type GetType() const = 0;
 };
+class IMessageEmitter : public boost::noncopyable
+{
+public:
+virtual ~IMessageEmitter()
+{
+}
+virtual void EmitMessage(const OrthancStone::IMessage& message) = 0;
+};
 class IOracle : public boost::noncopyable
 {
 public:
 virtual ~IOracle()
 {
 }
 };
-class NativeApplicationContext : public boost::noncopyable
-{
-private:
-boost::shared_mutex            mutex_;
-Orthanc::WebServiceParameters  orthanc_;
-OrthancStone::MessageBroker    broker_;
-OrthancStone::IObservable      oracleObservable_;
-public:
-NativeApplicationContext() :
-oracleObservable_(broker_)
-{
-orthanc_.SetUrl("http://localhost:8042/");
-}
-class ReaderLock : public boost::noncopyable
-{
-private:
-NativeApplicationContext&                that_;
-boost::shared_lock<boost::shared_mutex>  lock_;
-public:
-ReaderLock(NativeApplicationContext& that) :
-that_(that),
-lock_(that.mutex_)
-{
-}
-const Orthanc::WebServiceParameters& GetOrthancParameters() const
-{
-return that_.orthanc_;
-}
-};
-class WriterLock : public boost::noncopyable
-{
-private:
-NativeApplicationContext&                that_;
-boost::unique_lock<boost::shared_mutex>  lock_;
-public:
-WriterLock(NativeApplicationContext& that) :
-that_(that),
-lock_(that.mutex_)
-{
-}
-OrthancStone::MessageBroker& GetBroker()
-{
-return that_.broker_;
-}
-void SetOrthancParameters(Orthanc::WebServiceParameters& orthanc)
-{
-that_.orthanc_ = orthanc;
-}
-OrthancStone::IObservable&  GetOracleObservable()
-{
-return that_.oracleObservable_;
-}
-};
-};
 class NativeOracle : public IOracle
 {
 private:
 class Item : public Orthanc::IDynamicObject
 {
 State_Running,
 State_Stopped
 };
-NativeApplicationContext&     context_;
+IMessageEmitter&               emitter_;
-Orthanc::SharedMessageQueue   queue_;
+Orthanc::WebServiceParameters  orthanc_;
-State                         state_;
+Orthanc::SharedMessageQueue    queue_;
-boost::mutex                  mutex_;
+State                          state_;
-std::vector<boost::thread*>   workers_;
+boost::mutex                   mutex_;
+std::vector<boost::thread*>    workers_;
 void Execute(const OrthancApiOracleCommand& command)
 {
-std::auto_ptr<Orthanc::HttpClient> client;
+Orthanc::HttpClient  client(orthanc_, command.GetUri());
+client.SetMethod(command.GetMethod());
-{
+client.SetBody(command.GetBody());
-NativeApplicationContext::ReaderLock lock(context_);
+client.SetTimeout(command.GetTimeout());
-client.reset(new Orthanc::HttpClient(lock.GetOrthancParameters(), command.GetUri()));
-}
-client->SetMethod(command.GetMethod());
-client->SetBody(command.GetBody());
-client->SetTimeout(command.GetTimeout());
 {
 const HttpHeaders& headers = command.GetHttpHeaders();
 for (HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); it++ )
 {
-client->AddHeader(it->first, it->second);
+client.AddHeader(it->first, it->second);
 }
 }
 std::string answer;
 HttpHeaders answerHeaders;
 bool success;
 try
 {
-success = client->Apply(answer, answerHeaders);
+success = client.Apply(answer, answerHeaders);
 }
 catch (Orthanc::OrthancException& e)
 {
 success = false;
 }
-{
+if (success)
-NativeApplicationContext::WriterLock lock(context_);
+{
+OrthancApiOracleCommand::SuccessMessage message(command, answerHeaders, answer);
-if (success)
+emitter_.EmitMessage(message);
-{
+}
-OrthancApiOracleCommand::SuccessMessage message(command, answerHeaders, answer);
+else
-lock.GetOracleObservable().EmitMessage(message);
+{
-}
+OrthancApiOracleCommand::FailureMessage message(command, client.GetLastStatus());
-else
+emitter_.EmitMessage(message);
-{
-OrthancApiOracleCommand::FailureMessage message(command, client->GetLastStatus());
-lock.GetOracleObservable().EmitMessage(message);
-}
 }
 }
 }
 }
 public:
-NativeOracle(NativeApplicationContext& context) :
+NativeOracle(IMessageEmitter& emitter) :
-context_(context),
+emitter_(emitter),
 state_(State_Setup),
 workers_(4)
 {
 }
 virtual ~NativeOracle()
 {
 StopInternal();
 }
+void SetOrthancParameters(const Orthanc::WebServiceParameters& orthanc)
+{
+boost::mutex::scoped_lock lock(mutex_);
+if (state_ != State_Setup)
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+}
+else
+{
+orthanc_ = orthanc;
+}
+}
 void SetWorkersCount(unsigned int count)
 {
 boost::mutex::scoped_lock lock(mutex_);
 if (count <= 0)
 virtual void Schedule(IOracleCommand* command)
 {
 queue_.Enqueue(new Item(command));
 }
+};
+class NativeApplicationContext : public IMessageEmitter
+{
+private:
+boost::shared_mutex            mutex_;
+OrthancStone::MessageBroker    broker_;
+OrthancStone::IObservable      oracleObservable_;
+public:
+NativeApplicationContext() :
+oracleObservable_(broker_)
+{
+}
+virtual void EmitMessage(const OrthancStone::IMessage& message)
+{
+boost::unique_lock<boost::shared_mutex>  lock(mutex_);
+oracleObservable_.EmitMessage(message);
+}
+class ReaderLock : public boost::noncopyable
+{
+private:
+NativeApplicationContext&                that_;
+boost::shared_lock<boost::shared_mutex>  lock_;
+public:
+ReaderLock(NativeApplicationContext& that) :
+that_(that),
+lock_(that.mutex_)
+{
+}
+};
+class WriterLock : public boost::noncopyable
+{
+private:
+NativeApplicationContext&                that_;
+boost::unique_lock<boost::shared_mutex>  lock_;
+public:
+WriterLock(NativeApplicationContext& that) :
+that_(that),
+lock_(that.mutex_)
+{
+}
+OrthancStone::MessageBroker& GetBroker()
+{
+return that_.broker_;
+}
+OrthancStone::IObservable& GetOracleObservable()
+{
+return that_.oracleObservable_;
+}
+};
 };
 }
 Refactoring::NativeApplicationContext::WriterLock lock(context);
 toto.reset(new Toto(lock.GetOracleObservable()));
 }
 Refactoring::NativeOracle oracle(context);
+{
+Orthanc::WebServiceParameters p;
+//p.SetUrl("http://localhost:8043/");
+p.SetCredentials("orthanc", "orthanc");
+oracle.SetOrthancParameters(p);
+}
 oracle.Start();
 {
 Json::Value v = Json::objectValue;
 v["Level"] = "Series";

Mercurial > hg > orthanc-stone

comparison Samples/Sdl/Loader.cpp @ 622:8a3a25f2d42c