annotate Framework/MultiThreading/BagOfTasksProcessor.cpp @ 254:20a730889ae2

upgrade to 2023
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Jul 2023 17:38:07 +0200
parents 49f647ed1b4c
children 7020852a8fa9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
254
20a730889ae2 upgrade to 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 242
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
20a730889ae2 upgrade to 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 242
diff changeset
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * This program is free software: you can redistribute it and/or
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * modify it under the terms of the GNU Affero General Public License
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * the License, or (at your option) any later version.
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful, but
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * Affero General Public License for more details.
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 *
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * You should have received a copy of the GNU Affero General Public License
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "BagOfTasksProcessor.h"
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
199
a1c265cb2174 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
25 #include <Compatibility.h> // For std::unique_ptr
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
26 #include <Logging.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
27 #include <OrthancException.h>
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
236
b0ee417b667a migrating new definitions in namespace Orthanc to namespace OrthancWSI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
31 namespace OrthancWSI
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 {
236
b0ee417b667a migrating new definitions in namespace Orthanc to namespace OrthancWSI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
33 class BagOfTasksProcessor::Task : public Orthanc::IDynamicObject
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 private:
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 uint64_t bag_;
199
a1c265cb2174 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
37 std::unique_ptr<ICommand> command_;
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 public:
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 Task(uint64_t bag,
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 ICommand* command) :
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 bag_(bag),
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 command_(command)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 bool Execute()
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 try
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 return command_->Execute();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 }
236
b0ee417b667a migrating new definitions in namespace Orthanc to namespace OrthancWSI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
53 catch (Orthanc::OrthancException& e)
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 LOG(ERROR) << "Exception while processing a bag of tasks: " << e.What();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 return false;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 catch (std::runtime_error& e)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 LOG(ERROR) << "Runtime exception while processing a bag of tasks: " << e.what();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 return false;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 catch (...)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 LOG(ERROR) << "Native exception while processing a bag of tasks";
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 return false;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 uint64_t GetBag()
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 return bag_;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 };
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 void BagOfTasksProcessor::SignalProgress(Task& task,
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 Bag& bag)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 assert(bag.done_ < bag.size_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 bag.done_ += 1;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 if (bag.done_ == bag.size_)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 exitStatus_[task.GetBag()] = (bag.status_ == BagStatus_Running);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 bagFinished_.notify_all();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 void BagOfTasksProcessor::Worker(BagOfTasksProcessor* that)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 while (that->continue_)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
236
b0ee417b667a migrating new definitions in namespace Orthanc to namespace OrthancWSI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
95 std::unique_ptr<Orthanc::IDynamicObject> obj(that->queue_.Dequeue(100));
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 if (obj.get() != NULL)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 Task& task = *dynamic_cast<Task*>(obj.get());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 boost::mutex::scoped_lock lock(that->mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 Bags::iterator bag = that->bags_.find(task.GetBag());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 assert(bag != that->bags_.end());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 assert(bag->second.done_ < bag->second.size_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 if (bag->second.status_ != BagStatus_Running)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 // Do not execute this task, as its parent bag of tasks
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 // has failed or is tagged as canceled
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 that->SignalProgress(task, bag->second);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 continue;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 bool success = task.Execute();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 boost::mutex::scoped_lock lock(that->mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 Bags::iterator bag = that->bags_.find(task.GetBag());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 assert(bag != that->bags_.end());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 if (!success)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 bag->second.status_ = BagStatus_Failed;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 that->SignalProgress(task, bag->second);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 void BagOfTasksProcessor::Cancel(int64_t bag)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 boost::mutex::scoped_lock lock(mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 Bags::iterator it = bags_.find(bag);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 if (it != bags_.end())
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 it->second.status_ = BagStatus_Canceled;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 bool BagOfTasksProcessor::Join(int64_t bag)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 boost::mutex::scoped_lock lock(mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 while (continue_)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 ExitStatus::iterator it = exitStatus_.find(bag);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 if (it == exitStatus_.end()) // The bag is still running
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 bagFinished_.wait(lock);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 else
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 bool status = it->second;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 exitStatus_.erase(it);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 return status;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 return false; // The processor is stopping
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 float BagOfTasksProcessor::GetProgress(int64_t bag)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 boost::mutex::scoped_lock lock(mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 Bags::const_iterator it = bags_.find(bag);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 if (it == bags_.end())
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 // The bag of tasks has finished
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 return 1.0f;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 else
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 return (static_cast<float>(it->second.done_) /
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 static_cast<float>(it->second.size_));
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 bool BagOfTasksProcessor::Handle::Join()
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 if (hasJoined_)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 return status_;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 else
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 status_ = that_.Join(bag_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 hasJoined_ = true;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 return status_;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 BagOfTasksProcessor::BagOfTasksProcessor(size_t countThreads) :
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 countBags_(0),
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 continue_(true)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 if (countThreads == 0)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 {
236
b0ee417b667a migrating new definitions in namespace Orthanc to namespace OrthancWSI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
210 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
151
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 threads_.resize(countThreads);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 for (size_t i = 0; i < threads_.size(); i++)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 threads_[i] = new boost::thread(Worker, this);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 BagOfTasksProcessor::~BagOfTasksProcessor()
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 continue_ = false;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 bagFinished_.notify_all(); // Wakes up all the pending "Join()"
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 for (size_t i = 0; i < threads_.size(); i++)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 if (threads_[i])
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 if (threads_[i]->joinable())
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 threads_[i]->join();
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 delete threads_[i];
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 threads_[i] = NULL;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 BagOfTasksProcessor::Handle* BagOfTasksProcessor::Submit(BagOfTasks& tasks)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 if (tasks.GetSize() == 0)
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 return new Handle(*this, 0, true);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 boost::mutex::scoped_lock lock(mutex_);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 uint64_t id = countBags_;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 countBags_ += 1;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 Bag bag(tasks.GetSize());
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 bags_[id] = bag;
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 while (!tasks.IsEmpty())
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 {
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 queue_.Enqueue(new Task(id, tasks.Pop()));
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 return new Handle(*this, id, false);
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 }
fb8d4cd2f618 fix applications
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 }