Mercurial > hg > orthanc
annotate UnitTestsSources/MultiThreadingTests.cpp @ 2562:1e66fe3ddf9f jobs
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 04 May 2018 17:28:47 +0200 |
parents | 9b7680dee75d |
children | 98dfc1948d00 |
rev | line source |
---|---|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
1 /** |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1009
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
6 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
10 * License, or (at your option) any later version. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
11 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
13 * program give permission to link the code of its release with the |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
22 * in the program, then also delete it here. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
23 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
27 * General Public License for more details. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
28 * |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
31 **/ |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
32 |
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
33 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
34 #include "PrecompiledHeadersUnitTests.h" |
723 | 35 #include "gtest/gtest.h" |
36 | |
781 | 37 #include "../OrthancServer/Scheduler/ServerScheduler.h" |
723 | 38 #include "../Core/OrthancException.h" |
2143
fd5875662670
creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2140
diff
changeset
|
39 #include "../Core/SystemToolbox.h" |
723 | 40 #include "../Core/Toolbox.h" |
760 | 41 #include "../Core/MultiThreading/Locker.h" |
42 #include "../Core/MultiThreading/Mutex.h" | |
43 #include "../Core/MultiThreading/ReaderWriterLock.h" | |
723 | 44 |
45 using namespace Orthanc; | |
46 | |
47 namespace | |
48 { | |
1396
ac4efabeb80c
Migration of the orthanc-client as a separate project
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1304
diff
changeset
|
49 class DynamicInteger : public IDynamicObject |
723 | 50 { |
51 private: | |
52 int value_; | |
53 std::set<int>& target_; | |
54 | |
55 public: | |
56 DynamicInteger(int value, std::set<int>& target) : | |
57 value_(value), target_(target) | |
58 { | |
59 } | |
60 | |
61 int GetValue() const | |
62 { | |
63 return value_; | |
64 } | |
65 }; | |
66 } | |
67 | |
68 | |
69 TEST(MultiThreading, SharedMessageQueueBasic) | |
70 { | |
71 std::set<int> s; | |
72 | |
73 SharedMessageQueue q; | |
74 ASSERT_TRUE(q.WaitEmpty(0)); | |
75 q.Enqueue(new DynamicInteger(10, s)); | |
76 ASSERT_FALSE(q.WaitEmpty(1)); | |
77 q.Enqueue(new DynamicInteger(20, s)); | |
78 q.Enqueue(new DynamicInteger(30, s)); | |
79 q.Enqueue(new DynamicInteger(40, s)); | |
80 | |
81 std::auto_ptr<DynamicInteger> i; | |
82 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(10, i->GetValue()); | |
83 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(20, i->GetValue()); | |
84 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(30, i->GetValue()); | |
85 ASSERT_FALSE(q.WaitEmpty(1)); | |
86 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(40, i->GetValue()); | |
87 ASSERT_TRUE(q.WaitEmpty(0)); | |
88 ASSERT_EQ(NULL, q.Dequeue(1)); | |
89 } | |
90 | |
91 | |
92 TEST(MultiThreading, SharedMessageQueueClean) | |
93 { | |
94 std::set<int> s; | |
95 | |
96 try | |
97 { | |
98 SharedMessageQueue q; | |
99 q.Enqueue(new DynamicInteger(10, s)); | |
100 q.Enqueue(new DynamicInteger(20, s)); | |
1583
9ea3d082b064
got rid of custom exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
101 throw OrthancException(ErrorCode_InternalError); |
723 | 102 } |
103 catch (OrthancException&) | |
104 { | |
105 } | |
106 } | |
107 | |
108 | |
760 | 109 TEST(MultiThreading, Mutex) |
110 { | |
111 Mutex mutex; | |
112 Locker locker(mutex); | |
113 } | |
114 | |
115 | |
116 TEST(MultiThreading, ReaderWriterLock) | |
117 { | |
118 ReaderWriterLock lock; | |
119 | |
120 { | |
121 Locker locker1(lock.ForReader()); | |
122 Locker locker2(lock.ForReader()); | |
123 } | |
124 | |
125 { | |
126 Locker locker3(lock.ForWriter()); | |
127 } | |
128 } | |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
129 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
130 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
131 |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
132 #include "../Core/DicomNetworking/ReusableDicomUserConnection.h" |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
133 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
134 TEST(ReusableDicomUserConnection, DISABLED_Basic) |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
135 { |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
136 ReusableDicomUserConnection c; |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
137 c.SetMillisecondsBeforeClose(200); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
138 printf("START\n"); fflush(stdout); |
775
d3ba35466225
integration mainline -> lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
139 |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
140 { |
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
141 RemoteModalityParameters remote("STORESCP", "localhost", 2000, ModalityManufacturer_Generic); |
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
142 ReusableDicomUserConnection::Locker lock(c, "ORTHANC", remote); |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2143
diff
changeset
|
143 lock.GetConnection().StoreFile("/home/jodogne/DICOM/Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386844.676281"); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
144 } |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
145 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
146 printf("**\n"); fflush(stdout); |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
147 SystemToolbox::USleep(1000000); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
148 printf("**\n"); fflush(stdout); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
149 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
150 { |
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
151 RemoteModalityParameters remote("STORESCP", "localhost", 2000, ModalityManufacturer_Generic); |
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
152 ReusableDicomUserConnection::Locker lock(c, "ORTHANC", remote); |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2143
diff
changeset
|
153 lock.GetConnection().StoreFile("/home/jodogne/DICOM/Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386844.676277"); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
154 } |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
155 |
2140 | 156 SystemToolbox::ServerBarrier(); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
157 printf("DONE\n"); fflush(stdout); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
158 } |
765 | 159 |
160 | |
161 | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
162 class Tutu : public IServerCommand |
765 | 163 { |
164 private: | |
165 int factor_; | |
166 | |
167 public: | |
168 Tutu(int f) : factor_(f) | |
169 { | |
170 } | |
171 | |
172 virtual bool Apply(ListOfStrings& outputs, | |
173 const ListOfStrings& inputs) | |
174 { | |
175 for (ListOfStrings::const_iterator | |
1304 | 176 it = inputs.begin(); it != inputs.end(); ++it) |
765 | 177 { |
178 int a = boost::lexical_cast<int>(*it); | |
179 int b = factor_ * a; | |
180 | |
181 printf("%d * %d = %d\n", a, factor_, b); | |
182 | |
183 //if (a == 84) { printf("BREAK\n"); return false; } | |
184 | |
185 outputs.push_back(boost::lexical_cast<std::string>(b)); | |
186 } | |
187 | |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
188 SystemToolbox::USleep(30000); |
765 | 189 |
190 return true; | |
191 } | |
192 }; | |
193 | |
768 | 194 |
770 | 195 static void Tata(ServerScheduler* s, ServerJob* j, bool* done) |
768 | 196 { |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
197 typedef IServerCommand::ListOfStrings ListOfStrings; |
779 | 198 |
770 | 199 while (!(*done)) |
768 | 200 { |
201 ListOfStrings l; | |
202 s->GetListOfJobs(l); | |
1304 | 203 for (ListOfStrings::iterator it = l.begin(); it != l.end(); ++it) |
204 { | |
205 printf(">> %s: %0.1f\n", it->c_str(), 100.0f * s->GetProgress(*it)); | |
206 } | |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
207 SystemToolbox::USleep(3000); |
768 | 208 } |
209 } | |
210 | |
211 | |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
212 TEST(MultiThreading, ServerScheduler) |
765 | 213 { |
995
8c67382f44a7
limit number of jobs in the scheduler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
994
diff
changeset
|
214 ServerScheduler scheduler(10); |
765 | 215 |
216 ServerJob job; | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
217 ServerCommandInstance& f2 = job.AddCommand(new Tutu(2)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
218 ServerCommandInstance& f3 = job.AddCommand(new Tutu(3)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
219 ServerCommandInstance& f4 = job.AddCommand(new Tutu(4)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
220 ServerCommandInstance& f5 = job.AddCommand(new Tutu(5)); |
765 | 221 f2.AddInput(boost::lexical_cast<std::string>(42)); |
222 //f3.AddInput(boost::lexical_cast<std::string>(42)); | |
223 //f4.AddInput(boost::lexical_cast<std::string>(42)); | |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
224 f2.ConnectOutput(f3); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
225 f3.ConnectOutput(f4); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
226 f4.ConnectOutput(f5); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
227 |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
228 f3.SetConnectedToSink(true); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
229 f5.SetConnectedToSink(true); |
765 | 230 |
231 job.SetDescription("tutu"); | |
232 | |
770 | 233 bool done = false; |
234 boost::thread t(Tata, &scheduler, &job, &done); | |
768 | 235 |
236 | |
765 | 237 //scheduler.Submit(job); |
238 | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
239 IServerCommand::ListOfStrings l; |
765 | 240 scheduler.SubmitAndWait(l, job); |
241 | |
1492 | 242 ASSERT_EQ(2u, l.size()); |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
243 ASSERT_EQ(42 * 2 * 3, boost::lexical_cast<int>(l.front())); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
244 ASSERT_EQ(42 * 2 * 3 * 4 * 5, boost::lexical_cast<int>(l.back())); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
245 |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
246 for (IServerCommand::ListOfStrings::iterator i = l.begin(); i != l.end(); i++) |
765 | 247 { |
248 printf("** %s\n", i->c_str()); | |
249 } | |
250 | |
2140 | 251 //SystemToolbox::ServerBarrier(); |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
252 //SystemToolbox::USleep(3000000); |
768 | 253 |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
254 scheduler.Stop(); |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
255 |
770 | 256 done = true; |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
257 if (t.joinable()) |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
258 { |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
259 t.join(); |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
260 } |
765 | 261 } |
2556 | 262 |
263 | |
264 | |
265 | |
266 | |
267 #if !defined(ORTHANC_SANDBOXED) | |
268 # error The macro ORTHANC_SANDBOXED must be defined | |
269 #endif | |
270 | |
271 #if ORTHANC_SANDBOXED == 1 | |
272 # error The job engine cannot be used in sandboxed environments | |
273 #endif | |
274 | |
2557 | 275 #include "../Core/Logging.h" |
276 | |
2559 | 277 #include <boost/math/special_functions/round.hpp> |
2556 | 278 #include <boost/date_time/posix_time/posix_time.hpp> |
2557 | 279 #include <queue> |
2556 | 280 |
281 namespace Orthanc | |
282 { | |
283 enum JobState | |
284 { | |
285 JobState_Pending, | |
286 JobState_Running, | |
287 JobState_Success, | |
288 JobState_Failure, | |
289 JobState_Paused, | |
290 JobState_Retry | |
291 }; | |
292 | |
2562 | 293 enum JobStepCode |
2556 | 294 { |
2562 | 295 JobStepCode_Success, |
296 JobStepCode_Failure, | |
297 JobStepCode_Continue, | |
298 JobStepCode_Retry | |
2556 | 299 }; |
300 | |
301 | |
2557 | 302 class JobStepResult |
2556 | 303 { |
304 private: | |
2562 | 305 JobStepCode status_; |
2556 | 306 |
307 public: | |
2562 | 308 explicit JobStepResult(JobStepCode status) : |
2557 | 309 status_(status) |
2556 | 310 { |
311 } | |
312 | |
2557 | 313 virtual ~JobStepResult() |
2556 | 314 { |
315 } | |
316 | |
2562 | 317 JobStepCode GetCode() const |
2556 | 318 { |
319 return status_; | |
320 } | |
321 }; | |
322 | |
323 | |
2557 | 324 class RetryResult : public JobStepResult |
2556 | 325 { |
326 private: | |
327 unsigned int timeout_; // Retry after "timeout_" milliseconds | |
328 | |
329 public: | |
330 RetryResult(unsigned int timeout) : | |
2562 | 331 JobStepResult(JobStepCode_Retry), |
2557 | 332 timeout_(timeout) |
2556 | 333 { |
334 } | |
335 | |
336 unsigned int GetTimeout() const | |
337 { | |
338 return timeout_; | |
339 } | |
340 }; | |
341 | |
342 | |
343 class IJob : public boost::noncopyable | |
344 { | |
345 public: | |
346 virtual ~IJob() | |
347 { | |
348 } | |
349 | |
2557 | 350 virtual JobStepResult* ExecuteStep() = 0; |
2556 | 351 |
352 virtual void ReleaseResources() = 0; // For pausing jobs | |
353 | |
354 virtual float GetProgress() = 0; | |
355 | |
356 virtual void FormatStatus(Json::Value& value) = 0; | |
357 }; | |
358 | |
359 | |
2562 | 360 struct JobStatus |
361 { | |
362 ErrorCode errorCode_; | |
363 float progress_; | |
364 Json::Value description_; | |
365 | |
366 JobStatus() : | |
367 errorCode_(ErrorCode_Success), | |
368 progress_(0), | |
369 description_(Json::objectValue) | |
370 { | |
371 } | |
372 | |
373 JobStatus(ErrorCode code, | |
374 float progress) : | |
375 errorCode_(code), | |
376 progress_(progress), | |
377 description_(Json::objectValue) | |
378 { | |
379 if (progress < 0 || | |
380 progress > 1) | |
381 { | |
382 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
383 } | |
384 } | |
385 }; | |
386 | |
387 | |
2559 | 388 class JobInfo |
389 { | |
390 private: | |
391 std::string id_; | |
392 int priority_; | |
393 ErrorCode errorCode_; | |
394 JobState state_; | |
395 boost::posix_time::ptime infoTime_; | |
396 boost::posix_time::ptime creationTime_; | |
397 boost::posix_time::time_duration runtime_; | |
398 boost::posix_time::ptime eta_; | |
2562 | 399 JobStatus status_; |
2559 | 400 |
401 public: | |
402 JobInfo(const std::string& id, | |
403 int priority, | |
404 JobState state, | |
2562 | 405 const JobStatus& status, |
2559 | 406 const boost::posix_time::ptime& creationTime, |
407 const boost::posix_time::time_duration& runtime) : | |
408 id_(id), | |
409 priority_(priority), | |
410 state_(state), | |
411 infoTime_(boost::posix_time::microsec_clock::universal_time()), | |
412 creationTime_(creationTime), | |
2562 | 413 runtime_(runtime), |
414 status_(status) | |
2559 | 415 { |
2562 | 416 float ms = static_cast<float>(runtime_.total_milliseconds()); |
417 float remaining = boost::math::llround(1.0f - status_.progress_) * ms; | |
418 eta_ = infoTime_ + boost::posix_time::milliseconds(remaining); | |
2559 | 419 } |
420 | |
421 const std::string& GetIdentifier() const | |
422 { | |
423 return id_; | |
424 } | |
425 | |
426 int GetPriority() const | |
427 { | |
428 return priority_; | |
429 } | |
430 | |
431 ErrorCode GetErrorCode() const | |
432 { | |
433 return errorCode_; | |
434 } | |
435 | |
436 JobState GetState() const | |
437 { | |
438 return state_; | |
439 } | |
440 | |
441 const boost::posix_time::ptime& GetInfoTime() const | |
442 { | |
443 return infoTime_; | |
444 } | |
445 | |
446 const boost::posix_time::ptime& GetCreationTime() const | |
447 { | |
448 return creationTime_; | |
449 } | |
450 | |
451 const boost::posix_time::time_duration& GetRuntime() const | |
452 { | |
453 return runtime_; | |
454 } | |
455 | |
456 const boost::posix_time::ptime& GetEstimatedTimeOfArrival() const | |
457 { | |
458 return eta_; | |
459 } | |
460 | |
2562 | 461 const JobStatus& GetStatus() const |
2559 | 462 { |
463 return status_; | |
464 } | |
465 | |
2562 | 466 JobStatus& GetStatus() |
2559 | 467 { |
468 return status_; | |
469 } | |
470 }; | |
471 | |
472 | |
2557 | 473 class JobHandler : public boost::noncopyable |
2562 | 474 { |
2557 | 475 private: |
2559 | 476 std::string id_; |
477 JobState state_; | |
478 std::auto_ptr<IJob> job_; | |
479 int priority_; // "+inf()" means highest priority | |
480 boost::posix_time::ptime creationTime_; | |
2562 | 481 boost::posix_time::ptime lastStateChangeTime_; |
482 boost::posix_time::time_duration runtime_; | |
2559 | 483 boost::posix_time::ptime retryTime_; |
484 bool pauseScheduled_; | |
2562 | 485 JobStatus lastStatus_; |
2557 | 486 |
487 void SetStateInternal(JobState state) | |
488 { | |
489 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time(); | |
490 | |
491 if (state_ == JobState_Running) | |
492 { | |
2562 | 493 runtime_ += (now - lastStateChangeTime_); |
2557 | 494 } |
495 | |
496 state_ = state; | |
2562 | 497 lastStateChangeTime_ = now; |
2557 | 498 pauseScheduled_ = false; |
499 } | |
500 | |
501 public: | |
502 JobHandler(IJob* job, | |
503 int priority) : | |
504 id_(Toolbox::GenerateUuid()), | |
505 state_(JobState_Pending), | |
506 job_(job), | |
507 priority_(priority), | |
508 creationTime_(boost::posix_time::microsec_clock::universal_time()), | |
2562 | 509 lastStateChangeTime_(creationTime_), |
2559 | 510 runtime_(boost::posix_time::milliseconds(0)), |
2562 | 511 retryTime_(creationTime_), |
512 pauseScheduled_(false) | |
2557 | 513 { |
514 if (job == NULL) | |
515 { | |
516 throw OrthancException(ErrorCode_NullPointer); | |
517 } | |
518 } | |
519 | |
520 const std::string& GetId() const | |
521 { | |
522 return id_; | |
523 } | |
524 | |
2562 | 525 IJob& GetJob() const |
526 { | |
527 assert(job_.get() != NULL); | |
528 return *job_; | |
529 } | |
530 | |
2557 | 531 void SetPriority(int priority) |
532 { | |
533 priority_ = priority; | |
534 } | |
535 | |
536 int GetPriority() const | |
537 { | |
538 return priority_; | |
539 } | |
540 | |
541 JobState GetState() const | |
542 { | |
543 return state_; | |
544 } | |
545 | |
546 void SetState(JobState state) | |
547 { | |
548 if (state == JobState_Retry) | |
549 { | |
550 // Use "SetRetryState()" | |
551 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
552 } | |
553 else | |
554 { | |
555 SetStateInternal(state); | |
556 } | |
557 } | |
558 | |
559 void SetRetryState(unsigned int timeout) | |
560 { | |
561 if (state_ == JobState_Running) | |
562 { | |
563 SetStateInternal(JobState_Retry); | |
564 retryTime_ = (boost::posix_time::microsec_clock::universal_time() + | |
565 boost::posix_time::milliseconds(timeout)); | |
566 } | |
567 else | |
568 { | |
569 // Only valid for running jobs | |
570 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
571 } | |
572 } | |
573 | |
574 void SchedulePause() | |
575 { | |
576 if (state_ == JobState_Running) | |
577 { | |
578 pauseScheduled_ = true; | |
579 } | |
580 else | |
581 { | |
582 // Only valid for running jobs | |
583 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
584 } | |
585 } | |
586 | |
587 bool IsPauseScheduled() | |
588 { | |
589 return pauseScheduled_; | |
590 } | |
591 | |
592 bool IsRetryReady(const boost::posix_time::ptime& now) const | |
593 { | |
594 if (state_ != JobState_Retry) | |
595 { | |
596 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
597 } | |
598 else | |
599 { | |
2558 | 600 return retryTime_ <= now; |
2557 | 601 } |
602 } | |
2559 | 603 |
2562 | 604 JobStatus& GetLastStatus() |
2559 | 605 { |
2562 | 606 return lastStatus_; |
607 } | |
2559 | 608 |
2562 | 609 const JobStatus& GetLastStatus() const |
610 { | |
611 return lastStatus_; | |
612 } | |
2557 | 613 }; |
614 | |
615 | |
2558 | 616 class JobsRegistry : public boost::noncopyable |
2556 | 617 { |
618 private: | |
2557 | 619 struct PriorityComparator |
2556 | 620 { |
2557 | 621 bool operator() (JobHandler*& a, |
622 JobHandler*& b) const | |
623 { | |
624 return a->GetPriority() < b->GetPriority(); | |
625 } | |
626 }; | |
627 | |
628 typedef std::map<std::string, JobHandler*> JobsIndex; | |
629 typedef std::list<const JobHandler*> CompletedJobs; | |
630 typedef std::set<JobHandler*> RetryJobs; | |
631 typedef std::priority_queue<JobHandler*, | |
632 std::vector<JobHandler*>, // Could be a "std::deque" | |
633 PriorityComparator> PendingJobs; | |
634 | |
2558 | 635 boost::mutex mutex_; |
636 JobsIndex jobsIndex_; | |
637 PendingJobs pendingJobs_; | |
638 CompletedJobs completedJobs_; | |
639 RetryJobs retryJobs_; | |
2557 | 640 |
2558 | 641 boost::condition_variable pendingJobAvailable_; |
642 size_t maxCompletedJobs_; | |
2557 | 643 |
644 | |
645 #ifndef NDEBUG | |
2558 | 646 bool IsPendingJob(const JobHandler& job) const |
647 { | |
648 PendingJobs copy = pendingJobs_; | |
649 while (!copy.empty()) | |
650 { | |
651 if (copy.top() == &job) | |
652 { | |
653 return true; | |
654 } | |
655 | |
656 copy.pop(); | |
657 } | |
658 | |
659 return false; | |
660 } | |
661 | |
662 bool IsCompletedJob(const JobHandler& job) const | |
663 { | |
664 for (CompletedJobs::const_iterator it = completedJobs_.begin(); | |
665 it != completedJobs_.end(); ++it) | |
666 { | |
667 if (*it == &job) | |
668 { | |
669 return true; | |
670 } | |
671 } | |
672 | |
673 return false; | |
674 } | |
675 | |
676 bool IsRetryJob(JobHandler& job) const | |
677 { | |
678 return retryJobs_.find(&job) != retryJobs_.end(); | |
679 } | |
680 #endif | |
681 | |
682 | |
683 void CheckInvariants() | |
684 { | |
685 #ifndef NDEBUG | |
2557 | 686 { |
687 PendingJobs copy = pendingJobs_; | |
688 while (!copy.empty()) | |
689 { | |
2558 | 690 assert(copy.top()->GetState() == JobState_Pending); |
2557 | 691 copy.pop(); |
692 } | |
2558 | 693 } |
2557 | 694 |
2558 | 695 assert(completedJobs_.size() <= maxCompletedJobs_); |
696 | |
697 for (CompletedJobs::const_iterator it = completedJobs_.begin(); | |
698 it != completedJobs_.end(); ++it) | |
699 { | |
700 assert((*it)->GetState() == JobState_Success || | |
701 (*it)->GetState() == JobState_Failure); | |
702 } | |
703 | |
704 for (RetryJobs::const_iterator it = retryJobs_.begin(); | |
705 it != retryJobs_.end(); ++it) | |
706 { | |
707 assert((*it)->GetState() == JobState_Retry); | |
2557 | 708 } |
709 | |
2558 | 710 for (JobsIndex::iterator it = jobsIndex_.begin(); |
711 it != jobsIndex_.end(); ++it) | |
2557 | 712 { |
2558 | 713 JobHandler& job = *it->second; |
714 | |
715 assert(job.GetId() == it->first); | |
716 | |
717 switch (job.GetState()) | |
2556 | 718 { |
2558 | 719 case JobState_Pending: |
720 assert(!IsRetryJob(job) && IsPendingJob(job) && !IsCompletedJob(job)); | |
721 break; | |
722 | |
723 case JobState_Success: | |
724 case JobState_Failure: | |
725 assert(!IsRetryJob(job) && !IsPendingJob(job) && IsCompletedJob(job)); | |
726 break; | |
727 | |
728 case JobState_Retry: | |
729 assert(IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job)); | |
730 break; | |
731 | |
732 case JobState_Running: | |
733 case JobState_Paused: | |
734 assert(!IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job)); | |
735 break; | |
2557 | 736 |
2558 | 737 default: |
738 throw OrthancException(ErrorCode_InternalError); | |
739 } | |
2557 | 740 } |
741 #endif | |
2558 | 742 } |
2557 | 743 |
744 | |
2558 | 745 void ForgetOldCompletedJobs() |
746 { | |
747 if (maxCompletedJobs_ != 0) | |
2557 | 748 { |
2558 | 749 while (completedJobs_.size() > maxCompletedJobs_) |
2557 | 750 { |
2558 | 751 assert(completedJobs_.front() != NULL); |
752 | |
753 std::string id = completedJobs_.front()->GetId(); | |
754 assert(jobsIndex_.find(id) != jobsIndex_.end()); | |
2557 | 755 |
2558 | 756 jobsIndex_.erase(id); |
757 delete(completedJobs_.front()); | |
758 completedJobs_.pop_front(); | |
759 } | |
760 } | |
761 } | |
762 | |
2557 | 763 |
2558 | 764 void MarkRunningAsCompleted(JobHandler& job, |
765 bool success) | |
766 { | |
767 LOG(INFO) << "Job has completed with " << (success ? "success" : "failure") | |
768 << ": " << job.GetId(); | |
2557 | 769 |
2558 | 770 CheckInvariants(); |
771 assert(job.GetState() == JobState_Running); | |
772 | |
773 job.SetState(success ? JobState_Success : JobState_Failure); | |
774 | |
775 completedJobs_.push_back(&job); | |
776 ForgetOldCompletedJobs(); | |
777 | |
778 CheckInvariants(); | |
779 } | |
2557 | 780 |
781 | |
2558 | 782 void MarkRunningAsRetry(JobHandler& job, |
783 unsigned int timeout) | |
784 { | |
785 LOG(INFO) << "Job scheduled for retry in " << timeout << "ms: " << job.GetId(); | |
786 | |
787 CheckInvariants(); | |
788 | |
789 assert(job.GetState() == JobState_Running && | |
790 retryJobs_.find(&job) == retryJobs_.end()); | |
791 | |
792 retryJobs_.insert(&job); | |
793 job.SetRetryState(timeout); | |
794 | |
795 CheckInvariants(); | |
796 } | |
797 | |
798 | |
799 void MarkRunningAsPaused(JobHandler& job) | |
800 { | |
801 LOG(INFO) << "Job paused: " << job.GetId(); | |
2557 | 802 |
2558 | 803 CheckInvariants(); |
804 assert(job.GetState() == JobState_Running); | |
805 | |
806 job.SetState(JobState_Paused); | |
2557 | 807 |
2558 | 808 CheckInvariants(); |
809 } | |
810 | |
811 | |
812 public: | |
813 JobsRegistry() : | |
814 maxCompletedJobs_(10) | |
815 { | |
816 } | |
2557 | 817 |
818 | |
2558 | 819 ~JobsRegistry() |
820 { | |
821 for (JobsIndex::iterator it = jobsIndex_.begin(); it != jobsIndex_.end(); ++it) | |
2557 | 822 { |
2558 | 823 assert(it->second != NULL); |
824 delete it->second; | |
825 } | |
826 } | |
827 | |
828 | |
829 void SetMaxCompletedJobs(size_t i) | |
830 { | |
831 boost::mutex::scoped_lock lock(mutex_); | |
832 CheckInvariants(); | |
2557 | 833 |
2558 | 834 maxCompletedJobs_ = i; |
835 ForgetOldCompletedJobs(); | |
836 | |
837 CheckInvariants(); | |
838 } | |
839 | |
2557 | 840 |
2558 | 841 void ListJobs(std::set<std::string>& target) |
842 { | |
843 boost::mutex::scoped_lock lock(mutex_); | |
844 CheckInvariants(); | |
2557 | 845 |
2558 | 846 for (JobsIndex::const_iterator it = jobsIndex_.begin(); |
847 it != jobsIndex_.end(); ++it) | |
848 { | |
849 target.insert(it->first); | |
2557 | 850 } |
2558 | 851 } |
2557 | 852 |
853 | |
2558 | 854 void Submit(std::string& id, |
855 IJob* job, // Takes ownership | |
856 int priority) | |
857 { | |
858 std::auto_ptr<JobHandler> handler(new JobHandler(job, priority)); | |
859 | |
860 boost::mutex::scoped_lock lock(mutex_); | |
861 CheckInvariants(); | |
862 | |
863 id = handler->GetId(); | |
864 | |
865 pendingJobs_.push(handler.get()); | |
866 pendingJobAvailable_.notify_one(); | |
2557 | 867 |
2558 | 868 jobsIndex_.insert(std::make_pair(id, handler.release())); |
869 | |
870 LOG(INFO) << "New job submitted: " << id; | |
871 | |
872 CheckInvariants(); | |
873 } | |
2557 | 874 |
2558 | 875 |
876 void Submit(IJob* job, // Takes ownership | |
877 int priority) | |
878 { | |
879 std::string id; | |
880 Submit(id, job, priority); | |
881 } | |
2557 | 882 |
883 | |
2558 | 884 void SetPriority(const std::string& id, |
885 int priority) | |
886 { | |
887 LOG(INFO) << "Changing priority to " << priority << " for job: " << id; | |
2557 | 888 |
2558 | 889 boost::mutex::scoped_lock lock(mutex_); |
890 CheckInvariants(); | |
891 | |
892 JobsIndex::iterator found = jobsIndex_.find(id); | |
2557 | 893 |
2558 | 894 if (found == jobsIndex_.end()) |
895 { | |
896 LOG(WARNING) << "Unknown job: " << id; | |
2557 | 897 } |
2558 | 898 else |
899 { | |
900 found->second->SetPriority(priority); | |
2556 | 901 |
2558 | 902 if (found->second->GetState() == JobState_Pending) |
903 { | |
904 // If the job is pending, we need to reconstruct the | |
905 // priority queue, as the heap condition has changed | |
2557 | 906 |
2558 | 907 PendingJobs copy; |
908 std::swap(copy, pendingJobs_); | |
909 | |
910 assert(pendingJobs_.empty()); | |
911 while (!copy.empty()) | |
912 { | |
913 pendingJobs_.push(copy.top()); | |
914 copy.pop(); | |
915 } | |
2557 | 916 } |
917 } | |
918 | |
2558 | 919 CheckInvariants(); |
920 } | |
2557 | 921 |
922 | |
2558 | 923 void Pause(const std::string& id) |
924 { | |
925 LOG(INFO) << "Pausing job: " << id; | |
2557 | 926 |
2558 | 927 boost::mutex::scoped_lock lock(mutex_); |
928 CheckInvariants(); | |
2557 | 929 |
2558 | 930 JobsIndex::iterator found = jobsIndex_.find(id); |
2557 | 931 |
2558 | 932 if (found == jobsIndex_.end()) |
2557 | 933 { |
2558 | 934 LOG(WARNING) << "Unknown job: " << id; |
2557 | 935 } |
2558 | 936 else |
2556 | 937 { |
2558 | 938 switch (found->second->GetState()) |
2557 | 939 { |
2558 | 940 case JobState_Pending: |
2557 | 941 { |
942 // If the job is pending, we need to reconstruct the | |
2558 | 943 // priority queue to remove it |
2557 | 944 PendingJobs copy; |
945 std::swap(copy, pendingJobs_); | |
946 | |
947 assert(pendingJobs_.empty()); | |
948 while (!copy.empty()) | |
949 { | |
2558 | 950 if (copy.top()->GetId() != id) |
951 { | |
952 pendingJobs_.push(copy.top()); | |
953 } | |
954 | |
2557 | 955 copy.pop(); |
956 } | |
2558 | 957 |
958 found->second->SetState(JobState_Paused); | |
959 | |
960 break; | |
2557 | 961 } |
2558 | 962 |
963 case JobState_Retry: | |
964 { | |
965 RetryJobs::iterator item = retryJobs_.find(found->second); | |
966 assert(item != retryJobs_.end()); | |
967 retryJobs_.erase(item); | |
968 | |
969 found->second->SetState(JobState_Paused); | |
970 | |
971 break; | |
972 } | |
973 | |
974 case JobState_Paused: | |
975 case JobState_Success: | |
976 case JobState_Failure: | |
977 // Nothing to be done | |
978 break; | |
979 | |
980 case JobState_Running: | |
981 found->second->SchedulePause(); | |
982 break; | |
983 | |
984 default: | |
985 throw OrthancException(ErrorCode_InternalError); | |
2557 | 986 } |
2556 | 987 } |
988 | |
2558 | 989 CheckInvariants(); |
990 } | |
2556 | 991 |
2557 | 992 |
2558 | 993 void Resume(const std::string& id) |
994 { | |
995 LOG(INFO) << "Resuming job: " << id; | |
2557 | 996 |
2558 | 997 boost::mutex::scoped_lock lock(mutex_); |
998 CheckInvariants(); | |
999 | |
1000 JobsIndex::iterator found = jobsIndex_.find(id); | |
2557 | 1001 |
2558 | 1002 if (found == jobsIndex_.end()) |
1003 { | |
1004 LOG(WARNING) << "Unknown job: " << id; | |
1005 } | |
1006 else if (found->second->GetState() != JobState_Paused) | |
1007 { | |
1008 LOG(WARNING) << "Cannot resume a job that is not paused: " << id; | |
1009 } | |
1010 else | |
1011 { | |
1012 found->second->SetState(JobState_Pending); | |
1013 pendingJobs_.push(found->second); | |
1014 pendingJobAvailable_.notify_one(); | |
1015 } | |
2557 | 1016 |
2558 | 1017 CheckInvariants(); |
1018 } | |
2556 | 1019 |
2557 | 1020 |
2558 | 1021 void Resubmit(const std::string& id) |
1022 { | |
1023 LOG(INFO) << "Resubmitting failed job: " << id; | |
2557 | 1024 |
2558 | 1025 boost::mutex::scoped_lock lock(mutex_); |
1026 CheckInvariants(); | |
1027 | |
1028 JobsIndex::iterator found = jobsIndex_.find(id); | |
2557 | 1029 |
2558 | 1030 if (found == jobsIndex_.end()) |
1031 { | |
1032 LOG(WARNING) << "Unknown job: " << id; | |
2556 | 1033 } |
2558 | 1034 else if (found->second->GetState() != JobState_Failure) |
1035 { | |
1036 LOG(WARNING) << "Cannot resubmit a job that has not failed: " << id; | |
1037 } | |
1038 else | |
2557 | 1039 { |
2558 | 1040 bool ok = false; |
1041 for (CompletedJobs::iterator it = completedJobs_.begin(); | |
1042 it != completedJobs_.end(); ++it) | |
2557 | 1043 { |
2558 | 1044 if (*it == found->second) |
2557 | 1045 { |
2558 | 1046 ok = true; |
1047 completedJobs_.erase(it); | |
1048 break; | |
2557 | 1049 } |
1050 } | |
1051 | |
2558 | 1052 assert(ok); |
1053 | |
1054 found->second->SetState(JobState_Pending); | |
1055 pendingJobs_.push(found->second); | |
1056 pendingJobAvailable_.notify_one(); | |
2557 | 1057 } |
1058 | |
2558 | 1059 CheckInvariants(); |
1060 } | |
1061 | |
2557 | 1062 |
2558 | 1063 void ScheduleRetries() |
1064 { | |
1065 boost::mutex::scoped_lock lock(mutex_); | |
1066 CheckInvariants(); | |
1067 | |
1068 RetryJobs copy; | |
1069 std::swap(copy, retryJobs_); | |
1070 | |
1071 const boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time(); | |
1072 | |
1073 assert(retryJobs_.empty()); | |
1074 for (RetryJobs::iterator it = copy.begin(); it != copy.end(); ++it) | |
2557 | 1075 { |
2558 | 1076 if ((*it)->IsRetryReady(now)) |
2557 | 1077 { |
2558 | 1078 LOG(INFO) << "Retrying job: " << (*it)->GetId(); |
1079 (*it)->SetState(JobState_Pending); | |
1080 pendingJobs_.push(*it); | |
1081 pendingJobAvailable_.notify_one(); | |
2557 | 1082 } |
1083 else | |
1084 { | |
2558 | 1085 retryJobs_.insert(*it); |
2557 | 1086 } |
1087 } | |
1088 | |
2558 | 1089 CheckInvariants(); |
1090 } | |
2557 | 1091 |
2558 | 1092 |
1093 bool GetState(JobState& state, | |
1094 const std::string& id) | |
1095 { | |
1096 boost::mutex::scoped_lock lock(mutex_); | |
1097 CheckInvariants(); | |
1098 | |
1099 JobsIndex::const_iterator it = jobsIndex_.find(id); | |
1100 if (it == jobsIndex_.end()) | |
2556 | 1101 { |
2558 | 1102 return false; |
1103 } | |
1104 else | |
1105 { | |
1106 state = it->second->GetState(); | |
1107 return true; | |
1108 } | |
1109 } | |
1110 | |
1111 | |
1112 class RunningJob : public boost::noncopyable | |
1113 { | |
1114 private: | |
2562 | 1115 JobsRegistry& registry_; |
1116 JobHandler* handler_; // Can only be accessed if the registry | |
1117 // mutex is locked! | |
1118 IJob* job_; // Will by design be in mutual exclusion, | |
1119 // because only one RunningJob can be | |
1120 // executed at a time on a JobHandler | |
1121 | |
1122 std::string id_; | |
1123 int priority_; | |
2559 | 1124 JobState targetState_; |
2562 | 1125 unsigned int targetRetryTimeout_; |
2556 | 1126 |
2558 | 1127 public: |
2562 | 1128 RunningJob(JobsRegistry& registry, |
2558 | 1129 unsigned int timeout) : |
2562 | 1130 registry_(registry), |
2558 | 1131 handler_(NULL), |
1132 targetState_(JobState_Failure), | |
2562 | 1133 targetRetryTimeout_(0) |
2558 | 1134 { |
2562 | 1135 { |
1136 boost::mutex::scoped_lock lock(registry_.mutex_); | |
1137 | |
1138 while (registry_.pendingJobs_.empty()) | |
1139 { | |
1140 if (timeout == 0) | |
1141 { | |
1142 registry_.pendingJobAvailable_.wait(lock); | |
1143 } | |
1144 else | |
1145 { | |
1146 bool success = registry_.pendingJobAvailable_.timed_wait | |
1147 (lock, boost::posix_time::milliseconds(timeout)); | |
1148 if (!success) | |
1149 { | |
1150 // No pending job | |
1151 return; | |
1152 } | |
1153 } | |
1154 } | |
1155 | |
1156 handler_ = registry_.pendingJobs_.top(); | |
1157 registry_.pendingJobs_.pop(); | |
1158 | |
1159 assert(handler_->GetState() == JobState_Pending); | |
1160 handler_->SetState(JobState_Running); | |
1161 | |
1162 job_ = &handler_->GetJob(); | |
1163 id_ = handler_->GetId(); | |
1164 priority_ = handler_->GetPriority(); | |
1165 } | |
2558 | 1166 } |
2557 | 1167 |
2558 | 1168 ~RunningJob() |
1169 { | |
1170 if (IsValid()) | |
2556 | 1171 { |
2562 | 1172 boost::mutex::scoped_lock lock(registry_.mutex_); |
1173 | |
2558 | 1174 switch (targetState_) |
2557 | 1175 { |
2558 | 1176 case JobState_Failure: |
2562 | 1177 registry_.MarkRunningAsCompleted(*handler_, false); |
2558 | 1178 break; |
2557 | 1179 |
2558 | 1180 case JobState_Success: |
2562 | 1181 registry_.MarkRunningAsCompleted(*handler_, true); |
2558 | 1182 break; |
2557 | 1183 |
2558 | 1184 case JobState_Paused: |
2562 | 1185 registry_.MarkRunningAsPaused(*handler_); |
2558 | 1186 break; |
2557 | 1187 |
2558 | 1188 case JobState_Retry: |
2562 | 1189 registry_.MarkRunningAsRetry(*handler_, targetRetryTimeout_); |
2558 | 1190 break; |
2557 | 1191 |
2558 | 1192 default: |
1193 assert(0); | |
2557 | 1194 } |
2556 | 1195 } |
2558 | 1196 } |
2556 | 1197 |
2558 | 1198 bool IsValid() const |
1199 { | |
2562 | 1200 return (handler_ != NULL && |
1201 job_ != NULL); | |
2558 | 1202 } |
1203 | |
1204 const std::string& GetId() const | |
1205 { | |
2562 | 1206 if (!IsValid()) |
2556 | 1207 { |
2562 | 1208 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
2556 | 1209 } |
2558 | 1210 else |
2557 | 1211 { |
2562 | 1212 return id_; |
1213 } | |
2558 | 1214 } |
1215 | |
1216 int GetPriority() const | |
1217 { | |
2562 | 1218 if (!IsValid()) |
2558 | 1219 { |
2562 | 1220 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
2558 | 1221 } |
1222 else | |
1223 { | |
2562 | 1224 return priority_; |
1225 } | |
2558 | 1226 } |
1227 | |
1228 bool IsPauseScheduled() | |
1229 { | |
1230 if (!IsValid()) | |
1231 { | |
1232 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
2557 | 1233 } |
2562 | 1234 else |
1235 { | |
1236 boost::mutex::scoped_lock lock(registry_.mutex_); | |
1237 registry_.CheckInvariants(); | |
1238 assert(handler_->GetState() == JobState_Running); | |
1239 | |
1240 return handler_->IsPauseScheduled(); | |
1241 } | |
2558 | 1242 } |
1243 | |
1244 void MarkSuccess() | |
1245 { | |
1246 if (!IsValid()) | |
2557 | 1247 { |
2558 | 1248 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
2557 | 1249 } |
2562 | 1250 else |
1251 { | |
1252 targetState_ = JobState_Success; | |
1253 } | |
2558 | 1254 } |
2557 | 1255 |
2558 | 1256 void MarkFailure() |
1257 { | |
1258 if (!IsValid()) | |
2557 | 1259 { |
2558 | 1260 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
2557 | 1261 } |
2562 | 1262 else |
1263 { | |
1264 targetState_ = JobState_Failure; | |
1265 } | |
2558 | 1266 } |
1267 | |
2562 | 1268 void MarkPause() |
2558 | 1269 { |
1270 if (!IsValid()) | |
2557 | 1271 { |
2558 | 1272 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
2557 | 1273 } |
2562 | 1274 else |
1275 { | |
1276 targetState_ = JobState_Paused; | |
1277 } | |
2558 | 1278 } |
1279 | |
1280 void MarkRetry(unsigned int timeout) | |
1281 { | |
1282 if (!IsValid()) | |
2557 | 1283 { |
2558 | 1284 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
1285 } | |
2562 | 1286 else |
1287 { | |
1288 targetState_ = JobState_Retry; | |
1289 targetRetryTimeout_ = timeout; | |
1290 } | |
2558 | 1291 } |
2559 | 1292 |
2562 | 1293 /*void ExecuteStep() |
2559 | 1294 { |
1295 if (!IsValid()) | |
1296 { | |
1297 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
1298 } | |
1299 | |
2562 | 1300 if (IsPauseScheduled()) |
2559 | 1301 { |
1302 targetState_ = JobState_Paused; | |
1303 return; | |
1304 } | |
1305 | |
1306 std::auto_ptr<JobStepResult> result; | |
2562 | 1307 ErrorCode code; |
2559 | 1308 |
1309 { | |
1310 bool ok = false; | |
1311 | |
1312 try | |
1313 { | |
2562 | 1314 result.reset(job_->ExecuteStep()); |
2559 | 1315 ok = true; |
2562 | 1316 |
1317 if (result->GetCode() == JobStepCode_Failure) | |
1318 { | |
1319 code = ErrorCode_InternalError; | |
1320 } | |
2559 | 1321 } |
1322 catch (OrthancException& e) | |
1323 { | |
2562 | 1324 code = e.GetErrorCode(); |
2559 | 1325 } |
1326 catch (boost::bad_lexical_cast&) | |
1327 { | |
2562 | 1328 code = ErrorCode_BadFileFormat; |
2559 | 1329 } |
1330 catch (...) | |
1331 { | |
2562 | 1332 code = ErrorCode_InternalError; |
2559 | 1333 } |
1334 | |
1335 if (ok) | |
1336 { | |
2562 | 1337 code = ErrorCode_Success; |
2559 | 1338 } |
1339 else | |
1340 { | |
2562 | 1341 result.reset(new JobStepResult(JobStepCode_Failure)); |
2559 | 1342 } |
1343 } | |
1344 | |
2562 | 1345 switch (result->GetCode()) |
2559 | 1346 { |
2562 | 1347 case JobStepCode_Success: |
2559 | 1348 targetState_ = JobState_Success; |
1349 break; | |
1350 | |
2562 | 1351 case JobStepCode_Failure: |
2559 | 1352 targetState_ = JobState_Failure; |
1353 break; | |
1354 | |
2562 | 1355 case JobStepCode_Continue: |
2559 | 1356 targetState_ = JobState_Running; |
1357 break; | |
1358 | |
2562 | 1359 case JobStepCode_Retry: |
2559 | 1360 targetState_ = JobState_Retry; |
2562 | 1361 targetRetryTimeout_ = dynamic_cast<RetryResult&>(*result).GetTimeout(); |
2559 | 1362 break; |
1363 | |
1364 default: | |
1365 throw OrthancException(ErrorCode_InternalError); | |
1366 } | |
2562 | 1367 }*/ |
2556 | 1368 }; |
2558 | 1369 }; |
2556 | 1370 } |
2557 | 1371 |
1372 | |
1373 | |
1374 class DummyJob : public Orthanc::IJob | |
1375 { | |
1376 private: | |
1377 JobStepResult result_; | |
1378 | |
1379 public: | |
1380 DummyJob() : | |
2562 | 1381 result_(Orthanc::JobStepCode_Success) |
2557 | 1382 { |
1383 } | |
1384 | |
1385 explicit DummyJob(JobStepResult result) : | |
1386 result_(result) | |
1387 { | |
1388 } | |
1389 | |
1390 virtual JobStepResult* ExecuteStep() | |
1391 { | |
1392 return new JobStepResult(result_); | |
1393 } | |
1394 | |
1395 virtual void ReleaseResources() | |
1396 { | |
1397 } | |
1398 | |
1399 virtual float GetProgress() | |
1400 { | |
1401 return 0; | |
1402 } | |
1403 | |
1404 virtual void FormatStatus(Json::Value& value) | |
1405 { | |
1406 } | |
1407 }; | |
1408 | |
1409 | |
2558 | 1410 static bool CheckState(Orthanc::JobsRegistry& registry, |
2557 | 1411 const std::string& id, |
1412 Orthanc::JobState state) | |
1413 { | |
1414 Orthanc::JobState s; | |
2558 | 1415 if (registry.GetState(s, id)) |
2557 | 1416 { |
1417 return state == s; | |
1418 } | |
1419 else | |
1420 { | |
1421 return false; | |
1422 } | |
1423 } | |
1424 | |
1425 | |
2558 | 1426 TEST(JobsRegistry, Priority) |
2557 | 1427 { |
2558 | 1428 JobsRegistry registry; |
2557 | 1429 |
1430 std::string i1, i2, i3, i4; | |
2558 | 1431 registry.Submit(i1, new DummyJob(), 10); |
1432 registry.Submit(i2, new DummyJob(), 30); | |
1433 registry.Submit(i3, new DummyJob(), 20); | |
1434 registry.Submit(i4, new DummyJob(), 5); | |
2557 | 1435 |
2558 | 1436 registry.SetMaxCompletedJobs(2); |
2557 | 1437 |
1438 std::set<std::string> id; | |
2558 | 1439 registry.ListJobs(id); |
2557 | 1440 |
1441 ASSERT_EQ(4u, id.size()); | |
1442 ASSERT_TRUE(id.find(i1) != id.end()); | |
1443 ASSERT_TRUE(id.find(i2) != id.end()); | |
1444 ASSERT_TRUE(id.find(i3) != id.end()); | |
1445 ASSERT_TRUE(id.find(i4) != id.end()); | |
1446 | |
2558 | 1447 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); |
2557 | 1448 |
1449 { | |
2558 | 1450 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1451 ASSERT_TRUE(job.IsValid()); |
1452 ASSERT_EQ(30, job.GetPriority()); | |
1453 ASSERT_EQ(i2, job.GetId()); | |
1454 | |
2558 | 1455 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); |
2557 | 1456 } |
1457 | |
2558 | 1458 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Failure)); |
1459 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Pending)); | |
2557 | 1460 |
1461 { | |
2558 | 1462 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1463 ASSERT_TRUE(job.IsValid()); |
1464 ASSERT_EQ(20, job.GetPriority()); | |
1465 ASSERT_EQ(i3, job.GetId()); | |
1466 | |
1467 job.MarkSuccess(); | |
1468 | |
2558 | 1469 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Running)); |
2557 | 1470 } |
1471 | |
2558 | 1472 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Success)); |
2557 | 1473 |
1474 { | |
2558 | 1475 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1476 ASSERT_TRUE(job.IsValid()); |
1477 ASSERT_EQ(10, job.GetPriority()); | |
1478 ASSERT_EQ(i1, job.GetId()); | |
1479 } | |
1480 | |
1481 { | |
2558 | 1482 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1483 ASSERT_TRUE(job.IsValid()); |
1484 ASSERT_EQ(5, job.GetPriority()); | |
1485 ASSERT_EQ(i4, job.GetId()); | |
1486 } | |
1487 | |
1488 { | |
2558 | 1489 JobsRegistry::RunningJob job(registry, 1); |
2557 | 1490 ASSERT_FALSE(job.IsValid()); |
1491 } | |
1492 | |
1493 Orthanc::JobState s; | |
2558 | 1494 ASSERT_TRUE(registry.GetState(s, i1)); |
1495 ASSERT_FALSE(registry.GetState(s, i2)); // Removed because oldest | |
1496 ASSERT_FALSE(registry.GetState(s, i3)); // Removed because second oldest | |
1497 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 1498 |
2558 | 1499 registry.SetMaxCompletedJobs(1); // (*) |
1500 ASSERT_FALSE(registry.GetState(s, i1)); // Just discarded by (*) | |
1501 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 1502 } |
1503 | |
1504 | |
2558 | 1505 TEST(JobsRegistry, Simultaneous) |
2557 | 1506 { |
2558 | 1507 JobsRegistry registry; |
1508 | |
1509 std::string i1, i2; | |
1510 registry.Submit(i1, new DummyJob(), 20); | |
1511 registry.Submit(i2, new DummyJob(), 10); | |
1512 | |
1513 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Pending)); | |
1514 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); | |
1515 | |
1516 { | |
1517 JobsRegistry::RunningJob job1(registry, 0); | |
1518 JobsRegistry::RunningJob job2(registry, 0); | |
1519 | |
1520 ASSERT_TRUE(job1.IsValid()); | |
1521 ASSERT_TRUE(job2.IsValid()); | |
1522 | |
1523 job1.MarkFailure(); | |
1524 job2.MarkSuccess(); | |
1525 | |
1526 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Running)); | |
1527 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); | |
1528 } | |
1529 | |
1530 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Failure)); | |
1531 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Success)); | |
1532 } | |
1533 | |
1534 | |
1535 TEST(JobsRegistry, Resubmit) | |
1536 { | |
1537 JobsRegistry registry; | |
2557 | 1538 |
1539 std::string id; | |
2558 | 1540 registry.Submit(id, new DummyJob(), 10); |
2557 | 1541 |
2558 | 1542 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
2557 | 1543 |
2558 | 1544 registry.Resubmit(id); |
1545 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 1546 |
1547 { | |
2558 | 1548 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1549 ASSERT_TRUE(job.IsValid()); |
1550 job.MarkFailure(); | |
1551 | |
2558 | 1552 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
2557 | 1553 |
2558 | 1554 registry.Resubmit(id); |
1555 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 1556 } |
1557 | |
2558 | 1558 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
2557 | 1559 |
2558 | 1560 registry.Resubmit(id); |
1561 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 1562 |
1563 { | |
2558 | 1564 JobsRegistry::RunningJob job(registry, 0); |
2557 | 1565 ASSERT_TRUE(job.IsValid()); |
1566 ASSERT_EQ(id, job.GetId()); | |
1567 | |
1568 job.MarkSuccess(); | |
2558 | 1569 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
1570 } | |
1571 | |
1572 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
1573 | |
1574 registry.Resubmit(id); | |
1575 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
1576 } | |
1577 | |
1578 | |
1579 TEST(JobsRegistry, Retry) | |
1580 { | |
1581 JobsRegistry registry; | |
1582 | |
1583 std::string id; | |
1584 registry.Submit(id, new DummyJob(), 10); | |
1585 | |
1586 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1587 | |
1588 { | |
1589 JobsRegistry::RunningJob job(registry, 0); | |
1590 ASSERT_TRUE(job.IsValid()); | |
1591 job.MarkRetry(0); | |
1592 | |
1593 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
1594 } | |
1595 | |
1596 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
1597 | |
1598 registry.Resubmit(id); | |
1599 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
1600 | |
1601 registry.ScheduleRetries(); | |
1602 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1603 | |
1604 { | |
1605 JobsRegistry::RunningJob job(registry, 0); | |
1606 ASSERT_TRUE(job.IsValid()); | |
1607 job.MarkSuccess(); | |
1608 | |
1609 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 1610 } |
1611 | |
2558 | 1612 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
1613 } | |
1614 | |
1615 | |
1616 TEST(JobsRegistry, PausePending) | |
1617 { | |
1618 JobsRegistry registry; | |
1619 | |
1620 std::string id; | |
1621 registry.Submit(id, new DummyJob(), 10); | |
1622 | |
1623 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1624 | |
1625 registry.Pause(id); | |
1626 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1627 | |
1628 registry.Pause(id); | |
1629 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1630 | |
1631 registry.Resubmit(id); | |
1632 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1633 | |
1634 registry.Resume(id); | |
1635 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 1636 } |
2558 | 1637 |
1638 | |
1639 TEST(JobsRegistry, PauseRunning) | |
1640 { | |
1641 JobsRegistry registry; | |
1642 | |
1643 std::string id; | |
1644 registry.Submit(id, new DummyJob(), 10); | |
1645 | |
1646 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1647 | |
1648 { | |
1649 JobsRegistry::RunningJob job(registry, 0); | |
1650 ASSERT_TRUE(job.IsValid()); | |
1651 | |
1652 registry.Resubmit(id); | |
2562 | 1653 job.MarkPause(); |
2558 | 1654 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
1655 } | |
1656 | |
1657 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1658 | |
1659 registry.Resubmit(id); | |
1660 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1661 | |
1662 registry.Resume(id); | |
1663 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1664 | |
1665 { | |
1666 JobsRegistry::RunningJob job(registry, 0); | |
1667 ASSERT_TRUE(job.IsValid()); | |
1668 | |
1669 job.MarkSuccess(); | |
1670 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
1671 } | |
1672 | |
1673 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
1674 } | |
1675 | |
1676 | |
1677 TEST(JobsRegistry, PauseRetry) | |
1678 { | |
1679 JobsRegistry registry; | |
1680 | |
1681 std::string id; | |
1682 registry.Submit(id, new DummyJob(), 10); | |
1683 | |
1684 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1685 | |
1686 { | |
1687 JobsRegistry::RunningJob job(registry, 0); | |
1688 ASSERT_TRUE(job.IsValid()); | |
1689 | |
1690 job.MarkRetry(0); | |
1691 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
1692 } | |
1693 | |
1694 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
1695 | |
1696 registry.Pause(id); | |
1697 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
1698 | |
1699 registry.Resume(id); | |
1700 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
1701 | |
1702 { | |
1703 JobsRegistry::RunningJob job(registry, 0); | |
1704 ASSERT_TRUE(job.IsValid()); | |
1705 | |
1706 job.MarkSuccess(); | |
1707 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
1708 } | |
1709 | |
1710 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
1711 } |