Mercurial > hg > orthanc-stone
annotate Framework/Oracle/ThreadedOracle.cpp @ 1126:a8c3908ecba9 broker
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 Nov 2019 18:54:06 +0100 |
parents | a8bf81756839 |
children | 8e3763d1736a |
rev | line source |
---|---|
748 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017-2019 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 Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "ThreadedOracle.h" | |
23 | |
24 #include "SleepOracleCommand.h" | |
25 | |
1077 | 26 #include <Core/Logging.h> |
748 | 27 #include <Core/OrthancException.h> |
28 | |
29 namespace OrthancStone | |
30 { | |
31 class ThreadedOracle::Item : public Orthanc::IDynamicObject | |
32 { | |
33 private: | |
1075 | 34 boost::weak_ptr<IObserver> receiver_; |
748 | 35 std::auto_ptr<IOracleCommand> command_; |
36 | |
37 public: | |
1075 | 38 Item(boost::weak_ptr<IObserver> receiver, |
748 | 39 IOracleCommand* command) : |
40 receiver_(receiver), | |
41 command_(command) | |
42 { | |
43 if (command == NULL) | |
44 { | |
45 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
46 } | |
47 } | |
48 | |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
49 boost::weak_ptr<IObserver> GetReceiver() |
748 | 50 { |
51 return receiver_; | |
52 } | |
53 | |
54 IOracleCommand& GetCommand() | |
55 { | |
56 assert(command_.get() != NULL); | |
57 return *command_; | |
58 } | |
59 }; | |
60 | |
61 | |
62 class ThreadedOracle::SleepingCommands : public boost::noncopyable | |
63 { | |
64 private: | |
65 class Item | |
66 { | |
67 private: | |
1075 | 68 boost::weak_ptr<IObserver> receiver_; |
748 | 69 std::auto_ptr<SleepOracleCommand> command_; |
70 boost::posix_time::ptime expiration_; | |
71 | |
72 public: | |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
73 Item(boost::weak_ptr<IObserver> receiver, |
748 | 74 SleepOracleCommand* command) : |
75 receiver_(receiver), | |
76 command_(command) | |
77 { | |
78 if (command == NULL) | |
79 { | |
80 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
81 } | |
82 | |
760
1181e1ad98ec
progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
748
diff
changeset
|
83 expiration_ = (boost::posix_time::microsec_clock::local_time() + |
748 | 84 boost::posix_time::milliseconds(command_->GetDelay())); |
85 } | |
86 | |
87 const boost::posix_time::ptime& GetExpirationTime() const | |
88 { | |
89 return expiration_; | |
90 } | |
91 | |
92 void Awake(IMessageEmitter& emitter) | |
93 { | |
94 assert(command_.get() != NULL); | |
95 | |
96 SleepOracleCommand::TimeoutMessage message(*command_); | |
97 emitter.EmitMessage(receiver_, message); | |
98 } | |
99 }; | |
100 | |
101 typedef std::list<Item*> Content; | |
102 | |
103 boost::mutex mutex_; | |
104 Content content_; | |
105 | |
106 public: | |
107 ~SleepingCommands() | |
108 { | |
109 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
110 { | |
111 if (*it != NULL) | |
112 { | |
113 delete *it; | |
114 } | |
115 } | |
116 } | |
117 | |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
118 void Add(boost::weak_ptr<IObserver> receiver, |
748 | 119 SleepOracleCommand* command) // Takes ownership |
120 { | |
121 boost::mutex::scoped_lock lock(mutex_); | |
122 | |
123 content_.push_back(new Item(receiver, command)); | |
124 } | |
125 | |
126 void AwakeExpired(IMessageEmitter& emitter) | |
127 { | |
128 boost::mutex::scoped_lock lock(mutex_); | |
129 | |
760
1181e1ad98ec
progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
748
diff
changeset
|
130 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time(); |
748 | 131 |
132 Content stillSleeping; | |
133 | |
134 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
135 { | |
136 if (*it != NULL && | |
137 (*it)->GetExpirationTime() <= now) | |
138 { | |
139 (*it)->Awake(emitter); | |
140 delete *it; | |
141 *it = NULL; | |
142 } | |
143 else | |
144 { | |
145 stillSleeping.push_back(*it); | |
146 } | |
147 } | |
148 | |
149 // Compact the still-sleeping commands | |
150 content_ = stillSleeping; | |
151 } | |
152 }; | |
153 | |
154 | |
155 void ThreadedOracle::Step() | |
156 { | |
157 std::auto_ptr<Orthanc::IDynamicObject> object(queue_.Dequeue(100)); | |
158 | |
159 if (object.get() != NULL) | |
160 { | |
161 Item& item = dynamic_cast<Item&>(*object); | |
162 | |
1077 | 163 if (item.GetCommand().GetType() == IOracleCommand::Type_Sleep) |
748 | 164 { |
1077 | 165 SleepOracleCommand& command = dynamic_cast<SleepOracleCommand&>(item.GetCommand()); |
166 | |
167 std::auto_ptr<SleepOracleCommand> copy(new SleepOracleCommand(command.GetDelay())); | |
168 | |
169 if (command.HasPayload()) | |
748 | 170 { |
1077 | 171 copy->SetPayload(command.ReleasePayload()); |
748 | 172 } |
1077 | 173 |
174 sleepingCommands_->Add(item.GetReceiver(), copy.release()); | |
748 | 175 } |
1077 | 176 else |
748 | 177 { |
1104 | 178 GenericOracleRunner runner; |
1109
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
179 |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
180 { |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
181 boost::mutex::scoped_lock lock(mutex_); |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
182 runner.SetOrthanc(orthanc_); |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
183 runner.SetRootDirectory(rootDirectory_); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
184 |
1126 | 185 #if ORTHANC_ENABLE_DCMTK == 1 |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
186 if (dicomCache_) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
187 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
188 runner.SetDicomCache(dicomCache_); |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
189 } |
1126 | 190 #endif |
1109
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
191 } |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
192 |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
193 std::auto_ptr<IMessage> message(runner.Run(item.GetCommand())); |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
194 |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
195 emitter_.EmitMessage(item.GetReceiver(), *message); |
748 | 196 } |
197 } | |
198 } | |
199 | |
200 | |
201 void ThreadedOracle::Worker(ThreadedOracle* that) | |
202 { | |
203 assert(that != NULL); | |
204 | |
205 for (;;) | |
206 { | |
207 { | |
208 boost::mutex::scoped_lock lock(that->mutex_); | |
209 if (that->state_ != State_Running) | |
210 { | |
211 return; | |
212 } | |
213 } | |
214 | |
215 that->Step(); | |
216 } | |
217 } | |
218 | |
219 | |
220 void ThreadedOracle::SleepingWorker(ThreadedOracle* that) | |
221 { | |
222 assert(that != NULL); | |
223 | |
224 for (;;) | |
225 { | |
226 { | |
227 boost::mutex::scoped_lock lock(that->mutex_); | |
228 if (that->state_ != State_Running) | |
229 { | |
230 return; | |
231 } | |
232 } | |
233 | |
234 that->sleepingCommands_->AwakeExpired(that->emitter_); | |
235 | |
236 boost::this_thread::sleep(boost::posix_time::milliseconds(that->sleepingTimeResolution_)); | |
237 } | |
238 } | |
239 | |
240 | |
241 void ThreadedOracle::StopInternal() | |
242 { | |
243 { | |
244 boost::mutex::scoped_lock lock(mutex_); | |
245 | |
246 if (state_ == State_Setup || | |
247 state_ == State_Stopped) | |
248 { | |
249 return; | |
250 } | |
251 else | |
252 { | |
253 state_ = State_Stopped; | |
254 } | |
255 } | |
256 | |
257 if (sleepingWorker_.joinable()) | |
258 { | |
259 sleepingWorker_.join(); | |
260 } | |
261 | |
262 for (size_t i = 0; i < workers_.size(); i++) | |
263 { | |
264 if (workers_[i] != NULL) | |
265 { | |
266 if (workers_[i]->joinable()) | |
267 { | |
268 workers_[i]->join(); | |
269 } | |
270 | |
271 delete workers_[i]; | |
272 } | |
273 } | |
274 } | |
275 | |
276 | |
277 ThreadedOracle::ThreadedOracle(IMessageEmitter& emitter) : | |
278 emitter_(emitter), | |
1109
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
279 rootDirectory_("."), |
748 | 280 state_(State_Setup), |
281 workers_(4), | |
282 sleepingCommands_(new SleepingCommands), | |
283 sleepingTimeResolution_(50) // By default, time resolution of 50ms | |
284 { | |
285 } | |
286 | |
287 | |
765 | 288 ThreadedOracle::~ThreadedOracle() |
289 { | |
290 if (state_ == State_Running) | |
291 { | |
292 LOG(ERROR) << "The threaded oracle is still running, explicit call to " | |
293 << "Stop() is mandatory to avoid crashes"; | |
294 } | |
295 | |
296 try | |
297 { | |
298 StopInternal(); | |
299 } | |
300 catch (Orthanc::OrthancException& e) | |
301 { | |
302 LOG(ERROR) << "Exception while stopping the threaded oracle: " << e.What(); | |
303 } | |
304 catch (...) | |
305 { | |
306 LOG(ERROR) << "Native exception while stopping the threaded oracle"; | |
1097
4383382db01d
deprecating LockingEmitter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
307 } |
765 | 308 } |
309 | |
310 | |
748 | 311 void ThreadedOracle::SetOrthancParameters(const Orthanc::WebServiceParameters& orthanc) |
312 { | |
313 boost::mutex::scoped_lock lock(mutex_); | |
1109
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
314 orthanc_ = orthanc; |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
315 } |
748 | 316 |
1109
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
317 |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
318 void ThreadedOracle::SetRootDirectory(const std::string& rootDirectory) |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
319 { |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
320 boost::mutex::scoped_lock lock(mutex_); |
79b1b541fe15
ThreadedOracle::SetRootDirectory()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
321 rootDirectory_ = rootDirectory; |
748 | 322 } |
323 | |
324 | |
760
1181e1ad98ec
progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
748
diff
changeset
|
325 void ThreadedOracle::SetThreadsCount(unsigned int count) |
748 | 326 { |
327 boost::mutex::scoped_lock lock(mutex_); | |
328 | |
329 if (count <= 0) | |
330 { | |
331 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
332 } | |
333 else if (state_ != State_Setup) | |
334 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
335 LOG(ERROR) << "ThreadedOracle::SetThreadsCount(): (state_ != State_Setup)"; |
748 | 336 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
337 } | |
338 else | |
339 { | |
340 workers_.resize(count); | |
341 } | |
342 } | |
343 | |
344 | |
345 void ThreadedOracle::SetSleepingTimeResolution(unsigned int milliseconds) | |
346 { | |
347 boost::mutex::scoped_lock lock(mutex_); | |
348 | |
349 if (milliseconds <= 0) | |
350 { | |
351 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
352 } | |
353 else if (state_ != State_Setup) | |
354 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
355 LOG(ERROR) << "ThreadedOracle::SetSleepingTimeResolution(): (state_ != State_Setup)"; |
748 | 356 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
357 } | |
358 else | |
359 { | |
360 sleepingTimeResolution_ = milliseconds; | |
361 } | |
362 } | |
363 | |
364 | |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
365 void ThreadedOracle::SetDicomCacheSize(size_t size) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
366 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
367 #if ORTHANC_ENABLE_DCMTK == 1 |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
368 boost::mutex::scoped_lock lock(mutex_); |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
369 |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
370 if (state_ != State_Setup) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
371 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
372 LOG(ERROR) << "ThreadedOracle::SetDicomCacheSize(): (state_ != State_Setup)"; |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
373 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
374 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
375 else |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
376 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
377 if (size == 0) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
378 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
379 dicomCache_.reset(); |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
380 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
381 else |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
382 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
383 dicomCache_.reset(new ParsedDicomFileCache(size)); |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
384 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
385 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
386 #endif |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
387 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
388 |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1109
diff
changeset
|
389 |
748 | 390 void ThreadedOracle::Start() |
391 { | |
392 boost::mutex::scoped_lock lock(mutex_); | |
393 | |
394 if (state_ != State_Setup) | |
395 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
396 LOG(ERROR) << "ThreadedOracle::Start(): (state_ != State_Setup)"; |
748 | 397 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
398 } | |
399 else | |
400 { | |
401 state_ = State_Running; | |
402 | |
403 for (unsigned int i = 0; i < workers_.size(); i++) | |
404 { | |
405 workers_[i] = new boost::thread(Worker, this); | |
406 } | |
407 | |
408 sleepingWorker_ = boost::thread(SleepingWorker, this); | |
409 } | |
410 } | |
411 | |
412 | |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
413 bool ThreadedOracle::Schedule(boost::shared_ptr<IObserver> receiver, |
748 | 414 IOracleCommand* command) |
415 { | |
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
416 std::auto_ptr<Item> item(new Item(receiver, command)); |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
417 |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
418 { |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
419 boost::mutex::scoped_lock lock(mutex_); |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
420 |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
421 if (state_ == State_Running) |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
422 { |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
423 //LOG(INFO) << "New oracle command queued"; |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
424 queue_.Enqueue(item.release()); |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
425 return true; |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
426 } |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
427 else |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
428 { |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
429 LOG(INFO) << "Command not enqueued, as the oracle is stopped"; |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
430 return false; |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
431 } |
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1097
diff
changeset
|
432 } |
748 | 433 } |
434 } |