Mercurial > hg > orthanc
annotate UnitTestsSources/MultiThreadingTests.cpp @ 2569:2af17cd5eb1f jobs
reorganization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 May 2018 15:37:20 +0200 |
parents | a46094602346 |
children | 2e879c796ec7 |
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 | |
2569 | 37 #include "../Core/JobsEngine/JobStepRetry.h" |
38 #include "../Core/JobsEngine/JobsEngine.h" | |
39 #include "../Core/MultiThreading/Locker.h" | |
723 | 40 #include "../Core/OrthancException.h" |
2143
fd5875662670
creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2140
diff
changeset
|
41 #include "../Core/SystemToolbox.h" |
723 | 42 #include "../Core/Toolbox.h" |
2569 | 43 #include "../OrthancServer/Scheduler/ServerScheduler.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 | |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
109 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
110 |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
111 #include "../Core/DicomNetworking/ReusableDicomUserConnection.h" |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
112 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
113 TEST(ReusableDicomUserConnection, DISABLED_Basic) |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
114 { |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
115 ReusableDicomUserConnection c; |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
116 c.SetMillisecondsBeforeClose(200); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
117 printf("START\n"); fflush(stdout); |
775
d3ba35466225
integration mainline -> lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
118 |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
119 { |
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
|
120 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
|
121 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
|
122 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
|
123 } |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
124 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
125 printf("**\n"); fflush(stdout); |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
126 SystemToolbox::USleep(1000000); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
127 printf("**\n"); fflush(stdout); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
128 |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
129 { |
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
|
130 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
|
131 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
|
132 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
|
133 } |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
134 |
2140 | 135 SystemToolbox::ServerBarrier(); |
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
136 printf("DONE\n"); fflush(stdout); |
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
137 } |
765 | 138 |
139 | |
140 | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
141 class Tutu : public IServerCommand |
765 | 142 { |
143 private: | |
144 int factor_; | |
145 | |
146 public: | |
147 Tutu(int f) : factor_(f) | |
148 { | |
149 } | |
150 | |
151 virtual bool Apply(ListOfStrings& outputs, | |
152 const ListOfStrings& inputs) | |
153 { | |
154 for (ListOfStrings::const_iterator | |
1304 | 155 it = inputs.begin(); it != inputs.end(); ++it) |
765 | 156 { |
157 int a = boost::lexical_cast<int>(*it); | |
158 int b = factor_ * a; | |
159 | |
160 printf("%d * %d = %d\n", a, factor_, b); | |
161 | |
162 //if (a == 84) { printf("BREAK\n"); return false; } | |
163 | |
164 outputs.push_back(boost::lexical_cast<std::string>(b)); | |
165 } | |
166 | |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
167 SystemToolbox::USleep(30000); |
765 | 168 |
169 return true; | |
170 } | |
171 }; | |
172 | |
768 | 173 |
770 | 174 static void Tata(ServerScheduler* s, ServerJob* j, bool* done) |
768 | 175 { |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
176 typedef IServerCommand::ListOfStrings ListOfStrings; |
779 | 177 |
770 | 178 while (!(*done)) |
768 | 179 { |
180 ListOfStrings l; | |
181 s->GetListOfJobs(l); | |
1304 | 182 for (ListOfStrings::iterator it = l.begin(); it != l.end(); ++it) |
183 { | |
184 printf(">> %s: %0.1f\n", it->c_str(), 100.0f * s->GetProgress(*it)); | |
185 } | |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
186 SystemToolbox::USleep(3000); |
768 | 187 } |
188 } | |
189 | |
190 | |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
191 TEST(MultiThreading, ServerScheduler) |
765 | 192 { |
995
8c67382f44a7
limit number of jobs in the scheduler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
994
diff
changeset
|
193 ServerScheduler scheduler(10); |
765 | 194 |
195 ServerJob job; | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
196 ServerCommandInstance& f2 = job.AddCommand(new Tutu(2)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
197 ServerCommandInstance& f3 = job.AddCommand(new Tutu(3)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
198 ServerCommandInstance& f4 = job.AddCommand(new Tutu(4)); |
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
199 ServerCommandInstance& f5 = job.AddCommand(new Tutu(5)); |
765 | 200 f2.AddInput(boost::lexical_cast<std::string>(42)); |
201 //f3.AddInput(boost::lexical_cast<std::string>(42)); | |
202 //f4.AddInput(boost::lexical_cast<std::string>(42)); | |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
203 f2.ConnectOutput(f3); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
204 f3.ConnectOutput(f4); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
205 f4.ConnectOutput(f5); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
206 |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
207 f3.SetConnectedToSink(true); |
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
208 f5.SetConnectedToSink(true); |
765 | 209 |
210 job.SetDescription("tutu"); | |
211 | |
770 | 212 bool done = false; |
213 boost::thread t(Tata, &scheduler, &job, &done); | |
768 | 214 |
215 | |
765 | 216 //scheduler.Submit(job); |
217 | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
218 IServerCommand::ListOfStrings l; |
765 | 219 scheduler.SubmitAndWait(l, job); |
220 | |
1492 | 221 ASSERT_EQ(2u, l.size()); |
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
222 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
|
223 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
|
224 |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
225 for (IServerCommand::ListOfStrings::iterator i = l.begin(); i != l.end(); i++) |
765 | 226 { |
227 printf("** %s\n", i->c_str()); | |
228 } | |
229 | |
2140 | 230 //SystemToolbox::ServerBarrier(); |
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
231 //SystemToolbox::USleep(3000000); |
768 | 232 |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
233 scheduler.Stop(); |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
234 |
770 | 235 done = true; |
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
236 if (t.joinable()) |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
237 { |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
238 t.join(); |
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
239 } |
765 | 240 } |
2556 | 241 |
242 | |
243 | |
2557 | 244 class DummyJob : public Orthanc::IJob |
245 { | |
246 private: | |
247 JobStepResult result_; | |
2565 | 248 unsigned int count_; |
249 unsigned int steps_; | |
2557 | 250 |
251 public: | |
252 DummyJob() : | |
2565 | 253 result_(Orthanc::JobStepCode_Success), |
254 count_(0), | |
255 steps_(4) | |
2557 | 256 { |
257 } | |
258 | |
259 explicit DummyJob(JobStepResult result) : | |
2565 | 260 result_(result), |
261 count_(0), | |
262 steps_(4) | |
2557 | 263 { |
264 } | |
265 | |
266 virtual JobStepResult* ExecuteStep() | |
267 { | |
2565 | 268 boost::this_thread::sleep(boost::posix_time::milliseconds(50)); |
269 | |
270 if (count_ == steps_ - 1) | |
271 { | |
272 return new JobStepResult(result_); | |
273 } | |
274 else | |
275 { | |
276 count_++; | |
277 return new JobStepResult(JobStepCode_Continue); | |
278 } | |
2557 | 279 } |
280 | |
281 virtual void ReleaseResources() | |
282 { | |
283 } | |
284 | |
285 virtual float GetProgress() | |
286 { | |
2565 | 287 return static_cast<float>(count_) / static_cast<float>(steps_ - 1); |
2557 | 288 } |
289 | |
2563
98dfc1948d00
RunningJob::ExecuteStep()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2562
diff
changeset
|
290 virtual void GetDescription(Json::Value& value) |
2557 | 291 { |
2565 | 292 value["hello"] = "world"; |
2557 | 293 } |
294 }; | |
295 | |
296 | |
2558 | 297 static bool CheckState(Orthanc::JobsRegistry& registry, |
2557 | 298 const std::string& id, |
299 Orthanc::JobState state) | |
300 { | |
301 Orthanc::JobState s; | |
2558 | 302 if (registry.GetState(s, id)) |
2557 | 303 { |
304 return state == s; | |
305 } | |
306 else | |
307 { | |
308 return false; | |
309 } | |
310 } | |
311 | |
312 | |
2558 | 313 TEST(JobsRegistry, Priority) |
2557 | 314 { |
2558 | 315 JobsRegistry registry; |
2557 | 316 |
317 std::string i1, i2, i3, i4; | |
2558 | 318 registry.Submit(i1, new DummyJob(), 10); |
319 registry.Submit(i2, new DummyJob(), 30); | |
320 registry.Submit(i3, new DummyJob(), 20); | |
321 registry.Submit(i4, new DummyJob(), 5); | |
2557 | 322 |
2558 | 323 registry.SetMaxCompletedJobs(2); |
2557 | 324 |
325 std::set<std::string> id; | |
2558 | 326 registry.ListJobs(id); |
2557 | 327 |
328 ASSERT_EQ(4u, id.size()); | |
329 ASSERT_TRUE(id.find(i1) != id.end()); | |
330 ASSERT_TRUE(id.find(i2) != id.end()); | |
331 ASSERT_TRUE(id.find(i3) != id.end()); | |
332 ASSERT_TRUE(id.find(i4) != id.end()); | |
333 | |
2558 | 334 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); |
2557 | 335 |
336 { | |
2558 | 337 JobsRegistry::RunningJob job(registry, 0); |
2557 | 338 ASSERT_TRUE(job.IsValid()); |
339 ASSERT_EQ(30, job.GetPriority()); | |
340 ASSERT_EQ(i2, job.GetId()); | |
341 | |
2558 | 342 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); |
2557 | 343 } |
344 | |
2558 | 345 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Failure)); |
346 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Pending)); | |
2557 | 347 |
348 { | |
2558 | 349 JobsRegistry::RunningJob job(registry, 0); |
2557 | 350 ASSERT_TRUE(job.IsValid()); |
351 ASSERT_EQ(20, job.GetPriority()); | |
352 ASSERT_EQ(i3, job.GetId()); | |
353 | |
354 job.MarkSuccess(); | |
355 | |
2558 | 356 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Running)); |
2557 | 357 } |
358 | |
2558 | 359 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Success)); |
2557 | 360 |
361 { | |
2558 | 362 JobsRegistry::RunningJob job(registry, 0); |
2557 | 363 ASSERT_TRUE(job.IsValid()); |
364 ASSERT_EQ(10, job.GetPriority()); | |
365 ASSERT_EQ(i1, job.GetId()); | |
366 } | |
367 | |
368 { | |
2558 | 369 JobsRegistry::RunningJob job(registry, 0); |
2557 | 370 ASSERT_TRUE(job.IsValid()); |
371 ASSERT_EQ(5, job.GetPriority()); | |
372 ASSERT_EQ(i4, job.GetId()); | |
373 } | |
374 | |
375 { | |
2558 | 376 JobsRegistry::RunningJob job(registry, 1); |
2557 | 377 ASSERT_FALSE(job.IsValid()); |
378 } | |
379 | |
380 Orthanc::JobState s; | |
2558 | 381 ASSERT_TRUE(registry.GetState(s, i1)); |
382 ASSERT_FALSE(registry.GetState(s, i2)); // Removed because oldest | |
383 ASSERT_FALSE(registry.GetState(s, i3)); // Removed because second oldest | |
384 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 385 |
2558 | 386 registry.SetMaxCompletedJobs(1); // (*) |
387 ASSERT_FALSE(registry.GetState(s, i1)); // Just discarded by (*) | |
388 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 389 } |
390 | |
391 | |
2558 | 392 TEST(JobsRegistry, Simultaneous) |
2557 | 393 { |
2558 | 394 JobsRegistry registry; |
395 | |
396 std::string i1, i2; | |
397 registry.Submit(i1, new DummyJob(), 20); | |
398 registry.Submit(i2, new DummyJob(), 10); | |
399 | |
400 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Pending)); | |
401 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); | |
402 | |
403 { | |
404 JobsRegistry::RunningJob job1(registry, 0); | |
405 JobsRegistry::RunningJob job2(registry, 0); | |
406 | |
407 ASSERT_TRUE(job1.IsValid()); | |
408 ASSERT_TRUE(job2.IsValid()); | |
409 | |
410 job1.MarkFailure(); | |
411 job2.MarkSuccess(); | |
412 | |
413 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Running)); | |
414 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); | |
415 } | |
416 | |
417 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Failure)); | |
418 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Success)); | |
419 } | |
420 | |
421 | |
422 TEST(JobsRegistry, Resubmit) | |
423 { | |
424 JobsRegistry registry; | |
2557 | 425 |
426 std::string id; | |
2558 | 427 registry.Submit(id, new DummyJob(), 10); |
2557 | 428 |
2558 | 429 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
2557 | 430 |
2558 | 431 registry.Resubmit(id); |
432 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 433 |
434 { | |
2558 | 435 JobsRegistry::RunningJob job(registry, 0); |
2557 | 436 ASSERT_TRUE(job.IsValid()); |
437 job.MarkFailure(); | |
438 | |
2558 | 439 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
2557 | 440 |
2558 | 441 registry.Resubmit(id); |
442 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 443 } |
444 | |
2558 | 445 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
2557 | 446 |
2558 | 447 registry.Resubmit(id); |
448 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 449 |
450 { | |
2558 | 451 JobsRegistry::RunningJob job(registry, 0); |
2557 | 452 ASSERT_TRUE(job.IsValid()); |
453 ASSERT_EQ(id, job.GetId()); | |
454 | |
455 job.MarkSuccess(); | |
2558 | 456 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
457 } | |
458 | |
459 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
460 | |
461 registry.Resubmit(id); | |
462 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
463 } | |
464 | |
465 | |
466 TEST(JobsRegistry, Retry) | |
467 { | |
468 JobsRegistry registry; | |
469 | |
470 std::string id; | |
471 registry.Submit(id, new DummyJob(), 10); | |
472 | |
473 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
474 | |
475 { | |
476 JobsRegistry::RunningJob job(registry, 0); | |
477 ASSERT_TRUE(job.IsValid()); | |
478 job.MarkRetry(0); | |
479 | |
480 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
481 } | |
482 | |
483 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
484 | |
485 registry.Resubmit(id); | |
486 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
487 | |
488 registry.ScheduleRetries(); | |
489 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
490 | |
491 { | |
492 JobsRegistry::RunningJob job(registry, 0); | |
493 ASSERT_TRUE(job.IsValid()); | |
494 job.MarkSuccess(); | |
495 | |
496 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 497 } |
498 | |
2558 | 499 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
500 } | |
501 | |
502 | |
503 TEST(JobsRegistry, PausePending) | |
504 { | |
505 JobsRegistry registry; | |
506 | |
507 std::string id; | |
508 registry.Submit(id, new DummyJob(), 10); | |
509 | |
510 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
511 | |
512 registry.Pause(id); | |
513 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
514 | |
515 registry.Pause(id); | |
516 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
517 | |
518 registry.Resubmit(id); | |
519 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
520 | |
521 registry.Resume(id); | |
522 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 523 } |
2558 | 524 |
525 | |
526 TEST(JobsRegistry, PauseRunning) | |
527 { | |
528 JobsRegistry registry; | |
529 | |
530 std::string id; | |
531 registry.Submit(id, new DummyJob(), 10); | |
532 | |
533 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
534 | |
535 { | |
536 JobsRegistry::RunningJob job(registry, 0); | |
537 ASSERT_TRUE(job.IsValid()); | |
538 | |
539 registry.Resubmit(id); | |
2562 | 540 job.MarkPause(); |
2558 | 541 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
542 } | |
543 | |
544 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
545 | |
546 registry.Resubmit(id); | |
547 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
548 | |
549 registry.Resume(id); | |
550 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
551 | |
552 { | |
553 JobsRegistry::RunningJob job(registry, 0); | |
554 ASSERT_TRUE(job.IsValid()); | |
555 | |
556 job.MarkSuccess(); | |
557 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
558 } | |
559 | |
560 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
561 } | |
562 | |
563 | |
564 TEST(JobsRegistry, PauseRetry) | |
565 { | |
566 JobsRegistry registry; | |
567 | |
568 std::string id; | |
569 registry.Submit(id, new DummyJob(), 10); | |
570 | |
571 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
572 | |
573 { | |
574 JobsRegistry::RunningJob job(registry, 0); | |
575 ASSERT_TRUE(job.IsValid()); | |
576 | |
577 job.MarkRetry(0); | |
578 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
579 } | |
580 | |
581 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
582 | |
583 registry.Pause(id); | |
584 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
585 | |
586 registry.Resume(id); | |
587 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
588 | |
589 { | |
590 JobsRegistry::RunningJob job(registry, 0); | |
591 ASSERT_TRUE(job.IsValid()); | |
592 | |
593 job.MarkSuccess(); | |
594 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
595 } | |
596 | |
597 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
598 } | |
2565 | 599 |
600 | |
601 TEST(JobsEngine, Basic) | |
602 { | |
603 JobsEngine engine; | |
604 | |
605 std::string s; | |
606 | |
607 for (size_t i = 0; i < 20; i++) | |
608 engine.GetRegistry().Submit(s, new DummyJob(), rand() % 10); | |
609 | |
610 engine.SetWorkersCount(3); | |
611 engine.Start(); | |
612 | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
613 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
614 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
615 { |
2568 | 616 typedef std::set<std::string> Jobs; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
617 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
618 Jobs jobs; |
2568 | 619 engine.GetRegistry().ListJobs(jobs); |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
620 |
2568 | 621 Json::Value v = Json::arrayValue; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
622 for (Jobs::const_iterator it = jobs.begin(); it != jobs.end(); ++it) |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
623 { |
2568 | 624 JobInfo info; |
625 | |
626 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
627 { | |
628 Json::Value vv; | |
629 info.Format(vv); | |
630 v.append(vv); | |
631 } | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
632 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
633 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
634 std::cout << v << std::endl; |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
635 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
636 std::cout << "====================================================" << std::endl; |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
637 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
638 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
2565 | 639 |
640 engine.Stop(); | |
641 | |
642 | |
643 { | |
2568 | 644 typedef std::set<std::string> Jobs; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
645 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
646 Jobs jobs; |
2568 | 647 engine.GetRegistry().ListJobs(jobs); |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
648 |
2568 | 649 Json::Value v = Json::arrayValue; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
650 for (Jobs::const_iterator it = jobs.begin(); it != jobs.end(); ++it) |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
651 { |
2568 | 652 JobInfo info; |
653 | |
654 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
655 { | |
656 Json::Value vv; | |
657 info.Format(vv); | |
658 v.append(vv); | |
659 } | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
660 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
661 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
662 std::cout << v << std::endl; |
2565 | 663 } |
664 } |