orthanc: Core/JobsEngine/JobsRegistry.cpp comparison

DicomMoveScuJob

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 08 Oct 2018 16:08:51 +0200
parents	859a4950d48f
children	577786f59252

comparison

equal deleted inserted replaced

-:437e6ba20a5e
+:251614c2edac
 std::string id;
 SubmitInternal(id, new JobHandler(job, priority), false);
 }
-bool JobsRegistry::SubmitAndWait(IJob* job,        // Takes ownership
+bool JobsRegistry::SubmitAndWait(Json::Value& successContent,
+IJob* job,        // Takes ownership
 int priority)
 {
 std::string id;
 Submit(id, job, priority);
-JobState state = JobState_Pending;
+JobState state = JobState_Pending;  // Dummy initialization
 {
 boost::mutex::scoped_lock lock(mutex_);
-while (GetStateInternal(state, id) &&
+for (;;)
-state != JobState_Success &&
+{
-state != JobState_Failure)
+if (!GetStateInternal(state, id))
 {
-someJobComplete_.wait(lock);
+// Job has finished and has been lost (should not happen)
+state = JobState_Failure;
+break;
+}
+else if (state == JobState_Failure)
+{
+// Failure
+break;
+}
+else if (state == JobState_Success)
+{
+// Success, try and retrieve the status of the job
+JobsIndex::const_iterator it = jobsIndex_.find(id);
+if (it == jobsIndex_.end())
+{
+// Should not happen
+state = JobState_Failure;
+}
+else
+{
+const JobStatus& status = it->second->GetLastStatus();
+successContent = status.GetPublicContent();
+}
+break;
+}
+else
+{
+// This job has not finished yet, wait for new completion
+someJobComplete_.wait(lock);
+}
 }
 }
 return (state == JobState_Success);
 }

Mercurial > hg > orthanc