annotate OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp @ 5798:ebd828518719 find-refactoring tip

merged default -> find-refactoring
author Alain Mazy <am@orthanc.team>
date Fri, 20 Sep 2024 08:20:55 +0200
parents f7adfb22e20e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1847
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
5640
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485
48b8dae6dc77 upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5450
diff changeset
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 *
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * 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
10 * 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
11 * 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
12 * the License, or (at your option) any later version.
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 *
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * This program is distributed in the hope that it will be useful, but
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * WITHOUT ANY WARRANTY; without even the implied warranty of
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * 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
17 * Lesser General Public License for more details.
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 *
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
19 * 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
20 * 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
21 * <http://www.gnu.org/licenses/>.
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 **/
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../PrecompiledHeaders.h"
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "RunnableWorkersPool.h"
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include "SharedMessageQueue.h"
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
29 #include "../Compatibility.h"
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 #include "../OrthancException.h"
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include "../Logging.h"
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 namespace Orthanc
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 struct RunnableWorkersPool::PImpl
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 class Worker
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 private:
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 const bool& continue_;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 SharedMessageQueue& queue_;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 boost::thread thread_;
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
43 std::string name_;
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 static void WorkerThread(Worker* that)
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 {
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
47 Logging::SetCurrentThreadName(that->name_);
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
48
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 while (that->continue_)
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
2134
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
51 try
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 {
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
53 std::unique_ptr<IDynamicObject> obj(that->queue_.Dequeue(100));
2134
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
54 if (obj.get() != NULL)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 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
57
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 bool wishToContinue = runnable.Step();
2134
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
59
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 if (wishToContinue)
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 // The runnable wishes to continue, reinsert it at the beginning of the queue
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 that->queue_.Enqueue(obj.release());
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 }
2134
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
66 }
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
67 catch (OrthancException& e)
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
68 {
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
69 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
70 }
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
71 catch (std::bad_alloc&)
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
72 {
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
73 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
74 }
2290
4d500a555aad catching std::exception before (...) to try to get more debug info
Alain Mazy <alain@mazy.be>
parents: 2244
diff changeset
75 catch (std::exception& e)
4d500a555aad catching std::exception before (...) to try to get more debug info
Alain Mazy <alain@mazy.be>
parents: 2244
diff changeset
76 {
2291
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2290
diff changeset
77 LOG(ERROR) << "std::exception while handling some runnable object: " << e.what();
2290
4d500a555aad catching std::exception before (...) to try to get more debug info
Alain Mazy <alain@mazy.be>
parents: 2244
diff changeset
78 }
2134
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
79 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
80 {
ddc75c6c712d Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
81 LOG(ERROR) << "Native exception while handling some runnable object";
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 public:
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 Worker(const bool& globalContinue,
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
88 SharedMessageQueue& queue,
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
89 const std::string& name) :
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 continue_(globalContinue),
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
91 queue_(queue),
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
92 name_(name)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 thread_ = boost::thread(WorkerThread, this);
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 void Join()
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 if (thread_.joinable())
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 thread_.join();
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 };
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 bool continue_;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 std::vector<Worker*> workers_;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 SharedMessageQueue queue_;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 };
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
114 RunnableWorkersPool::RunnableWorkersPool(size_t countWorkers, const std::string& name) : pimpl_(new PImpl)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 pimpl_->continue_ = true;
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
1847
559956d5ceb2 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
118 if (countWorkers == 0)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 {
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 throw OrthancException(ErrorCode_ParameterOutOfRange);
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 pimpl_->workers_.resize(countWorkers);
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 for (size_t i = 0; i < countWorkers; i++)
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 {
5450
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
127 std::string workerName = name + boost::lexical_cast<std::string>(i);
9ffd6d18daf3 log lines now contain the thread name
Alain Mazy <am@osimis.io>
parents: 5185
diff changeset
128 pimpl_->workers_[i] = new PImpl::Worker(pimpl_->continue_, pimpl_->queue_, workerName);
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
133 void RunnableWorkersPool::Stop()
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
135 if (pimpl_->continue_)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 {
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
137 pimpl_->continue_ = false;
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 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
140 {
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
141 PImpl::Worker* worker = pimpl_->workers_[i];
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
143 if (worker != NULL)
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
144 {
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
145 worker->Join();
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
146 delete worker;
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
147 }
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
153 RunnableWorkersPool::~RunnableWorkersPool()
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 {
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
155 Stop();
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
159 void RunnableWorkersPool::Add(IRunnableBySteps* runnable)
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
1681
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
161 if (!pimpl_->continue_)
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 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
164 }
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
165
ee4367497d0d got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
166 pimpl_->queue_.Enqueue(runnable);
1679
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 }
15acdb19d520 RunnableWorkersPool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 }