Mercurial > hg > orthanc
annotate UnitTestsSources/MultiThreadingTests.cpp @ 2598:34dc57f4a7d2 jobs
simplification of JobStepResult
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 16 May 2018 16:23:20 +0200 |
| parents | a3fdfb6979ed |
| children | 593d6b0f4cba |
| 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/JobsEngine.h" |
| 38 #include "../Core/MultiThreading/Locker.h" | |
| 723 | 39 #include "../Core/OrthancException.h" |
|
2143
fd5875662670
creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2140
diff
changeset
|
40 #include "../Core/SystemToolbox.h" |
| 723 | 41 #include "../Core/Toolbox.h" |
| 2569 | 42 #include "../OrthancServer/Scheduler/ServerScheduler.h" |
| 723 | 43 |
| 44 using namespace Orthanc; | |
| 45 | |
| 46 namespace | |
| 47 { | |
|
1396
ac4efabeb80c
Migration of the orthanc-client as a separate project
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1304
diff
changeset
|
48 class DynamicInteger : public IDynamicObject |
| 723 | 49 { |
| 50 private: | |
| 51 int value_; | |
| 52 std::set<int>& target_; | |
| 53 | |
| 54 public: | |
| 55 DynamicInteger(int value, std::set<int>& target) : | |
| 56 value_(value), target_(target) | |
| 57 { | |
| 58 } | |
| 59 | |
| 60 int GetValue() const | |
| 61 { | |
| 62 return value_; | |
| 63 } | |
| 64 }; | |
| 65 } | |
| 66 | |
| 67 | |
| 68 TEST(MultiThreading, SharedMessageQueueBasic) | |
| 69 { | |
| 70 std::set<int> s; | |
| 71 | |
| 72 SharedMessageQueue q; | |
| 73 ASSERT_TRUE(q.WaitEmpty(0)); | |
| 74 q.Enqueue(new DynamicInteger(10, s)); | |
| 75 ASSERT_FALSE(q.WaitEmpty(1)); | |
| 76 q.Enqueue(new DynamicInteger(20, s)); | |
| 77 q.Enqueue(new DynamicInteger(30, s)); | |
| 78 q.Enqueue(new DynamicInteger(40, s)); | |
| 79 | |
| 80 std::auto_ptr<DynamicInteger> i; | |
| 81 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(10, i->GetValue()); | |
| 82 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(20, i->GetValue()); | |
| 83 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(30, i->GetValue()); | |
| 84 ASSERT_FALSE(q.WaitEmpty(1)); | |
| 85 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(40, i->GetValue()); | |
| 86 ASSERT_TRUE(q.WaitEmpty(0)); | |
| 87 ASSERT_EQ(NULL, q.Dequeue(1)); | |
| 88 } | |
| 89 | |
| 90 | |
| 91 TEST(MultiThreading, SharedMessageQueueClean) | |
| 92 { | |
| 93 std::set<int> s; | |
| 94 | |
| 95 try | |
| 96 { | |
| 97 SharedMessageQueue q; | |
| 98 q.Enqueue(new DynamicInteger(10, s)); | |
| 99 q.Enqueue(new DynamicInteger(20, s)); | |
|
1583
9ea3d082b064
got rid of custom exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
100 throw OrthancException(ErrorCode_InternalError); |
| 723 | 101 } |
| 102 catch (OrthancException&) | |
| 103 { | |
| 104 } | |
| 105 } | |
| 106 | |
| 107 | |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
108 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
109 |
|
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
110 #include "../Core/DicomNetworking/ReusableDicomUserConnection.h" |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
111 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
112 TEST(ReusableDicomUserConnection, DISABLED_Basic) |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
113 { |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
114 ReusableDicomUserConnection c; |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
115 c.SetMillisecondsBeforeClose(200); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
116 printf("START\n"); fflush(stdout); |
|
775
d3ba35466225
integration mainline -> lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
117 |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
118 { |
|
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
|
119 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
|
120 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
|
121 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
|
122 } |
|
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 printf("**\n"); fflush(stdout); |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
125 SystemToolbox::USleep(1000000); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
126 printf("**\n"); fflush(stdout); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
127 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
128 { |
|
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
|
129 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
|
130 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
|
131 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
|
132 } |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
133 |
| 2140 | 134 SystemToolbox::ServerBarrier(); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
135 printf("DONE\n"); fflush(stdout); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
136 } |
| 765 | 137 |
| 138 | |
| 139 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
140 class Tutu : public IServerCommand |
| 765 | 141 { |
| 142 private: | |
| 143 int factor_; | |
| 144 | |
| 145 public: | |
| 146 Tutu(int f) : factor_(f) | |
| 147 { | |
| 148 } | |
| 149 | |
| 150 virtual bool Apply(ListOfStrings& outputs, | |
| 151 const ListOfStrings& inputs) | |
| 152 { | |
| 153 for (ListOfStrings::const_iterator | |
| 1304 | 154 it = inputs.begin(); it != inputs.end(); ++it) |
| 765 | 155 { |
| 156 int a = boost::lexical_cast<int>(*it); | |
| 157 int b = factor_ * a; | |
| 158 | |
| 159 printf("%d * %d = %d\n", a, factor_, b); | |
| 160 | |
| 161 //if (a == 84) { printf("BREAK\n"); return false; } | |
| 162 | |
| 163 outputs.push_back(boost::lexical_cast<std::string>(b)); | |
| 164 } | |
| 165 | |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
166 SystemToolbox::USleep(30000); |
| 765 | 167 |
| 168 return true; | |
| 169 } | |
| 170 }; | |
| 171 | |
| 768 | 172 |
| 770 | 173 static void Tata(ServerScheduler* s, ServerJob* j, bool* done) |
| 768 | 174 { |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
175 typedef IServerCommand::ListOfStrings ListOfStrings; |
| 779 | 176 |
| 770 | 177 while (!(*done)) |
| 768 | 178 { |
| 179 ListOfStrings l; | |
| 180 s->GetListOfJobs(l); | |
| 1304 | 181 for (ListOfStrings::iterator it = l.begin(); it != l.end(); ++it) |
| 182 { | |
| 183 printf(">> %s: %0.1f\n", it->c_str(), 100.0f * s->GetProgress(*it)); | |
| 184 } | |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
185 SystemToolbox::USleep(3000); |
| 768 | 186 } |
| 187 } | |
| 188 | |
| 189 | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
190 TEST(MultiThreading, ServerScheduler) |
| 765 | 191 { |
|
995
8c67382f44a7
limit number of jobs in the scheduler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
994
diff
changeset
|
192 ServerScheduler scheduler(10); |
| 765 | 193 |
| 194 ServerJob job; | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
195 ServerCommandInstance& f2 = job.AddCommand(new Tutu(2)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
196 ServerCommandInstance& f3 = job.AddCommand(new Tutu(3)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
197 ServerCommandInstance& f4 = job.AddCommand(new Tutu(4)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
198 ServerCommandInstance& f5 = job.AddCommand(new Tutu(5)); |
| 765 | 199 f2.AddInput(boost::lexical_cast<std::string>(42)); |
| 200 //f3.AddInput(boost::lexical_cast<std::string>(42)); | |
| 201 //f4.AddInput(boost::lexical_cast<std::string>(42)); | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
202 f2.ConnectOutput(f3); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
203 f3.ConnectOutput(f4); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
204 f4.ConnectOutput(f5); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
205 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
206 f3.SetConnectedToSink(true); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
207 f5.SetConnectedToSink(true); |
| 765 | 208 |
| 209 job.SetDescription("tutu"); | |
| 210 | |
| 770 | 211 bool done = false; |
| 212 boost::thread t(Tata, &scheduler, &job, &done); | |
| 768 | 213 |
| 214 | |
| 765 | 215 //scheduler.Submit(job); |
| 216 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
217 IServerCommand::ListOfStrings l; |
| 765 | 218 scheduler.SubmitAndWait(l, job); |
| 219 | |
| 1492 | 220 ASSERT_EQ(2u, l.size()); |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
221 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
|
222 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
|
223 |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
224 for (IServerCommand::ListOfStrings::iterator i = l.begin(); i != l.end(); i++) |
| 765 | 225 { |
| 226 printf("** %s\n", i->c_str()); | |
| 227 } | |
| 228 | |
| 2140 | 229 //SystemToolbox::ServerBarrier(); |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
230 //SystemToolbox::USleep(3000000); |
| 768 | 231 |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
232 scheduler.Stop(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
233 |
| 770 | 234 done = true; |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
235 if (t.joinable()) |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
236 { |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
237 t.join(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
238 } |
| 765 | 239 } |
| 2556 | 240 |
| 241 | |
| 242 | |
| 2557 | 243 class DummyJob : public Orthanc::IJob |
| 244 { | |
| 245 private: | |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
246 bool fails_; |
| 2565 | 247 unsigned int count_; |
| 248 unsigned int steps_; | |
| 2557 | 249 |
| 250 public: | |
| 251 DummyJob() : | |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
252 fails_(false), |
| 2565 | 253 count_(0), |
| 254 steps_(4) | |
| 2557 | 255 { |
| 256 } | |
| 257 | |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
258 explicit DummyJob(bool fails) : |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
259 fails_(fails), |
| 2565 | 260 count_(0), |
| 261 steps_(4) | |
| 2557 | 262 { |
| 263 } | |
| 264 | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
265 virtual void Start() |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
266 { |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
267 } |
|
2583
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
268 |
|
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
269 virtual void SignalResubmit() |
|
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
270 { |
|
1b6a6d80b6f2
OrthancPeerStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2581
diff
changeset
|
271 } |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
272 |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
273 virtual JobStepResult ExecuteStep() |
| 2557 | 274 { |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
275 boost::this_thread::sleep(boost::posix_time::milliseconds(10)); |
| 2565 | 276 |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
277 if (fails_) |
| 2565 | 278 { |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
279 return JobStepResult::Failure(ErrorCode_ParameterOutOfRange); |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
280 } |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
281 else if (count_ == steps_ - 1) |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
282 { |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
283 return JobStepResult::Success(); |
| 2565 | 284 } |
| 285 else | |
| 286 { | |
| 287 count_++; | |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
288 return JobStepResult::Continue(); |
| 2565 | 289 } |
| 2557 | 290 } |
| 291 | |
| 292 virtual void ReleaseResources() | |
| 293 { | |
| 294 } | |
| 295 | |
| 296 virtual float GetProgress() | |
| 297 { | |
| 2565 | 298 return static_cast<float>(count_) / static_cast<float>(steps_ - 1); |
| 2557 | 299 } |
| 300 | |
|
2580
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
301 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
|
302 { |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
303 type = "DummyJob"; |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
304 } |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
305 |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
306 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
|
307 { |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
308 } |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
309 |
|
055d7d4a823f
avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
310 virtual void GetPublicContent(Json::Value& value) |
| 2557 | 311 { |
| 2565 | 312 value["hello"] = "world"; |
| 2557 | 313 } |
| 314 }; | |
| 315 | |
| 316 | |
| 2558 | 317 static bool CheckState(Orthanc::JobsRegistry& registry, |
| 2557 | 318 const std::string& id, |
| 319 Orthanc::JobState state) | |
| 320 { | |
| 321 Orthanc::JobState s; | |
| 2558 | 322 if (registry.GetState(s, id)) |
| 2557 | 323 { |
| 324 return state == s; | |
| 325 } | |
| 326 else | |
| 327 { | |
| 328 return false; | |
| 329 } | |
| 330 } | |
| 331 | |
| 332 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
333 static bool CheckErrorCode(Orthanc::JobsRegistry& registry, |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
334 const std::string& id, |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
335 Orthanc::ErrorCode code) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
336 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
337 Orthanc::JobInfo s; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
338 if (registry.GetJobInfo(s, id)) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
339 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
340 return code == s.GetStatus().GetErrorCode(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
341 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
342 else |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
343 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
344 return false; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
345 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
346 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
347 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
348 |
| 2558 | 349 TEST(JobsRegistry, Priority) |
| 2557 | 350 { |
| 2558 | 351 JobsRegistry registry; |
| 2557 | 352 |
| 353 std::string i1, i2, i3, i4; | |
| 2558 | 354 registry.Submit(i1, new DummyJob(), 10); |
| 355 registry.Submit(i2, new DummyJob(), 30); | |
| 356 registry.Submit(i3, new DummyJob(), 20); | |
| 357 registry.Submit(i4, new DummyJob(), 5); | |
| 2557 | 358 |
| 2558 | 359 registry.SetMaxCompletedJobs(2); |
| 2557 | 360 |
| 361 std::set<std::string> id; | |
| 2558 | 362 registry.ListJobs(id); |
| 2557 | 363 |
| 364 ASSERT_EQ(4u, id.size()); | |
| 365 ASSERT_TRUE(id.find(i1) != id.end()); | |
| 366 ASSERT_TRUE(id.find(i2) != id.end()); | |
| 367 ASSERT_TRUE(id.find(i3) != id.end()); | |
| 368 ASSERT_TRUE(id.find(i4) != id.end()); | |
| 369 | |
| 2558 | 370 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); |
| 2557 | 371 |
| 372 { | |
| 2558 | 373 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 374 ASSERT_TRUE(job.IsValid()); |
| 375 ASSERT_EQ(30, job.GetPriority()); | |
| 376 ASSERT_EQ(i2, job.GetId()); | |
| 377 | |
| 2558 | 378 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); |
| 2557 | 379 } |
| 380 | |
| 2558 | 381 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Failure)); |
| 382 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Pending)); | |
| 2557 | 383 |
| 384 { | |
| 2558 | 385 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 386 ASSERT_TRUE(job.IsValid()); |
| 387 ASSERT_EQ(20, job.GetPriority()); | |
| 388 ASSERT_EQ(i3, job.GetId()); | |
| 389 | |
| 390 job.MarkSuccess(); | |
| 391 | |
| 2558 | 392 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Running)); |
| 2557 | 393 } |
| 394 | |
| 2558 | 395 ASSERT_TRUE(CheckState(registry, i3, Orthanc::JobState_Success)); |
| 2557 | 396 |
| 397 { | |
| 2558 | 398 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 399 ASSERT_TRUE(job.IsValid()); |
| 400 ASSERT_EQ(10, job.GetPriority()); | |
| 401 ASSERT_EQ(i1, job.GetId()); | |
| 402 } | |
| 403 | |
| 404 { | |
| 2558 | 405 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 406 ASSERT_TRUE(job.IsValid()); |
| 407 ASSERT_EQ(5, job.GetPriority()); | |
| 408 ASSERT_EQ(i4, job.GetId()); | |
| 409 } | |
| 410 | |
| 411 { | |
| 2558 | 412 JobsRegistry::RunningJob job(registry, 1); |
| 2557 | 413 ASSERT_FALSE(job.IsValid()); |
| 414 } | |
| 415 | |
| 416 Orthanc::JobState s; | |
| 2558 | 417 ASSERT_TRUE(registry.GetState(s, i1)); |
| 418 ASSERT_FALSE(registry.GetState(s, i2)); // Removed because oldest | |
| 419 ASSERT_FALSE(registry.GetState(s, i3)); // Removed because second oldest | |
| 420 ASSERT_TRUE(registry.GetState(s, i4)); | |
| 2557 | 421 |
| 2558 | 422 registry.SetMaxCompletedJobs(1); // (*) |
| 423 ASSERT_FALSE(registry.GetState(s, i1)); // Just discarded by (*) | |
| 424 ASSERT_TRUE(registry.GetState(s, i4)); | |
| 2557 | 425 } |
| 426 | |
| 427 | |
| 2558 | 428 TEST(JobsRegistry, Simultaneous) |
| 2557 | 429 { |
| 2558 | 430 JobsRegistry registry; |
| 431 | |
| 432 std::string i1, i2; | |
| 433 registry.Submit(i1, new DummyJob(), 20); | |
| 434 registry.Submit(i2, new DummyJob(), 10); | |
| 435 | |
| 436 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Pending)); | |
| 437 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Pending)); | |
| 438 | |
| 439 { | |
| 440 JobsRegistry::RunningJob job1(registry, 0); | |
| 441 JobsRegistry::RunningJob job2(registry, 0); | |
| 442 | |
| 443 ASSERT_TRUE(job1.IsValid()); | |
| 444 ASSERT_TRUE(job2.IsValid()); | |
| 445 | |
| 446 job1.MarkFailure(); | |
| 447 job2.MarkSuccess(); | |
| 448 | |
| 449 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Running)); | |
| 450 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Running)); | |
| 451 } | |
| 452 | |
| 453 ASSERT_TRUE(CheckState(registry, i1, Orthanc::JobState_Failure)); | |
| 454 ASSERT_TRUE(CheckState(registry, i2, Orthanc::JobState_Success)); | |
| 455 } | |
| 456 | |
| 457 | |
| 458 TEST(JobsRegistry, Resubmit) | |
| 459 { | |
| 460 JobsRegistry registry; | |
| 2557 | 461 |
| 462 std::string id; | |
| 2558 | 463 registry.Submit(id, new DummyJob(), 10); |
| 2557 | 464 |
| 2558 | 465 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
| 2557 | 466 |
| 2558 | 467 registry.Resubmit(id); |
| 468 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 2557 | 469 |
| 470 { | |
| 2558 | 471 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 472 ASSERT_TRUE(job.IsValid()); |
| 473 job.MarkFailure(); | |
| 474 | |
| 2558 | 475 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
| 2557 | 476 |
| 2558 | 477 registry.Resubmit(id); |
| 478 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 2557 | 479 } |
| 480 | |
| 2558 | 481 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
| 2557 | 482 |
| 2558 | 483 registry.Resubmit(id); |
| 484 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 2557 | 485 |
| 486 { | |
| 2558 | 487 JobsRegistry::RunningJob job(registry, 0); |
| 2557 | 488 ASSERT_TRUE(job.IsValid()); |
| 489 ASSERT_EQ(id, job.GetId()); | |
| 490 | |
| 491 job.MarkSuccess(); | |
| 2558 | 492 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
| 493 } | |
| 494 | |
| 495 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
| 496 | |
| 497 registry.Resubmit(id); | |
| 498 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
| 499 } | |
| 500 | |
| 501 | |
| 502 TEST(JobsRegistry, Retry) | |
| 503 { | |
| 504 JobsRegistry registry; | |
| 505 | |
| 506 std::string id; | |
| 507 registry.Submit(id, new DummyJob(), 10); | |
| 508 | |
| 509 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 510 | |
| 511 { | |
| 512 JobsRegistry::RunningJob job(registry, 0); | |
| 513 ASSERT_TRUE(job.IsValid()); | |
| 514 job.MarkRetry(0); | |
| 515 | |
| 516 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 517 } | |
| 518 | |
| 519 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
| 520 | |
| 521 registry.Resubmit(id); | |
| 522 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
| 523 | |
| 524 registry.ScheduleRetries(); | |
| 525 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 526 | |
| 527 { | |
| 528 JobsRegistry::RunningJob job(registry, 0); | |
| 529 ASSERT_TRUE(job.IsValid()); | |
| 530 job.MarkSuccess(); | |
| 531 | |
| 532 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 2557 | 533 } |
| 534 | |
| 2558 | 535 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
| 536 } | |
| 537 | |
| 538 | |
| 539 TEST(JobsRegistry, PausePending) | |
| 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 registry.Pause(id); | |
| 549 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 550 | |
| 551 registry.Pause(id); | |
| 552 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 553 | |
| 554 registry.Resubmit(id); | |
| 555 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 556 | |
| 557 registry.Resume(id); | |
| 558 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 2557 | 559 } |
| 2558 | 560 |
| 561 | |
| 562 TEST(JobsRegistry, PauseRunning) | |
| 563 { | |
| 564 JobsRegistry registry; | |
| 565 | |
| 566 std::string id; | |
| 567 registry.Submit(id, new DummyJob(), 10); | |
| 568 | |
| 569 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 570 | |
| 571 { | |
| 572 JobsRegistry::RunningJob job(registry, 0); | |
| 573 ASSERT_TRUE(job.IsValid()); | |
| 574 | |
| 575 registry.Resubmit(id); | |
| 2562 | 576 job.MarkPause(); |
| 2558 | 577 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
| 578 } | |
| 579 | |
| 580 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 581 | |
| 582 registry.Resubmit(id); | |
| 583 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 584 | |
| 585 registry.Resume(id); | |
| 586 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 587 | |
| 588 { | |
| 589 JobsRegistry::RunningJob job(registry, 0); | |
| 590 ASSERT_TRUE(job.IsValid()); | |
| 591 | |
| 592 job.MarkSuccess(); | |
| 593 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 594 } | |
| 595 | |
| 596 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
| 597 } | |
| 598 | |
| 599 | |
| 600 TEST(JobsRegistry, PauseRetry) | |
| 601 { | |
| 602 JobsRegistry registry; | |
| 603 | |
| 604 std::string id; | |
| 605 registry.Submit(id, new DummyJob(), 10); | |
| 606 | |
| 607 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 608 | |
| 609 { | |
| 610 JobsRegistry::RunningJob job(registry, 0); | |
| 611 ASSERT_TRUE(job.IsValid()); | |
| 612 | |
| 613 job.MarkRetry(0); | |
| 614 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 615 } | |
| 616 | |
| 617 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); | |
| 618 | |
| 619 registry.Pause(id); | |
| 620 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); | |
| 621 | |
| 622 registry.Resume(id); | |
| 623 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); | |
| 624 | |
| 625 { | |
| 626 JobsRegistry::RunningJob job(registry, 0); | |
| 627 ASSERT_TRUE(job.IsValid()); | |
| 628 | |
| 629 job.MarkSuccess(); | |
| 630 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); | |
| 631 } | |
| 632 | |
| 633 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); | |
| 634 } | |
| 2565 | 635 |
| 636 | |
|
2581
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
637 TEST(JobsRegistry, Cancel) |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
638 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
639 JobsRegistry registry; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
640 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
641 std::string id; |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
642 registry.Submit(id, new DummyJob(), 10); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
643 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
644 ASSERT_FALSE(registry.Cancel("nope")); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
645 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
646 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
647 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
648 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
649 ASSERT_TRUE(registry.Cancel(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
650 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
651 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
652 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
653 ASSERT_TRUE(registry.Cancel(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
654 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
655 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
656 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
657 ASSERT_TRUE(registry.Resubmit(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
658 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
659 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
660 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
661 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
662 JobsRegistry::RunningJob job(registry, 0); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
663 ASSERT_TRUE(job.IsValid()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
664 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
665 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
666 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
667 job.MarkSuccess(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
668 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
669 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
670 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
671 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
672 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
673 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
674 ASSERT_TRUE(registry.Cancel(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
675 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
676 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
677 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
678 registry.Submit(id, new DummyJob(), 10); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
679 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
680 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
681 JobsRegistry::RunningJob job(registry, 0); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
682 ASSERT_TRUE(job.IsValid()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
683 ASSERT_EQ(id, job.GetId()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
684 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
685 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
686 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
687 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
688 job.MarkCanceled(); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
689 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
690 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
691 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
692 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
693 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
694 ASSERT_TRUE(registry.Resubmit(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
695 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
696 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
697 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
698 ASSERT_TRUE(registry.Pause(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
699 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Paused)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
700 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
701 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
702 ASSERT_TRUE(registry.Cancel(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
703 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
704 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
705 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
706 ASSERT_TRUE(registry.Resubmit(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
707 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Pending)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
708 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
709 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
710 { |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
711 JobsRegistry::RunningJob job(registry, 0); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
712 ASSERT_TRUE(job.IsValid()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
713 ASSERT_EQ(id, job.GetId()); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
714 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
715 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
716 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Running)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
717 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
718 job.MarkRetry(500); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
719 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
720 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
721 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Retry)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
722 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
723 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
724 ASSERT_TRUE(registry.Cancel(id)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
725 ASSERT_TRUE(CheckState(registry, id, Orthanc::JobState_Failure)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
726 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob)); |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
727 } |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
728 |
|
8da2cffc2378
JobsRegistry::Cancel()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2580
diff
changeset
|
729 |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
730 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
731 |
| 2565 | 732 TEST(JobsEngine, Basic) |
| 733 { | |
| 734 JobsEngine engine; | |
| 735 | |
| 736 std::string s; | |
| 737 | |
| 738 for (size_t i = 0; i < 20; i++) | |
| 739 engine.GetRegistry().Submit(s, new DummyJob(), rand() % 10); | |
| 740 | |
| 741 engine.SetWorkersCount(3); | |
| 742 engine.Start(); | |
| 743 | |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
744 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
745 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
746 { |
| 2568 | 747 typedef std::set<std::string> Jobs; |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
748 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
749 Jobs jobs; |
| 2568 | 750 engine.GetRegistry().ListJobs(jobs); |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
751 |
| 2568 | 752 Json::Value v = Json::arrayValue; |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
753 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
|
754 { |
| 2568 | 755 JobInfo info; |
| 756 | |
| 757 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
| 758 { | |
| 759 Json::Value vv; | |
|
2589
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2583
diff
changeset
|
760 info.Serialize(vv, true); |
| 2568 | 761 v.append(vv); |
| 762 } | |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
763 } |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
764 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
765 std::cout << v << std::endl; |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
766 } |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
767 std::cout << "====================================================" << std::endl; |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
768 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
769 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
770 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
771 if (1) |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
772 { |
|
2598
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
773 ASSERT_TRUE(engine.GetRegistry().SubmitAndWait(new DummyJob(), rand() % 10)); |
|
34dc57f4a7d2
simplification of JobStepResult
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2589
diff
changeset
|
774 ASSERT_FALSE(engine.GetRegistry().SubmitAndWait(new DummyJob(true), rand() % 10)); |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
775 } |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
776 |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
777 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); |
|
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
778 |
| 2565 | 779 |
| 780 engine.Stop(); | |
| 781 | |
|
2570
2e879c796ec7
JobsRegistry::SubmitAndWait(), StoreScuJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
782 if (0) |
| 2565 | 783 { |
| 2568 | 784 typedef std::set<std::string> Jobs; |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
785 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
786 Jobs jobs; |
| 2568 | 787 engine.GetRegistry().ListJobs(jobs); |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
788 |
| 2568 | 789 Json::Value v = Json::arrayValue; |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
790 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
|
791 { |
| 2568 | 792 JobInfo info; |
| 793 | |
| 794 if (engine.GetRegistry().GetJobInfo(info, *it)) | |
| 795 { | |
| 796 Json::Value vv; | |
|
2589
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2583
diff
changeset
|
797 info.Serialize(vv, true); |
| 2568 | 798 v.append(vv); |
| 799 } | |
|
2566
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
800 } |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
801 |
|
c09ce3c038fc
improved handling of eta
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2565
diff
changeset
|
802 std::cout << v << std::endl; |
| 2565 | 803 } |
| 804 } |