Mercurial > hg > orthanc
annotate UnitTestsSources/MultiThreadingTests.cpp @ 2580:055d7d4a823f jobs
avoid unecessary openings of DICOM connection for C-Store
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 11 May 2018 09:35:17 +0200 |
parents | 3372c5255333 |
children | 8da2cffc2378 |
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 | |
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
266 virtual void Start() |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
267 { |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
268 } |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
269 |
2557 | 270 virtual JobStepResult* ExecuteStep() |
271 { | |
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
272 boost::this_thread::sleep(boost::posix_time::milliseconds(10)); |
2565 | 273 |
274 if (count_ == steps_ - 1) | |
275 { | |
276 return new JobStepResult(result_); | |
277 } | |
278 else | |
279 { | |
280 count_++; | |
281 return new JobStepResult(JobStepCode_Continue); | |
282 } | |
2557 | 283 } |
284 | |
285 virtual void ReleaseResources() | |
286 { | |
287 } | |
288 | |
289 virtual float GetProgress() | |
290 { | |
2565 | 291 return static_cast<float>(count_) / static_cast<float>(steps_ - 1); |
2557 | 292 } |
293 | |
2580
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
294 virtual void GetJobType(std::string& type) |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
295 { |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
296 type = "DummyJob"; |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
297 } |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
298 |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
299 virtual void GetInternalContent(Json::Value& value) |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
300 { |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
301 } |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
302 |
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
303 virtual void GetPublicContent(Json::Value& value) |
2557 | 304 { |
2565 | 305 value["hello"] = "world"; |
2557 | 306 } |
307 }; | |
308 | |
309 | |
2558 | 310 static bool CheckState(Orthanc::JobsRegistry& registry, |
2557 | 311 const std::string& id, |
312 Orthanc::JobState state) | |
313 { | |
314 Orthanc::JobState s; | |
2558 | 315 if (registry.GetState(s, id)) |
2557 | 316 { |
317 return state == s; | |
318 } | |
319 else | |
320 { | |
321 return false; | |
322 } | |
323 } | |
324 | |
325 | |
2558 | 326 TEST(JobsRegistry, Priority) |
2557 | 327 { |
2558 | 328 JobsRegistry registry; |
2557 | 329 |
330 std::string i1, i2, i3, i4; | |
2558 | 331 registry.Submit(i1, new DummyJob(), 10); |
332 registry.Submit(i2, new DummyJob(), 30); | |
333 registry.Submit(i3, new DummyJob(), 20); | |
334 registry.Submit(i4, new DummyJob(), 5); | |
2557 | 335 |
2558 | 336 registry.SetMaxCompletedJobs(2); |
2557 | 337 |
338 std::set<std::string> id; | |
2558 | 339 registry.ListJobs(id); |
2557 | 340 |
341 ASSERT_EQ(4u, id.size()); | |
342 ASSERT_TRUE(id.find(i1) != id.end()); | |
343 ASSERT_TRUE(id.find(i2) != id.end()); | |
344 ASSERT_TRUE(id.find(i3) != id.end()); | |
345 ASSERT_TRUE(id.find(i4) != id.end()); | |
346 | |
2558 | 347 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); |
2557 | 348 |
349 { | |
2558 | 350 JobsRegistry::RunningJob job(registry, 0); |
2557 | 351 ASSERT_TRUE(job.IsValid()); |
352 ASSERT_EQ(30, job.GetPriority()); | |
353 ASSERT_EQ(i2, job.GetId()); | |
354 | |
2558 | 355 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); |
2557 | 356 } |
357 | |
2558 | 358 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Failure)); |
359 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Pending)); | |
2557 | 360 |
361 { | |
2558 | 362 JobsRegistry::RunningJob job(registry, 0); |
2557 | 363 ASSERT_TRUE(job.IsValid()); |
364 ASSERT_EQ(20, job.GetPriority()); | |
365 ASSERT_EQ(i3, job.GetId()); | |
366 | |
367 job.MarkSuccess(); | |
368 | |
2558 | 369 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Running)); |
2557 | 370 } |
371 | |
2558 | 372 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Success)); |
2557 | 373 |
374 { | |
2558 | 375 JobsRegistry::RunningJob job(registry, 0); |
2557 | 376 ASSERT_TRUE(job.IsValid()); |
377 ASSERT_EQ(10, job.GetPriority()); | |
378 ASSERT_EQ(i1, job.GetId()); | |
379 } | |
380 | |
381 { | |
2558 | 382 JobsRegistry::RunningJob job(registry, 0); |
2557 | 383 ASSERT_TRUE(job.IsValid()); |
384 ASSERT_EQ(5, job.GetPriority()); | |
385 ASSERT_EQ(i4, job.GetId()); | |
386 } | |
387 | |
388 { | |
2558 | 389 JobsRegistry::RunningJob job(registry, 1); |
2557 | 390 ASSERT_FALSE(job.IsValid()); |
391 } | |
392 | |
393 Orthanc::JobState s; | |
2558 | 394 ASSERT_TRUE(registry.GetState(s, i1)); |
395 ASSERT_FALSE(registry.GetState(s, i2)); // Removed because oldest | |
396 ASSERT_FALSE(registry.GetState(s, i3)); // Removed because second oldest | |
397 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 398 |
2558 | 399 registry.SetMaxCompletedJobs(1); // (*) |
400 ASSERT_FALSE(registry.GetState(s, i1)); // Just discarded by (*) | |
401 ASSERT_TRUE(registry.GetState(s, i4)); | |
2557 | 402 } |
403 | |
404 | |
2558 | 405 TEST(JobsRegistry, Simultaneous) |
2557 | 406 { |
2558 | 407 JobsRegistry registry; |
408 | |
409 std::string i1, i2; | |
410 registry.Submit(i1, new DummyJob(), 20); | |
411 registry.Submit(i2, new DummyJob(), 10); | |
412 | |
413 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Pending)); | |
414 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); | |
415 | |
416 { | |
417 JobsRegistry::RunningJob job1(registry, 0); | |
418 JobsRegistry::RunningJob job2(registry, 0); | |
419 | |
420 ASSERT_TRUE(job1.IsValid()); | |
421 ASSERT_TRUE(job2.IsValid()); | |
422 | |
423 job1.MarkFailure(); | |
424 job2.MarkSuccess(); | |
425 | |
426 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Running)); | |
427 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); | |
428 } | |
429 | |
430 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Failure)); | |
431 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Success)); | |
432 } | |
433 | |
434 | |
435 TEST(JobsRegistry, Resubmit) | |
436 { | |
437 JobsRegistry registry; | |
2557 | 438 |
439 std::string id; | |
2558 | 440 registry.Submit(id, new DummyJob(), 10); |
2557 | 441 |
2558 | 442 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
2557 | 443 |
2558 | 444 registry.Resubmit(id); |
445 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 446 |
447 { | |
2558 | 448 JobsRegistry::RunningJob job(registry, 0); |
2557 | 449 ASSERT_TRUE(job.IsValid()); |
450 job.MarkFailure(); | |
451 | |
2558 | 452 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
2557 | 453 |
2558 | 454 registry.Resubmit(id); |
455 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 456 } |
457 | |
2558 | 458 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
2557 | 459 |
2558 | 460 registry.Resubmit(id); |
461 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 462 |
463 { | |
2558 | 464 JobsRegistry::RunningJob job(registry, 0); |
2557 | 465 ASSERT_TRUE(job.IsValid()); |
466 ASSERT_EQ(id, job.GetId()); | |
467 | |
468 job.MarkSuccess(); | |
2558 | 469 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
470 } | |
471 | |
472 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
473 | |
474 registry.Resubmit(id); | |
475 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
476 } | |
477 | |
478 | |
479 TEST(JobsRegistry, Retry) | |
480 { | |
481 JobsRegistry registry; | |
482 | |
483 std::string id; | |
484 registry.Submit(id, new DummyJob(), 10); | |
485 | |
486 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
487 | |
488 { | |
489 JobsRegistry::RunningJob job(registry, 0); | |
490 ASSERT_TRUE(job.IsValid()); | |
491 job.MarkRetry(0); | |
492 | |
493 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
494 } | |
495 | |
496 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
497 | |
498 registry.Resubmit(id); | |
499 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
500 | |
501 registry.ScheduleRetries(); | |
502 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
503 | |
504 { | |
505 JobsRegistry::RunningJob job(registry, 0); | |
506 ASSERT_TRUE(job.IsValid()); | |
507 job.MarkSuccess(); | |
508 | |
509 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
2557 | 510 } |
511 | |
2558 | 512 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
513 } | |
514 | |
515 | |
516 TEST(JobsRegistry, PausePending) | |
517 { | |
518 JobsRegistry registry; | |
519 | |
520 std::string id; | |
521 registry.Submit(id, new DummyJob(), 10); | |
522 | |
523 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
524 | |
525 registry.Pause(id); | |
526 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
527 | |
528 registry.Pause(id); | |
529 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
530 | |
531 registry.Resubmit(id); | |
532 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
533 | |
534 registry.Resume(id); | |
535 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
2557 | 536 } |
2558 | 537 |
538 | |
539 TEST(JobsRegistry, PauseRunning) | |
540 { | |
541 JobsRegistry registry; | |
542 | |
543 std::string id; | |
544 registry.Submit(id, new DummyJob(), 10); | |
545 | |
546 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
547 | |
548 { | |
549 JobsRegistry::RunningJob job(registry, 0); | |
550 ASSERT_TRUE(job.IsValid()); | |
551 | |
552 registry.Resubmit(id); | |
2562 | 553 job.MarkPause(); |
2558 | 554 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
555 } | |
556 | |
557 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
558 | |
559 registry.Resubmit(id); | |
560 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
561 | |
562 registry.Resume(id); | |
563 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
564 | |
565 { | |
566 JobsRegistry::RunningJob job(registry, 0); | |
567 ASSERT_TRUE(job.IsValid()); | |
568 | |
569 job.MarkSuccess(); | |
570 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
571 } | |
572 | |
573 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
574 } | |
575 | |
576 | |
577 TEST(JobsRegistry, PauseRetry) | |
578 { | |
579 JobsRegistry registry; | |
580 | |
581 std::string id; | |
582 registry.Submit(id, new DummyJob(), 10); | |
583 | |
584 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
585 | |
586 { | |
587 JobsRegistry::RunningJob job(registry, 0); | |
588 ASSERT_TRUE(job.IsValid()); | |
589 | |
590 job.MarkRetry(0); | |
591 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
592 } | |
593 | |
594 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
595 | |
596 registry.Pause(id); | |
597 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
598 | |
599 registry.Resume(id); | |
600 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
601 | |
602 { | |
603 JobsRegistry::RunningJob job(registry, 0); | |
604 ASSERT_TRUE(job.IsValid()); | |
605 | |
606 job.MarkSuccess(); | |
607 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
608 } | |
609 | |
610 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
611 } | |
2565 | 612 |
613 | |
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
614 |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
615 |
2565 | 616 TEST(JobsEngine, Basic) |
617 { | |
618 JobsEngine engine; | |
619 | |
620 std::string s; | |
621 | |
622 for (size_t i = 0; i < 20; i++) | |
623 engine.GetRegistry().Submit(s, new DummyJob(), rand() % 10); | |
624 | |
625 engine.SetWorkersCount(3); | |
626 engine.Start(); | |
627 | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
628 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
629 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
630 { |
2568 | 631 typedef std::set<std::string> Jobs; |
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 Jobs jobs; |
2568 | 634 engine.GetRegistry().ListJobs(jobs); |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
635 |
2568 | 636 Json::Value v = Json::arrayValue; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
637 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
|
638 { |
2568 | 639 JobInfo info; |
640 | |
641 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
642 { | |
643 Json::Value vv; | |
2580
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
644 info.Serialize(vv); |
2568 | 645 v.append(vv); |
646 } | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
647 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
648 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
649 std::cout << v << std::endl; |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
650 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
651 std::cout << "====================================================" << std::endl; |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
652 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
653 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
654 |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
655 if (1) |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
656 { |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
657 printf(">> %d\n", engine.GetRegistry().SubmitAndWait(new DummyJob(JobStepResult(Orthanc::JobStepCode_Failure)), rand() % 10)); |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
658 } |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
659 |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
660 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
661 |
2565 | 662 |
663 engine.Stop(); | |
664 | |
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
665 if (0) |
2565 | 666 { |
2568 | 667 typedef std::set<std::string> Jobs; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
668 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
669 Jobs jobs; |
2568 | 670 engine.GetRegistry().ListJobs(jobs); |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
671 |
2568 | 672 Json::Value v = Json::arrayValue; |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
673 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
|
674 { |
2568 | 675 JobInfo info; |
676 | |
677 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
678 { | |
679 Json::Value vv; | |
2580
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
680 info.Serialize(vv); |
2568 | 681 v.append(vv); |
682 } | |
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
683 } |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
684 |
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
685 std::cout << v << std::endl; |
2565 | 686 } |
687 } |