Mercurial > hg > orthanc
annotate OrthancFramework/Sources/JobsEngine/JobsEngine.cpp @ 5040:1c08cd68250a
removed the 'name' of MainDicomTags to simplify code -> DicomMap::ParseMainDicomTags has been deprecated and one should use DicomMap::FromDicomAsJson on 'full' formatted tags
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Mon, 27 Jun 2022 12:39:51 +0200 |
| parents | 43e613a7756b |
| children | 0ea402b4d901 |
| 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 | |
|
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 | 7 * |
| 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. |
| 2569 | 12 * |
| 13 * This program is distributed in the hope that it will be useful, but | |
| 14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 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 | 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 | 21 **/ |
| 22 | |
| 23 | |
| 24 #include "../PrecompiledHeaders.h" | |
| 25 #include "JobsEngine.h" | |
| 26 | |
| 27 #include "../Logging.h" | |
| 28 #include "../OrthancException.h" | |
|
4392
3af1d763763a
confining Json::Reader and Json::*Writer into Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4295
diff
changeset
|
29 #include "../Toolbox.h" |
| 2569 | 30 |
|
2668
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
31 |
| 2569 | 32 namespace Orthanc |
| 33 { | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
34 bool JobsEngine::IsRunning() |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
35 { |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
36 boost::mutex::scoped_lock lock(stateMutex_); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
37 return (state_ == State_Running); |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
38 } |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
39 |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
40 |
| 2569 | 41 bool JobsEngine::ExecuteStep(JobsRegistry::RunningJob& running, |
| 42 size_t workerIndex) | |
| 43 { | |
| 44 assert(running.IsValid()); | |
| 45 | |
| 46 if (running.IsPauseScheduled()) | |
| 47 { | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
48 running.GetJob().Stop(JobStopReason_Paused); |
| 2569 | 49 running.MarkPause(); |
| 50 return false; | |
| 51 } | |
| 52 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
53 if (running.IsCancelScheduled()) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
54 { |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
55 running.GetJob().Stop(JobStopReason_Canceled); |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
56 running.MarkCanceled(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
57 return false; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
58 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
59 |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
60 JobStepResult result; |
| 2569 | 61 |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
62 try |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
63 { |
|
3658
2d90dd30858c
providing job ID to the IJob::Step() methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
64 result = running.GetJob().Step(running.GetId()); |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
65 } |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
66 catch (OrthancException& e) |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
67 { |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
68 result = JobStepResult::Failure(e); |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
69 } |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
70 catch (boost::bad_lexical_cast&) |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
71 { |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
72 result = JobStepResult::Failure(ErrorCode_BadFileFormat, NULL); |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
73 } |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
74 catch (...) |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
75 { |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
76 result = JobStepResult::Failure(ErrorCode_InternalError, NULL); |
| 2569 | 77 } |
| 78 | |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
79 switch (result.GetCode()) |
| 2569 | 80 { |
| 81 case JobStepCode_Success: | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
82 running.GetJob().Stop(JobStopReason_Success); |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
83 running.UpdateStatus(ErrorCode_Success, ""); |
| 2569 | 84 running.MarkSuccess(); |
| 85 return false; | |
| 86 | |
| 87 case JobStepCode_Failure: | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
88 running.GetJob().Stop(JobStopReason_Failure); |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
89 running.UpdateStatus(result.GetFailureCode(), result.GetFailureDetails()); |
| 2569 | 90 running.MarkFailure(); |
| 91 return false; | |
| 92 | |
| 93 case JobStepCode_Retry: | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
94 running.GetJob().Stop(JobStopReason_Retry); |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
95 running.UpdateStatus(ErrorCode_Success, ""); |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2591
diff
changeset
|
96 running.MarkRetry(result.GetRetryTimeout()); |
| 2569 | 97 return false; |
| 98 | |
| 99 case JobStepCode_Continue: | |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
100 running.UpdateStatus(ErrorCode_Success, ""); |
| 2569 | 101 return true; |
| 102 | |
| 103 default: | |
| 104 throw OrthancException(ErrorCode_InternalError); | |
| 105 } | |
| 106 } | |
| 107 | |
| 108 | |
| 109 void JobsEngine::RetryHandler(JobsEngine* engine) | |
| 110 { | |
| 111 assert(engine != NULL); | |
| 112 | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
113 while (engine->IsRunning()) |
| 2569 | 114 { |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
115 boost::this_thread::sleep(boost::posix_time::milliseconds(engine->threadSleep_)); |
| 2569 | 116 engine->GetRegistry().ScheduleRetries(); |
| 117 } | |
| 118 } | |
| 119 | |
| 120 | |
| 121 void JobsEngine::Worker(JobsEngine* engine, | |
| 122 size_t workerIndex) | |
| 123 { | |
| 124 assert(engine != NULL); | |
| 125 | |
| 4295 | 126 CLOG(INFO, JOBS) << "Worker thread " << workerIndex << " has started"; |
| 2569 | 127 |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
128 while (engine->IsRunning()) |
| 2569 | 129 { |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
130 JobsRegistry::RunningJob running(engine->GetRegistry(), engine->threadSleep_); |
| 2569 | 131 |
| 132 if (running.IsValid()) | |
| 133 { | |
| 4295 | 134 CLOG(INFO, JOBS) << "Executing job with priority " << running.GetPriority() |
| 135 << " in worker thread " << workerIndex << ": " << running.GetId(); | |
|
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
136 |
|
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2570
diff
changeset
|
137 while (engine->IsRunning()) |
| 2569 | 138 { |
| 139 if (!engine->ExecuteStep(running, workerIndex)) | |
| 140 { | |
| 141 break; | |
| 142 } | |
| 143 } | |
| 144 } | |
| 145 } | |
| 146 } | |
| 147 | |
| 148 | |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
149 JobsEngine::JobsEngine(size_t maxCompletedJobs) : |
| 2569 | 150 state_(State_Setup), |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
151 registry_(new JobsRegistry(maxCompletedJobs)), |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
152 threadSleep_(200), |
| 2569 | 153 workers_(1) |
| 154 { | |
| 155 } | |
| 156 | |
| 157 | |
| 158 JobsEngine::~JobsEngine() | |
| 159 { | |
| 160 if (state_ != State_Setup && | |
| 161 state_ != State_Done) | |
| 162 { | |
| 4295 | 163 CLOG(ERROR, JOBS) << "INTERNAL ERROR: JobsEngine::Stop() should be invoked manually to avoid mess in the destruction order!"; |
| 2569 | 164 Stop(); |
| 165 } | |
| 166 } | |
| 167 | |
|
2668
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
168 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
169 JobsRegistry& JobsEngine::GetRegistry() |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
170 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
171 if (registry_.get() == NULL) |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
172 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
173 throw OrthancException(ErrorCode_InternalError); |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
174 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
175 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
176 return *registry_; |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
177 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
178 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
179 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
180 void JobsEngine::LoadRegistryFromJson(IJobUnserializer& unserializer, |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
181 const Json::Value& serialized) |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
182 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
183 boost::mutex::scoped_lock lock(stateMutex_); |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
184 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
185 if (state_ != State_Setup) |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
186 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
187 // Can only be invoked before calling "Start()" |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
188 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
189 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
190 |
|
2950
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
191 assert(registry_.get() != NULL); |
|
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
192 const size_t maxCompletedJobs = registry_->GetMaxCompletedJobs(); |
|
dc18d5804746
support of JobsHistorySize set to zero
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
193 registry_.reset(new JobsRegistry(unserializer, serialized, maxCompletedJobs)); |
|
2668
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
194 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
195 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
196 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
197 void JobsEngine::LoadRegistryFromString(IJobUnserializer& unserializer, |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
198 const std::string& serialized) |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
199 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
200 Json::Value value; |
|
4392
3af1d763763a
confining Json::Reader and Json::*Writer into Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4295
diff
changeset
|
201 if (Toolbox::ReadJson(value, serialized)) |
|
2668
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
202 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
203 LoadRegistryFromJson(unserializer, value); |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
204 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
205 else |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
206 { |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
207 throw OrthancException(ErrorCode_BadFileFormat); |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
208 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
209 } |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
210 |
|
d26dd081df97
saving jobs engine on exit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
211 |
| 2569 | 212 void JobsEngine::SetWorkersCount(size_t count) |
| 213 { | |
| 214 boost::mutex::scoped_lock lock(stateMutex_); | |
| 215 | |
| 216 if (state_ != State_Setup) | |
| 217 { | |
| 218 // Can only be invoked before calling "Start()" | |
| 219 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 220 } | |
| 221 | |
| 222 workers_.resize(count); | |
| 223 } | |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
224 |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
225 |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
226 void JobsEngine::SetThreadSleep(unsigned int sleep) |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
227 { |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
228 boost::mutex::scoped_lock lock(stateMutex_); |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
229 |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
230 if (state_ != State_Setup) |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
231 { |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
232 // Can only be invoked before calling "Start()" |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
233 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
234 } |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
235 |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
236 threadSleep_ = sleep; |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
237 } |
|
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2598
diff
changeset
|
238 |
| 2569 | 239 |
| 240 void JobsEngine::Start() | |
| 241 { | |
| 242 boost::mutex::scoped_lock lock(stateMutex_); | |
| 243 | |
| 244 if (state_ != State_Setup) | |
| 245 { | |
| 246 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 247 } | |
| 248 | |
| 249 retryHandler_ = boost::thread(RetryHandler, this); | |
| 250 | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
251 if (workers_.size() == 0) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
252 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
253 // Use all the available CPUs |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
254 size_t n = boost::thread::hardware_concurrency(); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
255 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
256 if (n == 0) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
257 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
258 n = 1; |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
259 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
260 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
261 workers_.resize(n); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
262 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
263 |
| 2569 | 264 for (size_t i = 0; i < workers_.size(); i++) |
| 265 { | |
|
2591
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
266 assert(workers_[i] == NULL); |
|
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
267 workers_[i] = new boost::thread(Worker, this, i); |
| 2569 | 268 } |
| 269 | |
| 270 state_ = State_Running; | |
| 271 | |
| 4295 | 272 CLOG(WARNING, JOBS) << "The jobs engine has started with " << workers_.size() << " threads"; |
| 2569 | 273 } |
| 274 | |
| 275 | |
| 276 void JobsEngine::Stop() | |
| 277 { | |
| 278 { | |
| 279 boost::mutex::scoped_lock lock(stateMutex_); | |
| 280 | |
| 281 if (state_ != State_Running) | |
| 282 { | |
| 283 return; | |
| 284 } | |
| 285 | |
| 286 state_ = State_Stopping; | |
| 287 } | |
| 288 | |
| 4295 | 289 CLOG(INFO, JOBS) << "Stopping the jobs engine"; |
| 2569 | 290 |
| 291 if (retryHandler_.joinable()) | |
| 292 { | |
| 293 retryHandler_.join(); | |
| 294 } | |
| 295 | |
| 296 for (size_t i = 0; i < workers_.size(); i++) | |
| 297 { | |
|
2591
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
298 assert(workers_[i] != NULL); |
|
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
299 |
|
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
300 if (workers_[i]->joinable()) |
| 2569 | 301 { |
|
2591
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
302 workers_[i]->join(); |
| 2569 | 303 } |
|
2591
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
304 |
|
441f23af9d89
fix for older releases of boost::thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
305 delete workers_[i]; |
| 2569 | 306 } |
| 307 | |
| 308 { | |
| 309 boost::mutex::scoped_lock lock(stateMutex_); | |
| 310 state_ = State_Done; | |
| 311 } | |
| 312 | |
| 4295 | 313 CLOG(WARNING, JOBS) << "The jobs engine has stopped"; |
| 2569 | 314 } |
| 315 } |