orthanc: OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp annotate

annotate OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp @ 4966:ee6d7937a6cf

pass user-specific compiler flags to the ConnectivityChecks subproject

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 26 Mar 2022 09:23:49 +0100
parents	43e613a7756b
children	0ea402b4d901

rev	line source
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * the License, or (at your option) any later version.
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	12 *
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	16 * Lesser General Public License for more details.
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * <http://www.gnu.org/licenses/>.
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "../PrecompiledHeaders.h"
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "JobsRegistry.h"
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #include "../Logging.h"
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 #include "../OrthancException.h"
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 #include "../Toolbox.h"
2656 a6d3e45eeff5 SerializationToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	30 #include "../SerializationToolbox.h"
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 namespace Orthanc
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	34 static const char* STATE = "State";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	35 static const char* TYPE = "Type";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	36 static const char* PRIORITY = "Priority";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	37 static const char* JOB = "Job";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	38 static const char* JOBS = "Jobs";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	39 static const char* JOBS_REGISTRY = "JobsRegistry";
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	40 static const char* CREATION_TIME = "CreationTime";
2669 eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	41 static const char* LAST_CHANGE_TIME = "LastChangeTime";
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	42 static const char* RUNTIME = "Runtime";
4733 1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	43 static const char* ERROR_CODE = "ErrorCode";
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	44 static const char* ERROR_DETAILS = "ErrorDetails";
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	45
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	46
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 class JobsRegistry::JobHandler : public boost::noncopyable
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	48 {
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 private:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 std::string id_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 JobState state_;
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	52 std::string jobType_;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	53 std::unique_ptr<IJob> job_;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 int priority_; // "+inf()" means highest priority
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 boost::posix_time::ptime creationTime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 boost::posix_time::ptime lastStateChangeTime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 boost::posix_time::time_duration runtime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 boost::posix_time::ptime retryTime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 bool pauseScheduled_;
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	60 bool cancelScheduled_;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 JobStatus lastStatus_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 void Touch()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 if (state_ == JobState_Running)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 runtime_ += (now - lastStateChangeTime_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 lastStateChangeTime_ = now;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	75 void SetStateInternal(JobState state)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 state_ = state;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 pauseScheduled_ = false;
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	79 cancelScheduled_ = false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 Touch();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 public:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 JobHandler(IJob* job,
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 int priority) :
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 id_(Toolbox::GenerateUuid()),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 state_(JobState_Pending),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 job_(job),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 priority_(priority),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 creationTime_(boost::posix_time::microsec_clock::universal_time()),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 lastStateChangeTime_(creationTime_),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 runtime_(boost::posix_time::milliseconds(0)),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 retryTime_(creationTime_),
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	94 pauseScheduled_(false),
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	95 cancelScheduled_(false)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 if (job == NULL)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 throw OrthancException(ErrorCode_NullPointer);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	102 job->GetJobType(jobType_);
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	103 job->Start();
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	104
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	105 lastStatus_ = JobStatus(ErrorCode_Success, "", *job_);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 const std::string& GetId() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 return id_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 IJob& GetJob() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 assert(job_.get() != NULL);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 return *job_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 void SetPriority(int priority)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 priority_ = priority;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 int GetPriority() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 return priority_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 JobState GetState() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 return state_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	134 void SetState(JobState state)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 if (state == JobState_Retry)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 // Use "SetRetryState()"
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 SetStateInternal(state);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 void SetRetryState(unsigned int timeout)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 if (state_ == JobState_Running)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 SetStateInternal(JobState_Retry);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	152 retryTime_ = (boost::posix_time::microsec_clock::universal_time() +
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 boost::posix_time::milliseconds(timeout));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 // Only valid for running jobs
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 void SchedulePause()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 if (state_ == JobState_Running)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 pauseScheduled_ = true;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 // Only valid for running jobs
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	175 void ScheduleCancel()
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	176 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	177 if (state_ == JobState_Running)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	178 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	179 cancelScheduled_ = true;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	180 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	181 else
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	182 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	183 // Only valid for running jobs
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	184 throw OrthancException(ErrorCode_BadSequenceOfCalls);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	185 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	186 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	187
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 bool IsPauseScheduled()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 return pauseScheduled_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	193 bool IsCancelScheduled()
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	194 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	195 return cancelScheduled_;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	196 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	197
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 bool IsRetryReady(const boost::posix_time::ptime& now) const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 if (state_ != JobState_Retry)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 return retryTime_ <= now;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 const boost::posix_time::ptime& GetCreationTime() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 return creationTime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 const boost::posix_time::ptime& GetLastStateChangeTime() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 return lastStateChangeTime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219
2669 eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	220 void SetLastStateChangeTime(const boost::posix_time::ptime& time)
eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	221 {
eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	222 lastStateChangeTime_ = time;
eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	223 }
eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	224
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 const boost::posix_time::time_duration& GetRuntime() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 return runtime_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229
4768 a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	230 void ResetRuntime()
a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	231 {
a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	232 runtime_ = boost::posix_time::milliseconds(0);
a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	233 }
a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	234
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 const JobStatus& GetLastStatus() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 return lastStatus_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 void SetLastStatus(const JobStatus& status)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 lastStatus_ = status;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 Touch();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 }
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	245
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	246 void SetLastErrorCode(ErrorCode code)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	247 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	248 lastStatus_.SetErrorCode(code);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	249 }
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	250
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	251 bool Serialize(Json::Value& target) const
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	252 {
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2652 diff changeset	253 target = Json::objectValue;
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	254
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	255 bool ok;
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	256
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	257 if (state_ == JobState_Running)
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	258 {
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	259 // WARNING: Cannot directly access the "job_" member, as long
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	260 // as a "RunningJob" instance is running. We do not use a
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	261 // mutex at the "JobHandler" level, as serialization would be
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	262 // blocked while a step in the job is running. Instead, we
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	263 // save a snapshot of the serialized job. (*)
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	264
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	265 if (lastStatus_.HasSerialized())
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	266 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	267 target[JOB] = lastStatus_.GetSerialized();
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	268 ok = true;
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	269 }
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	270 else
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	271 {
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	272 ok = false;
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	273 }
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	274 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	275 else
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	276 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	277 ok = job_->Serialize(target[JOB]);
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	278 }
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	279
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	280 if (ok)
228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	281 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	282 target[STATE] = EnumerationToString(state_);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	283 target[PRIORITY] = priority_;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	284 target[CREATION_TIME] = boost::posix_time::to_iso_string(creationTime_);
2669 eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	285 target[LAST_CHANGE_TIME] = boost::posix_time::to_iso_string(lastStateChangeTime_);
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	286 target[RUNTIME] = static_cast<unsigned int>(runtime_.total_milliseconds());
4733 1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	287
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	288 // New in Orthanc 1.9.5
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	289 target[ERROR_CODE] = static_cast<int>(lastStatus_.GetErrorCode());
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	290 target[ERROR_DETAILS] = lastStatus_.GetDetails();
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	291
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	292 return true;
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	293 }
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	294 else
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	295 {
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4203 diff changeset	296 LOG(TRACE) << "Job backup is not supported for job of type: " << jobType_;
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	297 return false;
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	298 }
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	299 }
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	300
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	301 JobHandler(IJobUnserializer& unserializer,
2670 c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	302 const Json::Value& serialized,
c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	303 const std::string& id) :
c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	304 id_(id),
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	305 pauseScheduled_(false),
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	306 cancelScheduled_(false)
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	307 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	308 state_ = StringToJobState(SerializationToolbox::ReadString(serialized, STATE));
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	309 priority_ = SerializationToolbox::ReadInteger(serialized, PRIORITY);
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	310 creationTime_ = boost::posix_time::from_iso_string
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	311 (SerializationToolbox::ReadString(serialized, CREATION_TIME));
2669 eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	312 lastStateChangeTime_ = boost::posix_time::from_iso_string
eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	313 (SerializationToolbox::ReadString(serialized, LAST_CHANGE_TIME));
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	314 runtime_ = boost::posix_time::milliseconds
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	315 (SerializationToolbox::ReadInteger(serialized, RUNTIME));
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	316
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	317 retryTime_ = creationTime_;
e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	318
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	319 job_.reset(unserializer.UnserializeJob(serialized[JOB]));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	320 job_->GetJobType(jobType_);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	321 job_->Start();
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	322
4733 1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	323 ErrorCode errorCode;
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	324 if (serialized.isMember(ERROR_CODE))
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	325 {
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	326 errorCode = static_cast<ErrorCode>(SerializationToolbox::ReadInteger(serialized, ERROR_CODE));
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	327 }
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	328 else
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	329 {
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	330 errorCode = ErrorCode_Success; // Backward compatibility with Orthanc <= 1.9.4
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	331 }
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	332
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	333 std::string details;
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	334 if (serialized.isMember(ERROR_DETAILS)) // Backward compatibility with Orthanc <= 1.9.4
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	335 {
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	336 details = SerializationToolbox::ReadString(serialized, ERROR_DETAILS);
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	337 }
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	338
1db3b79d97bd Error code and description of jobs are now saved into the Orthanc database Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	339 lastStatus_ = JobStatus(errorCode, details, *job_);
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	340 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 };
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4121 diff changeset	344 bool JobsRegistry::PriorityComparator::operator() (JobHandler* const& a,
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4121 diff changeset	345 JobHandler* const& b) const
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 return a->GetPriority() < b->GetPriority();
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	348 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 #if defined(NDEBUG)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 void JobsRegistry::CheckInvariants() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	355
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 #else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 bool JobsRegistry::IsPendingJob(const JobHandler& job) const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 PendingJobs copy = pendingJobs_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 while (!copy.empty())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 if (copy.top() == &job)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 return true;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 copy.pop();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 return false;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 bool JobsRegistry::IsCompletedJob(JobHandler& job) const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 for (CompletedJobs::const_iterator it = completedJobs_.begin();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 it != completedJobs_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 if (*it == &job)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 return true;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 return false;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 bool JobsRegistry::IsRetryJob(JobHandler& job) const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 return retryJobs_.find(&job) != retryJobs_.end();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 void JobsRegistry::CheckInvariants() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 PendingJobs copy = pendingJobs_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 while (!copy.empty())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 assert(copy.top()->GetState() == JobState_Pending);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 copy.pop();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 assert(completedJobs_.size() <= maxCompletedJobs_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 for (CompletedJobs::const_iterator it = completedJobs_.begin();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 it != completedJobs_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 assert((*it)->GetState() == JobState_Success \|\|
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 (*it)->GetState() == JobState_Failure);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 for (RetryJobs::const_iterator it = retryJobs_.begin();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 it != retryJobs_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 assert((*it)->GetState() == JobState_Retry);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 for (JobsIndex::const_iterator it = jobsIndex_.begin();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 it != jobsIndex_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 JobHandler& job = *it->second;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 assert(job.GetId() == it->first);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 switch (job.GetState())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 case JobState_Pending:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 assert(!IsRetryJob(job) && IsPendingJob(job) && !IsCompletedJob(job));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	430
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 case JobState_Success:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 case JobState_Failure:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 assert(!IsRetryJob(job) && !IsPendingJob(job) && IsCompletedJob(job));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	435
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 case JobState_Retry:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 assert(IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	439
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 case JobState_Running:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 case JobState_Paused:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 assert(!IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 default:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 throw OrthancException(ErrorCode_InternalError);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 #endif
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 void JobsRegistry::ForgetOldCompletedJobs()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	455 while (completedJobs_.size() > maxCompletedJobs_)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	457 assert(completedJobs_.front() != NULL);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	458
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	459 std::string id = completedJobs_.front()->GetId();
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	460 assert(jobsIndex_.find(id) != jobsIndex_.end());
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	462 jobsIndex_.erase(id);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	463 delete(completedJobs_.front());
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	464 completedJobs_.pop_front();
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	465 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	467 CheckInvariants();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	471 void JobsRegistry::SetCompletedJob(JobHandler& job,
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	472 bool success)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	473 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	474 job.SetState(success ? JobState_Success : JobState_Failure);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	475
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	476 completedJobs_.push_back(&job);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	477 someJobComplete_.notify_all();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	478 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	479
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	480
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 void JobsRegistry::MarkRunningAsCompleted(JobHandler& job,
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	482 CompletedReason reason)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	484 const char* tmp;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	485
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	486 switch (reason)
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	487 {
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	488 case CompletedReason_Success:
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	489 tmp = "success";
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	490 break;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	491
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	492 case CompletedReason_Failure:
3371 fe73717105b6 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 3240 diff changeset	493 tmp = "failure";
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	494 break;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	495
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	496 case CompletedReason_Canceled:
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	497 tmp = "cancel";
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	498 break;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	499
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	500 default:
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	501 throw OrthancException(ErrorCode_InternalError);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	502 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	503
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	504 LOG(INFO) << "Job has completed with " << tmp << ": " << job.GetId();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 CheckInvariants();
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	507
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 assert(job.GetState() == JobState_Running);
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	509 SetCompletedJob(job, reason == CompletedReason_Success);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	510
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	511 if (reason == CompletedReason_Canceled)
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	512 {
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	513 job.SetLastErrorCode(ErrorCode_CanceledJob);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	514 }
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	515
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	516 if (observer_ != NULL)
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	517 {
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	518 if (reason == CompletedReason_Success)
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	519 {
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	520 observer_->SignalJobSuccess(job.GetId());
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	521 }
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	522 else
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	523 {
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	524 observer_->SignalJobFailure(job.GetId());
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	525 }
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	526 }
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	527
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	528 // WARNING: The following call might make "job" invalid if the job
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	529 // history size is empty
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	530 ForgetOldCompletedJobs();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 void JobsRegistry::MarkRunningAsRetry(JobHandler& job,
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 unsigned int timeout)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 LOG(INFO) << "Job scheduled for retry in " << timeout << "ms: " << job.GetId();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 assert(job.GetState() == JobState_Running &&
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 retryJobs_.find(&job) == retryJobs_.end());
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 retryJobs_.insert(&job);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 job.SetRetryState(timeout);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 void JobsRegistry::MarkRunningAsPaused(JobHandler& job)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 LOG(INFO) << "Job paused: " << job.GetId();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 assert(job.GetState() == JobState_Running);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 job.SetState(JobState_Paused);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	564 bool JobsRegistry::GetStateInternal(JobState& state,
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	565 const std::string& id)
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	566 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	567 CheckInvariants();
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	568
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	569 JobsIndex::const_iterator it = jobsIndex_.find(id);
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	570 if (it == jobsIndex_.end())
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	571 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	572 return false;
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	573 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	574 else
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	575 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	576 state = it->second->GetState();
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	577 return true;
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	578 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	579 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	580
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	581
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 JobsRegistry::~JobsRegistry()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584 for (JobsIndex::iterator it = jobsIndex_.begin(); it != jobsIndex_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 assert(it->second != NULL);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 delete it->second;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2600 diff changeset	592 void JobsRegistry::SetMaxCompletedJobs(size_t n)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2600 diff changeset	597 LOG(INFO) << "The size of the history of the jobs engine is set to: " << n << " job(s)";
1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2600 diff changeset	598
1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2600 diff changeset	599 maxCompletedJobs_ = n;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 ForgetOldCompletedJobs();
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	601 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	603
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	604 size_t JobsRegistry::GetMaxCompletedJobs()
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	605 {
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	606 boost::mutex::scoped_lock lock(mutex_);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 CheckInvariants();
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	608 return maxCompletedJobs_;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 void JobsRegistry::ListJobs(std::set<std::string>& target)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 for (JobsIndex::const_iterator it = jobsIndex_.begin();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 it != jobsIndex_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 target.insert(it->first);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 bool JobsRegistry::GetJobInfo(JobInfo& target,
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 const std::string& id)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 JobsIndex::const_iterator found = jobsIndex_.find(id);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 if (found == jobsIndex_.end())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 return false;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 const JobHandler& handler = *found->second;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 target = JobInfo(handler.GetId(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 handler.GetPriority(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 handler.GetState(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 handler.GetLastStatus(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 handler.GetCreationTime(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645 handler.GetLastStateChangeTime(),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 handler.GetRuntime());
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 return true;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	652 bool JobsRegistry::GetJobOutput(std::string& output,
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	653 MimeType& mime,
4805 0a38000b086d Archive jobs response now contains a header Content-Disposition:filename='archive.zip' Alain Mazy <am@osimis.io> parents: 4768 diff changeset	654 std::string& filename,
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	655 const std::string& job,
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	656 const std::string& key)
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	657 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	658 boost::mutex::scoped_lock lock(mutex_);
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	659 CheckInvariants();
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	660
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	661 JobsIndex::const_iterator found = jobsIndex_.find(job);
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	662
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	663 if (found == jobsIndex_.end())
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	664 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	665 return false;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	666 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	667 else
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	668 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	669 const JobHandler& handler = *found->second;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	670
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	671 if (handler.GetState() == JobState_Success)
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	672 {
4805 0a38000b086d Archive jobs response now contains a header Content-Disposition:filename='archive.zip' Alain Mazy <am@osimis.io> parents: 4768 diff changeset	673 return handler.GetJob().GetOutput(output, mime, filename, key);
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	674 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	675 else
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	676 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	677 return false;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	678 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	679 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	680 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	681
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	682
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	683 void JobsRegistry::SubmitInternal(std::string& id,
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	684 JobHandler* handler)
2648 e1893d31652a serialization of JobHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	685 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	686 if (handler == NULL)
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	687 {
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	688 throw OrthancException(ErrorCode_NullPointer);
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	689 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	690
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	691 std::unique_ptr<JobHandler> protection(handler);
2669 eaf10085ffa1 no passwords in public content of jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	692
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	693 {
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	694 boost::mutex::scoped_lock lock(mutex_);
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	695 CheckInvariants();
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	696
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	697 id = handler->GetId();
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	698 int priority = handler->GetPriority();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	700 jobsIndex_.insert(std::make_pair(id, protection.release()));
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	701
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	702 switch (handler->GetState())
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	703 {
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	704 case JobState_Pending:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	705 case JobState_Retry:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	706 case JobState_Running:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	707 handler->SetState(JobState_Pending);
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	708 pendingJobs_.push(handler);
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	709 pendingJobAvailable_.notify_one();
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	710 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	711
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	712 case JobState_Success:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	713 SetCompletedJob(*handler, true);
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	714 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	715
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	716 case JobState_Failure:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	717 SetCompletedJob(*handler, false);
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	718 break;
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	719
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	720 case JobState_Paused:
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	721 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	722
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	723 default:
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	724 {
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	725 std::string details = ("A job should not be loaded from state: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	726 std::string(EnumerationToString(handler->GetState())));
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	727 throw OrthancException(ErrorCode_InternalError, details);
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	728 }
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	729 }
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	730
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	731 LOG(INFO) << "New job submitted with priority " << priority << ": " << id;
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	732
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	733 if (observer_ != NULL)
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	734 {
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	735 observer_->SignalJobSubmitted(id);
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	736 }
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	737
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	738 // WARNING: The following call might make "handler" invalid if
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	739 // the job history size is empty
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	740 ForgetOldCompletedJobs();
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2667 diff changeset	741 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743
4300 b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	744 JobsRegistry::JobsRegistry(size_t maxCompletedJobs) :
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	745 maxCompletedJobs_(maxCompletedJobs),
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	746 observer_(NULL)
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	747 {
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	748 }
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	749
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	751 void JobsRegistry::Submit(std::string& id,
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	752 IJob* job, // Takes ownership
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	753 int priority)
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	754 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	755 SubmitInternal(id, new JobHandler(job, priority));
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	756 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	757
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	758
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 void JobsRegistry::Submit(IJob* job, // Takes ownership
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 int priority)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762 std::string id;
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	763 SubmitInternal(id, new JobHandler(job, priority));
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	767 void JobsRegistry::SubmitAndWait(Json::Value& successContent,
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	768 IJob* job, // Takes ownership
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	769 int priority)
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	770 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	771 std::string id;
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	772 Submit(id, job, priority);
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	773
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	774 JobState state = JobState_Pending; // Dummy initialization
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	775
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	776 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	777 boost::mutex::scoped_lock lock(mutex_);
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	778
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	779 for (;;)
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	780 {
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	781 if (!GetStateInternal(state, id))
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	782 {
3162 94a4f75cc746 Fix issue #119 (/patients/.../archive returns a 500 when JobsHistorySize is 0) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	783 // Job has finished and has been lost (typically happens if
94a4f75cc746 Fix issue #119 (/patients/.../archive returns a 500 when JobsHistorySize is 0) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	784 // "JobsHistorySize" is 0)
94a4f75cc746 Fix issue #119 (/patients/.../archive returns a 500 when JobsHistorySize is 0) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	785 throw OrthancException(ErrorCode_InexistentItem,
94a4f75cc746 Fix issue #119 (/patients/.../archive returns a 500 when JobsHistorySize is 0) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	786 "Cannot retrieve the status of the job, "
94a4f75cc746 Fix issue #119 (/patients/.../archive returns a 500 when JobsHistorySize is 0) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	787 "make sure that \"JobsHistorySize\" is not 0");
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	788 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	789 else if (state == JobState_Failure)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	790 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	791 // Failure
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	792 JobsIndex::const_iterator it = jobsIndex_.find(id);
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	793 if (it != jobsIndex_.end()) // Should always be true, already tested in GetStateInternal()
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	794 {
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	795 ErrorCode code = it->second->GetLastStatus().GetErrorCode();
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	796 const std::string& details = it->second->GetLastStatus().GetDetails();
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	797
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	798 if (details.empty())
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	799 {
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	800 throw OrthancException(code);
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	801 }
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	802 else
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	803 {
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	804 throw OrthancException(code, details);
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	805 }
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	806 }
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	807 else
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	808 {
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	809 throw OrthancException(ErrorCode_InternalError);
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	810 }
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	811 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	812 else if (state == JobState_Success)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	813 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	814 // Success, try and retrieve the status of the job
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	815 JobsIndex::const_iterator it = jobsIndex_.find(id);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	816 if (it == jobsIndex_.end())
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	817 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	818 // Should not happen
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	819 state = JobState_Failure;
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	820 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	821 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	822 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	823 const JobStatus& status = it->second->GetLastStatus();
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	824 successContent = status.GetPublicContent();
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	825 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	826
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	827 return;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	828 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	829 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	830 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	831 // This job has not finished yet, wait for new completion
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	832 someJobComplete_.wait(lock);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2828 diff changeset	833 }
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	834 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	835 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	836 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	837
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	838
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	839 bool JobsRegistry::SetPriority(const std::string& id,
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840 int priority)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	841 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 LOG(INFO) << "Changing priority to " << priority << " for job: " << id;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	845 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	847 JobsIndex::iterator found = jobsIndex_.find(id);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	848
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849 if (found == jobsIndex_.end())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 LOG(WARNING) << "Unknown job: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	852 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 found->second->SetPriority(priority);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 if (found->second->GetState() == JobState_Pending)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 // If the job is pending, we need to reconstruct the
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 // priority queue, as the heap condition has changed
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 PendingJobs copy;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 std::swap(copy, pendingJobs_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 assert(pendingJobs_.empty());
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 while (!copy.empty())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 pendingJobs_.push(copy.top());
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 copy.pop();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 }
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	873
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	874 CheckInvariants();
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	875 return true;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	880 void JobsRegistry::RemovePendingJob(const std::string& id)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	881 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	882 // If the job is pending, we need to reconstruct the priority
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	883 // queue to remove it
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	884 PendingJobs copy;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	885 std::swap(copy, pendingJobs_);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	886
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	887 assert(pendingJobs_.empty());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	888 while (!copy.empty())
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	889 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	890 if (copy.top()->GetId() != id)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	891 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	892 pendingJobs_.push(copy.top());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	893 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	894
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	895 copy.pop();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	896 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	897 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	898
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	899
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	900 void JobsRegistry::RemoveRetryJob(JobHandler* handler)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	901 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	902 RetryJobs::iterator item = retryJobs_.find(handler);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	903 assert(item != retryJobs_.end());
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	904 retryJobs_.erase(item);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	905 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	906
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	907
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	908 bool JobsRegistry::Pause(const std::string& id)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 LOG(INFO) << "Pausing job: " << id;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 JobsIndex::iterator found = jobsIndex_.find(id);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 if (found == jobsIndex_.end())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919 LOG(WARNING) << "Unknown job: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	920 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924 switch (found->second->GetState())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	926 case JobState_Pending:
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	927 RemovePendingJob(id);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 found->second->SetState(JobState_Paused);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	929 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	931 case JobState_Retry:
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	932 RemoveRetryJob(found->second);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 found->second->SetState(JobState_Paused);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936 case JobState_Paused:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 case JobState_Success:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 case JobState_Failure:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 // Nothing to be done
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 case JobState_Running:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 found->second->SchedulePause();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946 default:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 throw OrthancException(ErrorCode_InternalError);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 }
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	949
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	950 CheckInvariants();
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	951 return true;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	956 bool JobsRegistry::Cancel(const std::string& id)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	957 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	958 LOG(INFO) << "Canceling job: " << id;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	959
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	960 boost::mutex::scoped_lock lock(mutex_);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	961 CheckInvariants();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	962
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	963 JobsIndex::iterator found = jobsIndex_.find(id);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	964
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	965 if (found == jobsIndex_.end())
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	966 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	967 LOG(WARNING) << "Unknown job: " << id;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	968 return false;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	969 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	970 else
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	971 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	972 switch (found->second->GetState())
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	973 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	974 case JobState_Pending:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	975 RemovePendingJob(id);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	976 SetCompletedJob(*found->second, false);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	977 found->second->SetLastErrorCode(ErrorCode_CanceledJob);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	978 break;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	979
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	980 case JobState_Retry:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	981 RemoveRetryJob(found->second);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	982 SetCompletedJob(*found->second, false);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	983 found->second->SetLastErrorCode(ErrorCode_CanceledJob);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	984 break;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	985
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	986 case JobState_Paused:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	987 SetCompletedJob(*found->second, false);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	988 found->second->SetLastErrorCode(ErrorCode_CanceledJob);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	989 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	990
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	991 case JobState_Success:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	992 case JobState_Failure:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	993 // Nothing to be done
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	994 break;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	995
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	996 case JobState_Running:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	997 found->second->ScheduleCancel();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	998 break;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	999
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1000 default:
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1001 throw OrthancException(ErrorCode_InternalError);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1002 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1003
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1004 // WARNING: The following call might make "handler" invalid if
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1005 // the job history size is empty
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1006 ForgetOldCompletedJobs();
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1007
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1008 return true;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1009 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1010 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1011
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1012
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1013 bool JobsRegistry::Resume(const std::string& id)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1014 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 LOG(INFO) << "Resuming job: " << id;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1016
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1017 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1018 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1019
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 JobsIndex::iterator found = jobsIndex_.find(id);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1021
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022 if (found == jobsIndex_.end())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 LOG(WARNING) << "Unknown job: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1025 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 else if (found->second->GetState() != JobState_Paused)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 LOG(WARNING) << "Cannot resume a job that is not paused: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1030 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 found->second->SetState(JobState_Pending);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 pendingJobs_.push(found->second);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 pendingJobAvailable_.notify_one();
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1037 CheckInvariants();
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1038 return true;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1040 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1041
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1042
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1043 bool JobsRegistry::Resubmit(const std::string& id)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 LOG(INFO) << "Resubmitting failed job: " << id;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 JobsIndex::iterator found = jobsIndex_.find(id);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052 if (found == jobsIndex_.end())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 LOG(WARNING) << "Unknown job: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1055 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1056 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 else if (found->second->GetState() != JobState_Failure)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 LOG(WARNING) << "Cannot resubmit a job that has not failed: " << id;
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1060 return false;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 {
2812 ea7aea6f6a95 improved naming of methods in IJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	1064 found->second->GetJob().Reset();
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1065
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 bool ok = false;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1067 for (CompletedJobs::iterator it = completedJobs_.begin();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068 it != completedJobs_.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 if (*it == found->second)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 ok = true;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 completedJobs_.erase(it);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1076 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1077
4121 7c9ff821063a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1078 (void) ok; // Remove warning about unused variable in release builds
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 assert(ok);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080
4768 a046e91cc76f cont fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4733 diff changeset	1081 found->second->ResetRuntime();
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 found->second->SetState(JobState_Pending);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1083 pendingJobs_.push(found->second);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 pendingJobAvailable_.notify_one();
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1085
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1086 CheckInvariants();
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	1087 return true;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1090
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1092 void JobsRegistry::ScheduleRetries()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1093 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 boost::mutex::scoped_lock lock(mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1097 RetryJobs copy;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1098 std::swap(copy, retryJobs_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 assert(retryJobs_.empty());
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 for (RetryJobs::iterator it = copy.begin(); it != copy.end(); ++it)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 if ((*it)->IsRetryReady(now))
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 LOG(INFO) << "Retrying job: " << (*it)->GetId();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 (*it)->SetState(JobState_Pending);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 pendingJobs_.push(*it);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 pendingJobAvailable_.notify_one();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114 retryJobs_.insert(*it);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1116 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1117
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1118 CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1120
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1121
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 bool JobsRegistry::GetState(JobState& state,
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 const std::string& id)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125 boost::mutex::scoped_lock lock(mutex_);
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	1126 return GetStateInternal(state, id);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1129
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1130 void JobsRegistry::SetObserver(JobsRegistry::IObserver& observer)
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1131 {
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1132 boost::mutex::scoped_lock lock(mutex_);
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1133 observer_ = &observer;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1134 }
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1135
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1136
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1137 void JobsRegistry::ResetObserver()
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1138 {
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1139 boost::mutex::scoped_lock lock(mutex_);
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1140 observer_ = NULL;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1141 }
8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2670 diff changeset	1142
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1143
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1144 JobsRegistry::RunningJob::RunningJob(JobsRegistry& registry,
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 unsigned int timeout) :
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1146 registry_(registry),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1147 handler_(NULL),
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1148 targetState_(JobState_Failure),
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1149 targetRetryTimeout_(0),
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1150 canceled_(false)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1151 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1152 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1153 boost::mutex::scoped_lock lock(registry_.mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1154
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1155 while (registry_.pendingJobs_.empty())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1156 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1157 if (timeout == 0)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1158 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1159 registry_.pendingJobAvailable_.wait(lock);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1160 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1161 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 bool success = registry_.pendingJobAvailable_.timed_wait
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 (lock, boost::posix_time::milliseconds(timeout));
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165 if (!success)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 // No pending job
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 return;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1170 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173 handler_ = registry_.pendingJobs_.top();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1174 registry_.pendingJobs_.pop();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1175
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176 assert(handler_->GetState() == JobState_Pending);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177 handler_->SetState(JobState_Running);
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1178 handler_->SetLastErrorCode(ErrorCode_Success);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 job_ = &handler_->GetJob();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1181 id_ = handler_->GetId();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1182 priority_ = handler_->GetPriority();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1183 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1184 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1185
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1186
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1187 JobsRegistry::RunningJob::~RunningJob()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1189 if (IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1190 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1191 boost::mutex::scoped_lock lock(registry_.mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193 switch (targetState_)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 case JobState_Failure:
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1196 registry_.MarkRunningAsCompleted
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1197 (*handler_, canceled_ ? CompletedReason_Canceled : CompletedReason_Failure);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200 case JobState_Success:
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1201 registry_.MarkRunningAsCompleted(*handler_, CompletedReason_Success);
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1202 break;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1204 case JobState_Paused:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1205 registry_.MarkRunningAsPaused(*handler_);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1206 break;
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1207
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1208 case JobState_Retry:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1209 registry_.MarkRunningAsRetry(*handler_, targetRetryTimeout_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1210 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1211
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212 default:
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1213 assert(0);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1214 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1215 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1216 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1217
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1218
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219 bool JobsRegistry::RunningJob::IsValid() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221 return (handler_ != NULL &&
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222 job_ != NULL);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1223 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1224
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1225
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1226 const std::string& JobsRegistry::RunningJob::GetId() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1227 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1229 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1230 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1231 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1232 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1233 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1234 return id_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1235 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1238
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1239 int JobsRegistry::RunningJob::GetPriority() const
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1240 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1241 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1247 return priority_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1250
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 IJob& JobsRegistry::RunningJob::GetJob()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 return *job_;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1262 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1264
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1265 bool JobsRegistry::RunningJob::IsPauseScheduled()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1266 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1267 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1268 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 boost::mutex::scoped_lock lock(registry_.mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 registry_.CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1275 assert(handler_->GetState() == JobState_Running);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1276
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277 return handler_->IsPauseScheduled();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1278 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1279 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1280
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1281
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1282 bool JobsRegistry::RunningJob::IsCancelScheduled()
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1283 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1284 if (!IsValid())
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1285 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1286 throw OrthancException(ErrorCode_BadSequenceOfCalls);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1287 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1288 else
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1289 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1290 boost::mutex::scoped_lock lock(registry_.mutex_);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1291 registry_.CheckInvariants();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1292 assert(handler_->GetState() == JobState_Running);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1293
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1294 return handler_->IsCancelScheduled();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1295 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1296 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1297
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1298
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1299 void JobsRegistry::RunningJob::MarkSuccess()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1300 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1301 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1302 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1304 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1305 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1306 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1307 targetState_ = JobState_Success;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1308 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1309 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1310
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1311
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1312 void JobsRegistry::RunningJob::MarkFailure()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1313 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1316 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1317 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1318 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1319 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320 targetState_ = JobState_Failure;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1322 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1323
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1324
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1325 void JobsRegistry::RunningJob::MarkCanceled()
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1326 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1327 if (!IsValid())
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1328 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1329 throw OrthancException(ErrorCode_BadSequenceOfCalls);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1330 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1331 else
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1332 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1333 targetState_ = JobState_Failure;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1334 canceled_ = true;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1335 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1336 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	1337
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1338
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339 void JobsRegistry::RunningJob::MarkPause()
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1341 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1342 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1344 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 targetState_ = JobState_Paused;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1351
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1352 void JobsRegistry::RunningJob::MarkRetry(unsigned int timeout)
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1353 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1354 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1355 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1356 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1357 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1358 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1359 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1360 targetState_ = JobState_Retry;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1361 targetRetryTimeout_ = timeout;
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1362 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1363 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1364
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1365
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	1366 void JobsRegistry::RunningJob::UpdateStatus(ErrorCode code,
e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	1367 const std::string& details)
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1368 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1369 if (!IsValid())
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1370 {
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 else
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374 {
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3191 diff changeset	1375 JobStatus status(code, details, *job_);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1376
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 boost::mutex::scoped_lock lock(registry_.mutex_);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 registry_.CheckInvariants();
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 assert(handler_->GetState() == JobState_Running);
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1380
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381 handler_->SetLastStatus(status);
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1382 }
2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1383 }
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1384
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1385
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1386
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1387 void JobsRegistry::Serialize(Json::Value& target)
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1388 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1389 boost::mutex::scoped_lock lock(mutex_);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1390 CheckInvariants();
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1391
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1392 target = Json::objectValue;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1393 target[TYPE] = JOBS_REGISTRY;
2670 c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1394 target[JOBS] = Json::objectValue;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1395
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1396 for (JobsIndex::const_iterator it = jobsIndex_.begin();
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1397 it != jobsIndex_.end(); ++it)
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1398 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1399 Json::Value v;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1400 if (it->second->Serialize(v))
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1401 {
2670 c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1402 target[JOBS][it->first] = v;
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1403 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1404 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1405 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1406
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1407
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1408 JobsRegistry::JobsRegistry(IJobUnserializer& unserializer,
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1409 const Json::Value& s,
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1410 size_t maxCompletedJobs) :
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1411 maxCompletedJobs_(maxCompletedJobs),
1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1412 observer_(NULL)
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1413 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1414 if (SerializationToolbox::ReadString(s, TYPE) != JOBS_REGISTRY \|\|
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1415 !s.isMember(JOBS) \|\|
2670 c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1416 s[JOBS].type() != Json::objectValue)
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1417 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1418 throw OrthancException(ErrorCode_BadFileFormat);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1419 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1420
2670 c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1421 Json::Value::Members members = s[JOBS].getMemberNames();
c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1422
c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1423 for (Json::Value::Members::const_iterator it = members.begin();
c5646f766b3e serialize jobs as an object Sebastien Jodogne <s.jodogne@gmail.com> parents: 2669 diff changeset	1424 it != members.end(); ++it)
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1425 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1426 std::unique_ptr<JobHandler> job;
3191 20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1427
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1428 try
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1429 {
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1430 job.reset(new JobHandler(unserializer, s[JOBS][it], it));
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1431 }
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1432 catch (OrthancException& e)
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1433 {
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1434 LOG(WARNING) << "Cannot unserialize one job from previous execution, "
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1435 << "skipping it: " << e.What();
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1436 continue;
20826867141f ignore jobs that cannot be unserialized Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	1437 }
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1438
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1439 const boost::posix_time::ptime lastChangeTime = job->GetLastStateChangeTime();
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1440
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1441 std::string id;
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1442 SubmitInternal(id, job.release());
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1443
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1444 // Check whether the job has not been removed (which could be
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1445 // the case if the "maxCompletedJobs_" value gets smaller)
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1446 JobsIndex::iterator found = jobsIndex_.find(id);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1447 if (found != jobsIndex_.end())
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1448 {
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1449 // The job still lies in the history: Update the time of its
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1450 // last change to the time that was serialized
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1451 assert(found->second != NULL);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1452 found->second->SetLastStateChangeTime(lastChangeTime);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2939 diff changeset	1453 }
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1454 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2663 diff changeset	1455 }
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1456
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1457
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1458 void JobsRegistry::GetStatistics(unsigned int& pending,
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1459 unsigned int& running,
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1460 unsigned int& success,
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1461 unsigned int& failed)
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1462 {
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1463 boost::mutex::scoped_lock lock(mutex_);
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1464 CheckInvariants();
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1465
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1466 pending = 0;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1467 running = 0;
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1468 success = 0;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1469 failed = 0;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1470
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1471 for (JobsIndex::const_iterator it = jobsIndex_.begin();
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1472 it != jobsIndex_.end(); ++it)
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1473 {
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1474 JobHandler& job = *it->second;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1475
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1476 switch (job.GetState())
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1477 {
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1478 case JobState_Retry:
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1479 case JobState_Pending:
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1480 pending ++;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1481 break;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1482
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1483 case JobState_Paused:
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1484 case JobState_Running:
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1485 running ++;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1486 break;
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1487
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1488 case JobState_Success:
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1489 success ++;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1490 break;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1491
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1492 case JobState_Failure:
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	1493 failed ++;
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1494 break;
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1495
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1496 default:
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1497 throw OrthancException(ErrorCode_InternalError);
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1498 }
4024 1d2b31fc782f new 'changes': JobSubmitted, JobSuccess, JobFailure Alain Mazy <alain@mazy.be> parents: 4022 diff changeset	1499 }
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3162 diff changeset	1500 }
2569 2af17cd5eb1f reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1501 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp @ 4966:ee6d7937a6cf