Mercurial > hg > orthanc
annotate Core/JobsEngine/JobsRegistry.cpp @ 2620:1232922c8793 jobs
speeding up shutdown if Lua script is in trailing phase
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 22 May 2018 14:08:57 +0200 |
| parents | 140a539b4eba |
| children | 00327e989458 |
| rev | line source |
|---|---|
| 2569 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2018 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #include "../PrecompiledHeaders.h" | |
| 35 #include "JobsRegistry.h" | |
| 36 | |
| 37 #include "../Logging.h" | |
| 38 #include "../OrthancException.h" | |
| 39 #include "../Toolbox.h" | |
| 40 | |
| 41 namespace Orthanc | |
| 42 { | |
| 43 class JobsRegistry::JobHandler : public boost::noncopyable | |
| 44 { | |
| 45 private: | |
| 46 std::string id_; | |
| 47 JobState state_; | |
| 48 std::auto_ptr<IJob> job_; | |
| 49 int priority_; // "+inf()" means highest priority | |
| 50 boost::posix_time::ptime creationTime_; | |
| 51 boost::posix_time::ptime lastStateChangeTime_; | |
| 52 boost::posix_time::time_duration runtime_; | |
| 53 boost::posix_time::ptime retryTime_; | |
| 54 bool pauseScheduled_; | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
55 bool cancelScheduled_; |
| 2569 | 56 JobStatus lastStatus_; |
| 57 | |
| 58 void Touch() | |
| 59 { | |
| 60 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time(); | |
| 61 | |
| 62 if (state_ == JobState_Running) | |
| 63 { | |
| 64 runtime_ += (now - lastStateChangeTime_); | |
| 65 } | |
| 66 | |
| 67 lastStateChangeTime_ = now; | |
| 68 } | |
| 69 | |
| 70 void SetStateInternal(JobState state) | |
| 71 { | |
| 72 state_ = state; | |
| 73 pauseScheduled_ = false; | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
74 cancelScheduled_ = false; |
| 2569 | 75 Touch(); |
| 76 } | |
| 77 | |
| 78 public: | |
| 79 JobHandler(IJob* job, | |
| 80 int priority) : | |
| 81 id_(Toolbox::GenerateUuid()), | |
| 82 state_(JobState_Pending), | |
| 83 job_(job), | |
| 84 priority_(priority), | |
| 85 creationTime_(boost::posix_time::microsec_clock::universal_time()), | |
| 86 lastStateChangeTime_(creationTime_), | |
| 87 runtime_(boost::posix_time::milliseconds(0)), | |
| 88 retryTime_(creationTime_), | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
89 pauseScheduled_(false), |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
90 cancelScheduled_(false) |
| 2569 | 91 { |
| 92 if (job == NULL) | |
| 93 { | |
| 94 throw OrthancException(ErrorCode_NullPointer); | |
| 95 } | |
| 96 | |
| 97 lastStatus_ = JobStatus(ErrorCode_Success, *job); | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
98 job->Start(); |
| 2569 | 99 } |
| 100 | |
| 101 const std::string& GetId() const | |
| 102 { | |
| 103 return id_; | |
| 104 } | |
| 105 | |
| 106 IJob& GetJob() const | |
| 107 { | |
| 108 assert(job_.get() != NULL); | |
| 109 return *job_; | |
| 110 } | |
| 111 | |
| 112 void SetPriority(int priority) | |
| 113 { | |
| 114 priority_ = priority; | |
| 115 } | |
| 116 | |
| 117 int GetPriority() const | |
| 118 { | |
| 119 return priority_; | |
| 120 } | |
| 121 | |
| 122 JobState GetState() const | |
| 123 { | |
| 124 return state_; | |
| 125 } | |
| 126 | |
| 127 void SetState(JobState state) | |
| 128 { | |
| 129 if (state == JobState_Retry) | |
| 130 { | |
| 131 // Use "SetRetryState()" | |
| 132 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 133 } | |
| 134 else | |
| 135 { | |
| 136 SetStateInternal(state); | |
| 137 } | |
| 138 } | |
| 139 | |
| 140 void SetRetryState(unsigned int timeout) | |
| 141 { | |
| 142 if (state_ == JobState_Running) | |
| 143 { | |
| 144 SetStateInternal(JobState_Retry); | |
| 145 retryTime_ = (boost::posix_time::microsec_clock::universal_time() + | |
| 146 boost::posix_time::milliseconds(timeout)); | |
| 147 } | |
| 148 else | |
| 149 { | |
| 150 // Only valid for running jobs | |
| 151 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 152 } | |
| 153 } | |
| 154 | |
| 155 void SchedulePause() | |
| 156 { | |
| 157 if (state_ == JobState_Running) | |
| 158 { | |
| 159 pauseScheduled_ = true; | |
| 160 } | |
| 161 else | |
| 162 { | |
| 163 // Only valid for running jobs | |
| 164 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 165 } | |
| 166 } | |
| 167 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
168 void ScheduleCancel() |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
169 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
170 if (state_ == JobState_Running) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
171 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
172 cancelScheduled_ = true; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
173 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
174 else |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
175 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
176 // Only valid for running jobs |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
177 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
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 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
180 |
| 2569 | 181 bool IsPauseScheduled() |
| 182 { | |
| 183 return pauseScheduled_; | |
| 184 } | |
| 185 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
186 bool IsCancelScheduled() |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
187 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
188 return cancelScheduled_; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
189 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
190 |
| 2569 | 191 bool IsRetryReady(const boost::posix_time::ptime& now) const |
| 192 { | |
| 193 if (state_ != JobState_Retry) | |
| 194 { | |
| 195 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 196 } | |
| 197 else | |
| 198 { | |
| 199 return retryTime_ <= now; | |
| 200 } | |
| 201 } | |
| 202 | |
| 203 const boost::posix_time::ptime& GetCreationTime() const | |
| 204 { | |
| 205 return creationTime_; | |
| 206 } | |
| 207 | |
| 208 const boost::posix_time::ptime& GetLastStateChangeTime() const | |
| 209 { | |
| 210 return lastStateChangeTime_; | |
| 211 } | |
| 212 | |
| 213 const boost::posix_time::time_duration& GetRuntime() const | |
| 214 { | |
| 215 return runtime_; | |
| 216 } | |
| 217 | |
| 218 const JobStatus& GetLastStatus() const | |
| 219 { | |
| 220 return lastStatus_; | |
| 221 } | |
| 222 | |
| 223 void SetLastStatus(const JobStatus& status) | |
| 224 { | |
| 225 lastStatus_ = status; | |
| 226 Touch(); | |
| 227 } | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
228 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
229 void SetLastErrorCode(ErrorCode code) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
230 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
231 lastStatus_.SetErrorCode(code); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
232 } |
| 2569 | 233 }; |
| 234 | |
| 235 | |
| 236 bool JobsRegistry::PriorityComparator::operator() (JobHandler*& a, | |
| 237 JobHandler*& b) const | |
| 238 { | |
| 239 return a->GetPriority() < b->GetPriority(); | |
| 240 } | |
| 241 | |
| 242 | |
| 243 #if defined(NDEBUG) | |
| 244 void JobsRegistry::CheckInvariants() const | |
| 245 { | |
| 246 } | |
| 247 | |
| 248 #else | |
| 249 bool JobsRegistry::IsPendingJob(const JobHandler& job) const | |
| 250 { | |
| 251 PendingJobs copy = pendingJobs_; | |
| 252 while (!copy.empty()) | |
| 253 { | |
| 254 if (copy.top() == &job) | |
| 255 { | |
| 256 return true; | |
| 257 } | |
| 258 | |
| 259 copy.pop(); | |
| 260 } | |
| 261 | |
| 262 return false; | |
| 263 } | |
| 264 | |
| 265 bool JobsRegistry::IsCompletedJob(JobHandler& job) const | |
| 266 { | |
| 267 for (CompletedJobs::const_iterator it = completedJobs_.begin(); | |
| 268 it != completedJobs_.end(); ++it) | |
| 269 { | |
| 270 if (*it == &job) | |
| 271 { | |
| 272 return true; | |
| 273 } | |
| 274 } | |
| 275 | |
| 276 return false; | |
| 277 } | |
| 278 | |
| 279 bool JobsRegistry::IsRetryJob(JobHandler& job) const | |
| 280 { | |
| 281 return retryJobs_.find(&job) != retryJobs_.end(); | |
| 282 } | |
| 283 | |
| 284 void JobsRegistry::CheckInvariants() const | |
| 285 { | |
| 286 { | |
| 287 PendingJobs copy = pendingJobs_; | |
| 288 while (!copy.empty()) | |
| 289 { | |
| 290 assert(copy.top()->GetState() == JobState_Pending); | |
| 291 copy.pop(); | |
| 292 } | |
| 293 } | |
| 294 | |
| 295 assert(completedJobs_.size() <= maxCompletedJobs_); | |
| 296 | |
| 297 for (CompletedJobs::const_iterator it = completedJobs_.begin(); | |
| 298 it != completedJobs_.end(); ++it) | |
| 299 { | |
| 300 assert((*it)->GetState() == JobState_Success || | |
| 301 (*it)->GetState() == JobState_Failure); | |
| 302 } | |
| 303 | |
| 304 for (RetryJobs::const_iterator it = retryJobs_.begin(); | |
| 305 it != retryJobs_.end(); ++it) | |
| 306 { | |
| 307 assert((*it)->GetState() == JobState_Retry); | |
| 308 } | |
| 309 | |
| 310 for (JobsIndex::const_iterator it = jobsIndex_.begin(); | |
| 311 it != jobsIndex_.end(); ++it) | |
| 312 { | |
| 313 JobHandler& job = *it->second; | |
| 314 | |
| 315 assert(job.GetId() == it->first); | |
| 316 | |
| 317 switch (job.GetState()) | |
| 318 { | |
| 319 case JobState_Pending: | |
| 320 assert(!IsRetryJob(job) && IsPendingJob(job) && !IsCompletedJob(job)); | |
| 321 break; | |
| 322 | |
| 323 case JobState_Success: | |
| 324 case JobState_Failure: | |
| 325 assert(!IsRetryJob(job) && !IsPendingJob(job) && IsCompletedJob(job)); | |
| 326 break; | |
| 327 | |
| 328 case JobState_Retry: | |
| 329 assert(IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job)); | |
| 330 break; | |
| 331 | |
| 332 case JobState_Running: | |
| 333 case JobState_Paused: | |
| 334 assert(!IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job)); | |
| 335 break; | |
| 336 | |
| 337 default: | |
| 338 throw OrthancException(ErrorCode_InternalError); | |
| 339 } | |
| 340 } | |
| 341 } | |
| 342 #endif | |
| 343 | |
| 344 | |
| 345 void JobsRegistry::ForgetOldCompletedJobs() | |
| 346 { | |
| 347 if (maxCompletedJobs_ != 0) | |
| 348 { | |
| 349 while (completedJobs_.size() > maxCompletedJobs_) | |
| 350 { | |
| 351 assert(completedJobs_.front() != NULL); | |
| 352 | |
| 353 std::string id = completedJobs_.front()->GetId(); | |
| 354 assert(jobsIndex_.find(id) != jobsIndex_.end()); | |
| 355 | |
| 356 jobsIndex_.erase(id); | |
| 357 delete(completedJobs_.front()); | |
| 358 completedJobs_.pop_front(); | |
| 359 } | |
| 360 } | |
| 361 } | |
| 362 | |
| 363 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
364 void JobsRegistry::SetCompletedJob(JobHandler& job, |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
365 bool success) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
366 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
367 job.SetState(success ? JobState_Success : JobState_Failure); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
368 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
369 completedJobs_.push_back(&job); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
370 ForgetOldCompletedJobs(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
371 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
372 someJobComplete_.notify_all(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
373 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
374 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
375 |
| 2569 | 376 void JobsRegistry::MarkRunningAsCompleted(JobHandler& job, |
| 377 bool success) | |
| 378 { | |
| 379 LOG(INFO) << "Job has completed with " << (success ? "success" : "failure") | |
| 380 << ": " << job.GetId(); | |
| 381 | |
| 382 CheckInvariants(); | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
383 |
| 2569 | 384 assert(job.GetState() == JobState_Running); |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
385 SetCompletedJob(job, success); |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
386 |
| 2569 | 387 CheckInvariants(); |
| 388 } | |
| 389 | |
| 390 | |
| 391 void JobsRegistry::MarkRunningAsRetry(JobHandler& job, | |
| 392 unsigned int timeout) | |
| 393 { | |
| 394 LOG(INFO) << "Job scheduled for retry in " << timeout << "ms: " << job.GetId(); | |
| 395 | |
| 396 CheckInvariants(); | |
| 397 | |
| 398 assert(job.GetState() == JobState_Running && | |
| 399 retryJobs_.find(&job) == retryJobs_.end()); | |
| 400 | |
| 401 retryJobs_.insert(&job); | |
| 402 job.SetRetryState(timeout); | |
| 403 | |
| 404 CheckInvariants(); | |
| 405 } | |
| 406 | |
| 407 | |
| 408 void JobsRegistry::MarkRunningAsPaused(JobHandler& job) | |
| 409 { | |
| 410 LOG(INFO) << "Job paused: " << job.GetId(); | |
| 411 | |
| 412 CheckInvariants(); | |
| 413 assert(job.GetState() == JobState_Running); | |
| 414 | |
| 415 job.SetState(JobState_Paused); | |
| 416 | |
| 417 CheckInvariants(); | |
| 418 } | |
| 419 | |
| 420 | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
421 bool JobsRegistry::GetStateInternal(JobState& state, |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
422 const std::string& id) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
423 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
424 CheckInvariants(); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
425 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
426 JobsIndex::const_iterator it = jobsIndex_.find(id); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
427 if (it == jobsIndex_.end()) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
428 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
429 return false; |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
430 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
431 else |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
432 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
433 state = it->second->GetState(); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
434 return true; |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
435 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
436 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
437 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
438 |
| 2569 | 439 JobsRegistry::~JobsRegistry() |
| 440 { | |
| 441 for (JobsIndex::iterator it = jobsIndex_.begin(); it != jobsIndex_.end(); ++it) | |
| 442 { | |
| 443 assert(it->second != NULL); | |
| 444 delete it->second; | |
| 445 } | |
| 446 } | |
| 447 | |
| 448 | |
|
2620
1232922c8793
speeding up shutdown if Lua script is in trailing phase
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2600
diff
changeset
|
449 void JobsRegistry::SetMaxCompletedJobs(size_t n) |
| 2569 | 450 { |
| 451 boost::mutex::scoped_lock lock(mutex_); | |
| 452 CheckInvariants(); | |
| 453 | |
|
2620
1232922c8793
speeding up shutdown if Lua script is in trailing phase
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2600
diff
changeset
|
454 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
|
455 |
|
1232922c8793
speeding up shutdown if Lua script is in trailing phase
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2600
diff
changeset
|
456 maxCompletedJobs_ = n; |
| 2569 | 457 ForgetOldCompletedJobs(); |
| 458 | |
| 459 CheckInvariants(); | |
| 460 } | |
| 461 | |
| 462 | |
| 463 void JobsRegistry::ListJobs(std::set<std::string>& target) | |
| 464 { | |
| 465 boost::mutex::scoped_lock lock(mutex_); | |
| 466 CheckInvariants(); | |
| 467 | |
| 468 for (JobsIndex::const_iterator it = jobsIndex_.begin(); | |
| 469 it != jobsIndex_.end(); ++it) | |
| 470 { | |
| 471 target.insert(it->first); | |
| 472 } | |
| 473 } | |
| 474 | |
| 475 | |
| 476 bool JobsRegistry::GetJobInfo(JobInfo& target, | |
| 477 const std::string& id) | |
| 478 { | |
| 479 boost::mutex::scoped_lock lock(mutex_); | |
| 480 CheckInvariants(); | |
| 481 | |
| 482 JobsIndex::const_iterator found = jobsIndex_.find(id); | |
| 483 | |
| 484 if (found == jobsIndex_.end()) | |
| 485 { | |
| 486 return false; | |
| 487 } | |
| 488 else | |
| 489 { | |
| 490 const JobHandler& handler = *found->second; | |
| 491 target = JobInfo(handler.GetId(), | |
| 492 handler.GetPriority(), | |
| 493 handler.GetState(), | |
| 494 handler.GetLastStatus(), | |
| 495 handler.GetCreationTime(), | |
| 496 handler.GetLastStateChangeTime(), | |
| 497 handler.GetRuntime()); | |
| 498 return true; | |
| 499 } | |
| 500 } | |
| 501 | |
| 502 | |
| 503 void JobsRegistry::Submit(std::string& id, | |
| 504 IJob* job, // Takes ownership | |
| 505 int priority) | |
| 506 { | |
| 507 std::auto_ptr<JobHandler> handler(new JobHandler(job, priority)); | |
| 508 | |
| 509 boost::mutex::scoped_lock lock(mutex_); | |
| 510 CheckInvariants(); | |
| 511 | |
| 512 id = handler->GetId(); | |
| 513 | |
| 514 pendingJobs_.push(handler.get()); | |
| 515 pendingJobAvailable_.notify_one(); | |
| 516 | |
| 517 jobsIndex_.insert(std::make_pair(id, handler.release())); | |
| 518 | |
| 519 LOG(INFO) << "New job submitted with priority " << priority << ": " << id; | |
| 520 | |
| 521 CheckInvariants(); | |
| 522 } | |
| 523 | |
| 524 | |
| 525 void JobsRegistry::Submit(IJob* job, // Takes ownership | |
| 526 int priority) | |
| 527 { | |
| 528 std::string id; | |
| 529 Submit(id, job, priority); | |
| 530 } | |
| 531 | |
| 532 | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
533 bool JobsRegistry::SubmitAndWait(IJob* job, // Takes ownership |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
534 int priority) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
535 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
536 std::string id; |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
537 Submit(id, job, priority); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
538 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
539 JobState state; |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
540 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
541 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
542 boost::mutex::scoped_lock lock(mutex_); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
543 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
544 while (GetStateInternal(state, id) && |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
545 state != JobState_Success && |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
546 state != JobState_Failure) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
547 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
548 someJobComplete_.wait(lock); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
549 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
550 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
551 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
552 return (state == JobState_Success); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
553 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
554 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
555 |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
556 bool JobsRegistry::SetPriority(const std::string& id, |
| 2569 | 557 int priority) |
| 558 { | |
| 559 LOG(INFO) << "Changing priority to " << priority << " for job: " << id; | |
| 560 | |
| 561 boost::mutex::scoped_lock lock(mutex_); | |
| 562 CheckInvariants(); | |
| 563 | |
| 564 JobsIndex::iterator found = jobsIndex_.find(id); | |
| 565 | |
| 566 if (found == jobsIndex_.end()) | |
| 567 { | |
| 568 LOG(WARNING) << "Unknown job: " << id; | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
569 return false; |
| 2569 | 570 } |
| 571 else | |
| 572 { | |
| 573 found->second->SetPriority(priority); | |
| 574 | |
| 575 if (found->second->GetState() == JobState_Pending) | |
| 576 { | |
| 577 // If the job is pending, we need to reconstruct the | |
| 578 // priority queue, as the heap condition has changed | |
| 579 | |
| 580 PendingJobs copy; | |
| 581 std::swap(copy, pendingJobs_); | |
| 582 | |
| 583 assert(pendingJobs_.empty()); | |
| 584 while (!copy.empty()) | |
| 585 { | |
| 586 pendingJobs_.push(copy.top()); | |
| 587 copy.pop(); | |
| 588 } | |
| 589 } | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
590 |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
591 CheckInvariants(); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
592 return true; |
| 2569 | 593 } |
| 594 } | |
| 595 | |
| 596 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
597 void JobsRegistry::RemovePendingJob(const std::string& id) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
598 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
599 // If the job is pending, we need to reconstruct the priority |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
600 // queue to remove it |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
601 PendingJobs copy; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
602 std::swap(copy, pendingJobs_); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
603 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
604 assert(pendingJobs_.empty()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
605 while (!copy.empty()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
606 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
607 if (copy.top()->GetId() != id) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
608 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
609 pendingJobs_.push(copy.top()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
610 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
611 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
612 copy.pop(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
613 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
614 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
615 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
616 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
617 void JobsRegistry::RemoveRetryJob(JobHandler* handler) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
618 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
619 RetryJobs::iterator item = retryJobs_.find(handler); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
620 assert(item != retryJobs_.end()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
621 retryJobs_.erase(item); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
622 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
623 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
624 |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
625 bool JobsRegistry::Pause(const std::string& id) |
| 2569 | 626 { |
| 627 LOG(INFO) << "Pausing job: " << id; | |
| 628 | |
| 629 boost::mutex::scoped_lock lock(mutex_); | |
| 630 CheckInvariants(); | |
| 631 | |
| 632 JobsIndex::iterator found = jobsIndex_.find(id); | |
| 633 | |
| 634 if (found == jobsIndex_.end()) | |
| 635 { | |
| 636 LOG(WARNING) << "Unknown job: " << id; | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
637 return false; |
| 2569 | 638 } |
| 639 else | |
| 640 { | |
| 641 switch (found->second->GetState()) | |
| 642 { | |
| 643 case JobState_Pending: | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
644 RemovePendingJob(id); |
| 2569 | 645 found->second->SetState(JobState_Paused); |
| 646 break; | |
| 647 | |
| 648 case JobState_Retry: | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
649 RemoveRetryJob(found->second); |
| 2569 | 650 found->second->SetState(JobState_Paused); |
| 651 break; | |
| 652 | |
| 653 case JobState_Paused: | |
| 654 case JobState_Success: | |
| 655 case JobState_Failure: | |
| 656 // Nothing to be done | |
| 657 break; | |
| 658 | |
| 659 case JobState_Running: | |
| 660 found->second->SchedulePause(); | |
| 661 break; | |
| 662 | |
| 663 default: | |
| 664 throw OrthancException(ErrorCode_InternalError); | |
| 665 } | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
666 |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
667 CheckInvariants(); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
668 return true; |
| 2569 | 669 } |
| 670 } | |
| 671 | |
| 672 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
673 bool JobsRegistry::Cancel(const std::string& id) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
674 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
675 LOG(INFO) << "Canceling job: " << id; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
676 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
677 boost::mutex::scoped_lock lock(mutex_); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
678 CheckInvariants(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
679 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
680 JobsIndex::iterator found = jobsIndex_.find(id); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
681 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
682 if (found == jobsIndex_.end()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
683 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
684 LOG(WARNING) << "Unknown job: " << id; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
685 return false; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
686 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
687 else |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
688 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
689 switch (found->second->GetState()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
690 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
691 case JobState_Pending: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
692 RemovePendingJob(id); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
693 SetCompletedJob(*found->second, false); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
694 found->second->SetLastErrorCode(ErrorCode_CanceledJob); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
695 break; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
696 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
697 case JobState_Retry: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
698 RemoveRetryJob(found->second); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
699 SetCompletedJob(*found->second, false); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
700 found->second->SetLastErrorCode(ErrorCode_CanceledJob); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
701 break; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
702 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
703 case JobState_Paused: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
704 SetCompletedJob(*found->second, false); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
705 found->second->SetLastErrorCode(ErrorCode_CanceledJob); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
706 break; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
707 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
708 case JobState_Success: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
709 case JobState_Failure: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
710 // Nothing to be done |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
711 break; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
712 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
713 case JobState_Running: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
714 found->second->ScheduleCancel(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
715 break; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
716 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
717 default: |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
718 throw OrthancException(ErrorCode_InternalError); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
719 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
720 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
721 CheckInvariants(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
722 return true; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
723 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
724 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
725 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
726 |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
727 bool JobsRegistry::Resume(const std::string& id) |
| 2569 | 728 { |
| 729 LOG(INFO) << "Resuming job: " << id; | |
| 730 | |
| 731 boost::mutex::scoped_lock lock(mutex_); | |
| 732 CheckInvariants(); | |
| 733 | |
| 734 JobsIndex::iterator found = jobsIndex_.find(id); | |
| 735 | |
| 736 if (found == jobsIndex_.end()) | |
| 737 { | |
| 738 LOG(WARNING) << "Unknown job: " << id; | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
739 return false; |
| 2569 | 740 } |
| 741 else if (found->second->GetState() != JobState_Paused) | |
| 742 { | |
| 743 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
|
744 return false; |
| 2569 | 745 } |
| 746 else | |
| 747 { | |
| 748 found->second->SetState(JobState_Pending); | |
| 749 pendingJobs_.push(found->second); | |
| 750 pendingJobAvailable_.notify_one(); | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
751 CheckInvariants(); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
752 return true; |
| 2569 | 753 } |
| 754 } | |
| 755 | |
| 756 | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
757 bool JobsRegistry::Resubmit(const std::string& id) |
| 2569 | 758 { |
| 759 LOG(INFO) << "Resubmitting failed job: " << id; | |
| 760 | |
| 761 boost::mutex::scoped_lock lock(mutex_); | |
| 762 CheckInvariants(); | |
| 763 | |
| 764 JobsIndex::iterator found = jobsIndex_.find(id); | |
| 765 | |
| 766 if (found == jobsIndex_.end()) | |
| 767 { | |
| 768 LOG(WARNING) << "Unknown job: " << id; | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
769 return false; |
| 2569 | 770 } |
| 771 else if (found->second->GetState() != JobState_Failure) | |
| 772 { | |
|
2600
140a539b4eba
SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2583
diff
changeset
|
773 printf("%s\n", EnumerationToString(found->second->GetState())); |
| 2569 | 774 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
|
775 return false; |
| 2569 | 776 } |
| 777 else | |
| 778 { | |
|
2583
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
779 found->second->GetJob().SignalResubmit(); |
|
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
780 |
| 2569 | 781 bool ok = false; |
| 782 for (CompletedJobs::iterator it = completedJobs_.begin(); | |
| 783 it != completedJobs_.end(); ++it) | |
| 784 { | |
| 785 if (*it == found->second) | |
| 786 { | |
| 787 ok = true; | |
| 788 completedJobs_.erase(it); | |
| 789 break; | |
| 790 } | |
| 791 } | |
| 792 | |
| 793 assert(ok); | |
| 794 | |
| 795 found->second->SetState(JobState_Pending); | |
| 796 pendingJobs_.push(found->second); | |
| 797 pendingJobAvailable_.notify_one(); | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
798 |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
799 CheckInvariants(); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
800 return true; |
| 2569 | 801 } |
| 802 } | |
| 803 | |
| 804 | |
| 805 void JobsRegistry::ScheduleRetries() | |
| 806 { | |
| 807 boost::mutex::scoped_lock lock(mutex_); | |
| 808 CheckInvariants(); | |
| 809 | |
| 810 RetryJobs copy; | |
| 811 std::swap(copy, retryJobs_); | |
| 812 | |
| 813 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time(); | |
| 814 | |
| 815 assert(retryJobs_.empty()); | |
| 816 for (RetryJobs::iterator it = copy.begin(); it != copy.end(); ++it) | |
| 817 { | |
| 818 if ((*it)->IsRetryReady(now)) | |
| 819 { | |
| 820 LOG(INFO) << "Retrying job: " << (*it)->GetId(); | |
| 821 (*it)->SetState(JobState_Pending); | |
| 822 pendingJobs_.push(*it); | |
| 823 pendingJobAvailable_.notify_one(); | |
| 824 } | |
| 825 else | |
| 826 { | |
| 827 retryJobs_.insert(*it); | |
| 828 } | |
| 829 } | |
| 830 | |
| 831 CheckInvariants(); | |
| 832 } | |
| 833 | |
| 834 | |
| 835 bool JobsRegistry::GetState(JobState& state, | |
| 836 const std::string& id) | |
| 837 { | |
| 838 boost::mutex::scoped_lock lock(mutex_); | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
839 return GetStateInternal(state, id); |
| 2569 | 840 } |
| 841 | |
| 842 | |
| 843 JobsRegistry::RunningJob::RunningJob(JobsRegistry& registry, | |
| 844 unsigned int timeout) : | |
| 845 registry_(registry), | |
| 846 handler_(NULL), | |
| 847 targetState_(JobState_Failure), | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
848 targetRetryTimeout_(0), |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
849 canceled_(false) |
| 2569 | 850 { |
| 851 { | |
| 852 boost::mutex::scoped_lock lock(registry_.mutex_); | |
| 853 | |
| 854 while (registry_.pendingJobs_.empty()) | |
| 855 { | |
| 856 if (timeout == 0) | |
| 857 { | |
| 858 registry_.pendingJobAvailable_.wait(lock); | |
| 859 } | |
| 860 else | |
| 861 { | |
| 862 bool success = registry_.pendingJobAvailable_.timed_wait | |
| 863 (lock, boost::posix_time::milliseconds(timeout)); | |
| 864 if (!success) | |
| 865 { | |
| 866 // No pending job | |
| 867 return; | |
| 868 } | |
| 869 } | |
| 870 } | |
| 871 | |
| 872 handler_ = registry_.pendingJobs_.top(); | |
| 873 registry_.pendingJobs_.pop(); | |
| 874 | |
| 875 assert(handler_->GetState() == JobState_Pending); | |
| 876 handler_->SetState(JobState_Running); | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
877 handler_->SetLastErrorCode(ErrorCode_Success); |
| 2569 | 878 |
| 879 job_ = &handler_->GetJob(); | |
| 880 id_ = handler_->GetId(); | |
| 881 priority_ = handler_->GetPriority(); | |
| 882 } | |
| 883 } | |
| 884 | |
| 885 | |
| 886 JobsRegistry::RunningJob::~RunningJob() | |
| 887 { | |
| 888 if (IsValid()) | |
| 889 { | |
| 890 boost::mutex::scoped_lock lock(registry_.mutex_); | |
| 891 | |
| 892 switch (targetState_) | |
| 893 { | |
| 894 case JobState_Failure: | |
| 895 registry_.MarkRunningAsCompleted(*handler_, false); | |
|
2581
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 if (canceled_) |
|
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 handler_->SetLastErrorCode(ErrorCode_CanceledJob); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
900 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
901 |
| 2569 | 902 break; |
| 903 | |
| 904 case JobState_Success: | |
| 905 registry_.MarkRunningAsCompleted(*handler_, true); | |
| 906 break; | |
| 907 | |
| 908 case JobState_Paused: | |
| 909 registry_.MarkRunningAsPaused(*handler_); | |
| 910 break; | |
| 911 | |
| 912 case JobState_Retry: | |
| 913 registry_.MarkRunningAsRetry(*handler_, targetRetryTimeout_); | |
| 914 break; | |
| 915 | |
| 916 default: | |
| 917 assert(0); | |
| 918 } | |
| 919 } | |
| 920 } | |
| 921 | |
| 922 | |
| 923 bool JobsRegistry::RunningJob::IsValid() const | |
| 924 { | |
| 925 return (handler_ != NULL && | |
| 926 job_ != NULL); | |
| 927 } | |
| 928 | |
| 929 | |
| 930 const std::string& JobsRegistry::RunningJob::GetId() const | |
| 931 { | |
| 932 if (!IsValid()) | |
| 933 { | |
| 934 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 935 } | |
| 936 else | |
| 937 { | |
| 938 return id_; | |
| 939 } | |
| 940 } | |
| 941 | |
| 942 | |
| 943 int JobsRegistry::RunningJob::GetPriority() const | |
| 944 { | |
| 945 if (!IsValid()) | |
| 946 { | |
| 947 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 948 } | |
| 949 else | |
| 950 { | |
| 951 return priority_; | |
| 952 } | |
| 953 } | |
| 954 | |
| 955 | |
| 956 IJob& JobsRegistry::RunningJob::GetJob() | |
| 957 { | |
| 958 if (!IsValid()) | |
| 959 { | |
| 960 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 961 } | |
| 962 else | |
| 963 { | |
| 964 return *job_; | |
| 965 } | |
| 966 } | |
| 967 | |
| 968 | |
| 969 bool JobsRegistry::RunningJob::IsPauseScheduled() | |
| 970 { | |
| 971 if (!IsValid()) | |
| 972 { | |
| 973 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 974 } | |
| 975 else | |
| 976 { | |
| 977 boost::mutex::scoped_lock lock(registry_.mutex_); | |
| 978 registry_.CheckInvariants(); | |
| 979 assert(handler_->GetState() == JobState_Running); | |
| 980 | |
| 981 return handler_->IsPauseScheduled(); | |
| 982 } | |
| 983 } | |
| 984 | |
| 985 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
986 bool JobsRegistry::RunningJob::IsCancelScheduled() |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
987 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
988 if (!IsValid()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
989 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
990 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
991 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
992 else |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
993 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
994 boost::mutex::scoped_lock lock(registry_.mutex_); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
995 registry_.CheckInvariants(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
996 assert(handler_->GetState() == JobState_Running); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
997 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
998 return handler_->IsCancelScheduled(); |
|
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 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1001 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1002 |
| 2569 | 1003 void JobsRegistry::RunningJob::MarkSuccess() |
| 1004 { | |
| 1005 if (!IsValid()) | |
| 1006 { | |
| 1007 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 1008 } | |
| 1009 else | |
| 1010 { | |
| 1011 targetState_ = JobState_Success; | |
| 1012 } | |
| 1013 } | |
| 1014 | |
| 1015 | |
| 1016 void JobsRegistry::RunningJob::MarkFailure() | |
| 1017 { | |
| 1018 if (!IsValid()) | |
| 1019 { | |
| 1020 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 1021 } | |
| 1022 else | |
| 1023 { | |
| 1024 targetState_ = JobState_Failure; | |
| 1025 } | |
| 1026 } | |
| 1027 | |
| 1028 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1029 void JobsRegistry::RunningJob::MarkCanceled() |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1030 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1031 if (!IsValid()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1032 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1033 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1034 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1035 else |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1036 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1037 targetState_ = JobState_Failure; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1038 canceled_ = true; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1039 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1040 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1041 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
1042 |
| 2569 | 1043 void JobsRegistry::RunningJob::MarkPause() |
| 1044 { | |
| 1045 if (!IsValid()) | |
| 1046 { | |
| 1047 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 1048 } | |
| 1049 else | |
| 1050 { | |
| 1051 targetState_ = JobState_Paused; | |
| 1052 } | |
| 1053 } | |
| 1054 | |
| 1055 | |
| 1056 void JobsRegistry::RunningJob::MarkRetry(unsigned int timeout) | |
| 1057 { | |
| 1058 if (!IsValid()) | |
| 1059 { | |
| 1060 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 1061 } | |
| 1062 else | |
| 1063 { | |
| 1064 targetState_ = JobState_Retry; | |
| 1065 targetRetryTimeout_ = timeout; | |
| 1066 } | |
| 1067 } | |
| 1068 | |
| 1069 | |
| 1070 void JobsRegistry::RunningJob::UpdateStatus(ErrorCode code) | |
| 1071 { | |
| 1072 if (!IsValid()) | |
| 1073 { | |
| 1074 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 1075 } | |
| 1076 else | |
| 1077 { | |
| 1078 JobStatus status(code, *job_); | |
| 1079 | |
| 1080 boost::mutex::scoped_lock lock(registry_.mutex_); | |
| 1081 registry_.CheckInvariants(); | |
| 1082 assert(handler_->GetState() == JobState_Running); | |
| 1083 | |
| 1084 handler_->SetLastStatus(status); | |
| 1085 } | |
| 1086 } | |
| 1087 } |