annotate OrthancCppClient/ThreadedCommandProcessor.cpp @ 4:2e999f3e84b4

moves
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 02 Jun 2015 10:11:23 +0200
parents d5027f9f676a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "ThreadedCommandProcessor.h"
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
3
d5027f9f676a fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
35 #include "../Orthanc/Core/OrthancException.h"
1
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 namespace Orthanc
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 static const int32_t TIMEOUT = 10;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 void ThreadedCommandProcessor::Processor(ThreadedCommandProcessor* that)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 while (!that->done_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 std::auto_ptr<IDynamicObject> command(that->queue_.Dequeue(TIMEOUT));
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 if (command.get() != NULL)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 bool success = false;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 try
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 if (that->success_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 // No command has failed so far
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 if (that->cancel_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 // The commands have been canceled. Skip the execution
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 // of this command, yet mark it as succeeded.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 success = true;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 else
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 success = dynamic_cast<ICommand&>(*command).Execute();
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 else
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 // A command has already failed. Skip the execution of this command.
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 catch (OrthancException)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 boost::mutex::scoped_lock lock(that->mutex_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 assert(that->remainingCommands_ > 0);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 that->remainingCommands_--;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 if (!success)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 if (!that->cancel_ && that->listener_ && that->success_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 // This is the first command that fails
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 that->listener_->SignalFailure();
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 that->success_ = false;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 else
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 if (!that->cancel_ && that->listener_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 if (that->remainingCommands_ == 0)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 that->listener_->SignalSuccess(that->totalCommands_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 else
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 that->listener_->SignalProgress(that->totalCommands_ - that->remainingCommands_,
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 that->totalCommands_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 that->processedCommand_.notify_all();
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 ThreadedCommandProcessor::ThreadedCommandProcessor(unsigned int numThreads)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 if (numThreads < 1)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 throw OrthancException(ErrorCode_ParameterOutOfRange);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 listener_ = NULL;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 success_ = true;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 done_ = false;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 cancel_ = false;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 threads_.resize(numThreads);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 remainingCommands_ = 0;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 totalCommands_ = 0;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 for (unsigned int i = 0; i < numThreads; i++)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 threads_[i] = new boost::thread(Processor, this);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 ThreadedCommandProcessor::~ThreadedCommandProcessor()
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 done_ = true;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 for (unsigned int i = 0; i < threads_.size(); i++)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 boost::thread* t = threads_[i];
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 if (t != NULL)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 if (t->joinable())
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 t->join();
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 delete t;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 void ThreadedCommandProcessor::Post(ICommand* command)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 if (command == NULL)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 throw OrthancException(ErrorCode_ParameterOutOfRange);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 boost::mutex::scoped_lock lock(mutex_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 queue_.Enqueue(command);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 remainingCommands_++;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 totalCommands_++;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 bool ThreadedCommandProcessor::Join()
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 boost::mutex::scoped_lock lock(mutex_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 while (remainingCommands_ != 0)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 processedCommand_.wait(lock);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 if (cancel_ && listener_)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 listener_->SignalCancel();
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 // Reset the sequence counters for subsequent commands
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 bool hasSucceeded = success_;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 success_ = true;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 totalCommands_ = 0;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 cancel_ = false;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 return hasSucceeded;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 void ThreadedCommandProcessor::Cancel()
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 boost::mutex::scoped_lock lock(mutex_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 cancel_ = true;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 void ThreadedCommandProcessor::SetListener(IListener& listener)
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 {
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 boost::mutex::scoped_lock lock(mutex_);
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 listener_ = &listener;
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 }
fd402e53d263 new files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 }