Mercurial > hg > orthanc
annotate Core/MultiThreading/RunnableWorkersPool.cpp @ 2281:e002430baa41
Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 09 Jun 2017 16:14:52 +0200 |
| parents | a3a65de1840f |
| children | 4d500a555aad |
| rev | line source |
|---|---|
| 1679 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 1679 | 4 * Department, University Hospital of Liege, Belgium |
|
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2134
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 1679 | 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 "RunnableWorkersPool.h" | |
| 36 | |
| 37 #include "SharedMessageQueue.h" | |
| 38 #include "../OrthancException.h" | |
| 39 #include "../Logging.h" | |
| 40 | |
| 41 namespace Orthanc | |
| 42 { | |
| 43 struct RunnableWorkersPool::PImpl | |
| 44 { | |
| 45 class Worker | |
| 46 { | |
| 47 private: | |
| 48 const bool& continue_; | |
| 49 SharedMessageQueue& queue_; | |
| 50 boost::thread thread_; | |
| 51 | |
| 52 static void WorkerThread(Worker* that) | |
| 53 { | |
| 54 while (that->continue_) | |
| 55 { | |
|
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
56 try |
| 1679 | 57 { |
|
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
58 std::auto_ptr<IDynamicObject> obj(that->queue_.Dequeue(100)); |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
59 if (obj.get() != NULL) |
| 1679 | 60 { |
| 61 IRunnableBySteps& runnable = *dynamic_cast<IRunnableBySteps*>(obj.get()); | |
|
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
62 |
| 1679 | 63 bool wishToContinue = runnable.Step(); |
|
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
64 |
| 1679 | 65 if (wishToContinue) |
| 66 { | |
| 67 // The runnable wishes to continue, reinsert it at the beginning of the queue | |
| 68 that->queue_.Enqueue(obj.release()); | |
| 69 } | |
| 70 } | |
|
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
71 } |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
72 catch (OrthancException& e) |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
73 { |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
74 LOG(ERROR) << "Exception while handling some runnable object: " << e.What(); |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
75 } |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
76 catch (std::bad_alloc&) |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
77 { |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
78 LOG(ERROR) << "Not enough memory to handle some runnable object"; |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
79 } |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
80 catch (...) |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
81 { |
|
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
82 LOG(ERROR) << "Native exception while handling some runnable object"; |
| 1679 | 83 } |
| 84 } | |
| 85 } | |
| 86 | |
| 87 public: | |
| 88 Worker(const bool& globalContinue, | |
| 89 SharedMessageQueue& queue) : | |
| 90 continue_(globalContinue), | |
| 91 queue_(queue) | |
| 92 { | |
| 93 thread_ = boost::thread(WorkerThread, this); | |
| 94 } | |
| 95 | |
| 96 void Join() | |
| 97 { | |
| 98 if (thread_.joinable()) | |
| 99 { | |
| 100 thread_.join(); | |
| 101 } | |
| 102 } | |
| 103 }; | |
| 104 | |
| 105 | |
| 106 bool continue_; | |
| 107 std::vector<Worker*> workers_; | |
| 108 SharedMessageQueue queue_; | |
| 109 }; | |
| 110 | |
| 111 | |
| 112 | |
| 113 RunnableWorkersPool::RunnableWorkersPool(size_t countWorkers) : pimpl_(new PImpl) | |
| 114 { | |
| 115 pimpl_->continue_ = true; | |
| 116 | |
| 1847 | 117 if (countWorkers == 0) |
| 1679 | 118 { |
| 119 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 120 } | |
| 121 | |
| 122 pimpl_->workers_.resize(countWorkers); | |
| 123 | |
| 124 for (size_t i = 0; i < countWorkers; i++) | |
| 125 { | |
| 126 pimpl_->workers_[i] = new PImpl::Worker(pimpl_->continue_, pimpl_->queue_); | |
| 127 } | |
| 128 } | |
| 129 | |
| 130 | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
131 void RunnableWorkersPool::Stop() |
| 1679 | 132 { |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
133 if (pimpl_->continue_) |
| 1679 | 134 { |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
135 pimpl_->continue_ = false; |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
136 |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
137 for (size_t i = 0; i < pimpl_->workers_.size(); i++) |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
138 { |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
139 PImpl::Worker* worker = pimpl_->workers_[i]; |
| 1679 | 140 |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
141 if (worker != NULL) |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
142 { |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
143 worker->Join(); |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
144 delete worker; |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
145 } |
| 1679 | 146 } |
| 147 } | |
| 148 } | |
| 149 | |
| 150 | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
151 RunnableWorkersPool::~RunnableWorkersPool() |
| 1679 | 152 { |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
153 Stop(); |
| 1679 | 154 } |
| 155 | |
| 156 | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
157 void RunnableWorkersPool::Add(IRunnableBySteps* runnable) |
| 1679 | 158 { |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
159 if (!pimpl_->continue_) |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
160 { |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
161 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
162 } |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
163 |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
164 pimpl_->queue_.Enqueue(runnable); |
| 1679 | 165 } |
| 166 } |