Mercurial > hg > orthanc
annotate UnitTestsSources/MultiThreadingTests.cpp @ 2556:91e944c8389b jobs
IJob
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 03 May 2018 10:27:39 +0200 |
| parents | 878b59270859 |
| children | b4516a6f214b |
| rev | line source |
|---|---|
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
1 /** |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1009
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
6 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
10 * License, or (at your option) any later version. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
11 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
13 * program give permission to link the code of its release with the |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
22 * in the program, then also delete it here. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
23 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
27 * General Public License for more details. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
28 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
31 **/ |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
32 |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
33 |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
827
diff
changeset
|
34 #include "PrecompiledHeadersUnitTests.h" |
| 723 | 35 #include "gtest/gtest.h" |
| 36 | |
| 781 | 37 #include "../OrthancServer/Scheduler/ServerScheduler.h" |
| 723 | 38 #include "../Core/OrthancException.h" |
|
2143
fd5875662670
creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2140
diff
changeset
|
39 #include "../Core/SystemToolbox.h" |
| 723 | 40 #include "../Core/Toolbox.h" |
| 760 | 41 #include "../Core/MultiThreading/Locker.h" |
| 42 #include "../Core/MultiThreading/Mutex.h" | |
| 43 #include "../Core/MultiThreading/ReaderWriterLock.h" | |
| 723 | 44 |
| 45 using namespace Orthanc; | |
| 46 | |
| 47 namespace | |
| 48 { | |
|
1396
ac4efabeb80c
Migration of the orthanc-client as a separate project
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1304
diff
changeset
|
49 class DynamicInteger : public IDynamicObject |
| 723 | 50 { |
| 51 private: | |
| 52 int value_; | |
| 53 std::set<int>& target_; | |
| 54 | |
| 55 public: | |
| 56 DynamicInteger(int value, std::set<int>& target) : | |
| 57 value_(value), target_(target) | |
| 58 { | |
| 59 } | |
| 60 | |
| 61 int GetValue() const | |
| 62 { | |
| 63 return value_; | |
| 64 } | |
| 65 }; | |
| 66 } | |
| 67 | |
| 68 | |
| 69 TEST(MultiThreading, SharedMessageQueueBasic) | |
| 70 { | |
| 71 std::set<int> s; | |
| 72 | |
| 73 SharedMessageQueue q; | |
| 74 ASSERT_TRUE(q.WaitEmpty(0)); | |
| 75 q.Enqueue(new DynamicInteger(10, s)); | |
| 76 ASSERT_FALSE(q.WaitEmpty(1)); | |
| 77 q.Enqueue(new DynamicInteger(20, s)); | |
| 78 q.Enqueue(new DynamicInteger(30, s)); | |
| 79 q.Enqueue(new DynamicInteger(40, s)); | |
| 80 | |
| 81 std::auto_ptr<DynamicInteger> i; | |
| 82 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(10, i->GetValue()); | |
| 83 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(20, i->GetValue()); | |
| 84 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(30, i->GetValue()); | |
| 85 ASSERT_FALSE(q.WaitEmpty(1)); | |
| 86 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(40, i->GetValue()); | |
| 87 ASSERT_TRUE(q.WaitEmpty(0)); | |
| 88 ASSERT_EQ(NULL, q.Dequeue(1)); | |
| 89 } | |
| 90 | |
| 91 | |
| 92 TEST(MultiThreading, SharedMessageQueueClean) | |
| 93 { | |
| 94 std::set<int> s; | |
| 95 | |
| 96 try | |
| 97 { | |
| 98 SharedMessageQueue q; | |
| 99 q.Enqueue(new DynamicInteger(10, s)); | |
| 100 q.Enqueue(new DynamicInteger(20, s)); | |
|
1583
9ea3d082b064
got rid of custom exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
101 throw OrthancException(ErrorCode_InternalError); |
| 723 | 102 } |
| 103 catch (OrthancException&) | |
| 104 { | |
| 105 } | |
| 106 } | |
| 107 | |
| 108 | |
| 760 | 109 TEST(MultiThreading, Mutex) |
| 110 { | |
| 111 Mutex mutex; | |
| 112 Locker locker(mutex); | |
| 113 } | |
| 114 | |
| 115 | |
| 116 TEST(MultiThreading, ReaderWriterLock) | |
| 117 { | |
| 118 ReaderWriterLock lock; | |
| 119 | |
| 120 { | |
| 121 Locker locker1(lock.ForReader()); | |
| 122 Locker locker2(lock.ForReader()); | |
| 123 } | |
| 124 | |
| 125 { | |
| 126 Locker locker3(lock.ForWriter()); | |
| 127 } | |
| 128 } | |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
129 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
130 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
131 |
|
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
132 #include "../Core/DicomNetworking/ReusableDicomUserConnection.h" |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
133 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
134 TEST(ReusableDicomUserConnection, DISABLED_Basic) |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
135 { |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
136 ReusableDicomUserConnection c; |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
137 c.SetMillisecondsBeforeClose(200); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
138 printf("START\n"); fflush(stdout); |
|
775
d3ba35466225
integration mainline -> lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
139 |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
140 { |
|
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
141 RemoteModalityParameters remote("STORESCP", "localhost", 2000, ModalityManufacturer_Generic); |
|
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
142 ReusableDicomUserConnection::Locker lock(c, "ORTHANC", remote); |
|
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2143
diff
changeset
|
143 lock.GetConnection().StoreFile("/home/jodogne/DICOM/Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386844.676281"); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
144 } |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
145 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
146 printf("**\n"); fflush(stdout); |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
147 SystemToolbox::USleep(1000000); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
148 printf("**\n"); fflush(stdout); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
149 |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
150 { |
|
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
151 RemoteModalityParameters remote("STORESCP", "localhost", 2000, ModalityManufacturer_Generic); |
|
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1396
diff
changeset
|
152 ReusableDicomUserConnection::Locker lock(c, "ORTHANC", remote); |
|
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2143
diff
changeset
|
153 lock.GetConnection().StoreFile("/home/jodogne/DICOM/Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386844.676277"); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
154 } |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
155 |
| 2140 | 156 SystemToolbox::ServerBarrier(); |
|
769
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
157 printf("DONE\n"); fflush(stdout); |
|
3f946e5c3802
ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
760
diff
changeset
|
158 } |
| 765 | 159 |
| 160 | |
| 161 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
162 class Tutu : public IServerCommand |
| 765 | 163 { |
| 164 private: | |
| 165 int factor_; | |
| 166 | |
| 167 public: | |
| 168 Tutu(int f) : factor_(f) | |
| 169 { | |
| 170 } | |
| 171 | |
| 172 virtual bool Apply(ListOfStrings& outputs, | |
| 173 const ListOfStrings& inputs) | |
| 174 { | |
| 175 for (ListOfStrings::const_iterator | |
| 1304 | 176 it = inputs.begin(); it != inputs.end(); ++it) |
| 765 | 177 { |
| 178 int a = boost::lexical_cast<int>(*it); | |
| 179 int b = factor_ * a; | |
| 180 | |
| 181 printf("%d * %d = %d\n", a, factor_, b); | |
| 182 | |
| 183 //if (a == 84) { printf("BREAK\n"); return false; } | |
| 184 | |
| 185 outputs.push_back(boost::lexical_cast<std::string>(b)); | |
| 186 } | |
| 187 | |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
188 SystemToolbox::USleep(30000); |
| 765 | 189 |
| 190 return true; | |
| 191 } | |
| 192 }; | |
| 193 | |
| 768 | 194 |
| 770 | 195 static void Tata(ServerScheduler* s, ServerJob* j, bool* done) |
| 768 | 196 { |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
197 typedef IServerCommand::ListOfStrings ListOfStrings; |
| 779 | 198 |
| 770 | 199 while (!(*done)) |
| 768 | 200 { |
| 201 ListOfStrings l; | |
| 202 s->GetListOfJobs(l); | |
| 1304 | 203 for (ListOfStrings::iterator it = l.begin(); it != l.end(); ++it) |
| 204 { | |
| 205 printf(">> %s: %0.1f\n", it->c_str(), 100.0f * s->GetProgress(*it)); | |
| 206 } | |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
207 SystemToolbox::USleep(3000); |
| 768 | 208 } |
| 209 } | |
| 210 | |
| 211 | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
212 TEST(MultiThreading, ServerScheduler) |
| 765 | 213 { |
|
995
8c67382f44a7
limit number of jobs in the scheduler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
994
diff
changeset
|
214 ServerScheduler scheduler(10); |
| 765 | 215 |
| 216 ServerJob job; | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
217 ServerCommandInstance& f2 = job.AddCommand(new Tutu(2)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
218 ServerCommandInstance& f3 = job.AddCommand(new Tutu(3)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
219 ServerCommandInstance& f4 = job.AddCommand(new Tutu(4)); |
|
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
220 ServerCommandInstance& f5 = job.AddCommand(new Tutu(5)); |
| 765 | 221 f2.AddInput(boost::lexical_cast<std::string>(42)); |
| 222 //f3.AddInput(boost::lexical_cast<std::string>(42)); | |
| 223 //f4.AddInput(boost::lexical_cast<std::string>(42)); | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
224 f2.ConnectOutput(f3); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
225 f3.ConnectOutput(f4); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
226 f4.ConnectOutput(f5); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
227 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
228 f3.SetConnectedToSink(true); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
229 f5.SetConnectedToSink(true); |
| 765 | 230 |
| 231 job.SetDescription("tutu"); | |
| 232 | |
| 770 | 233 bool done = false; |
| 234 boost::thread t(Tata, &scheduler, &job, &done); | |
| 768 | 235 |
| 236 | |
| 765 | 237 //scheduler.Submit(job); |
| 238 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
239 IServerCommand::ListOfStrings l; |
| 765 | 240 scheduler.SubmitAndWait(l, job); |
| 241 | |
| 1492 | 242 ASSERT_EQ(2u, l.size()); |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
243 ASSERT_EQ(42 * 2 * 3, boost::lexical_cast<int>(l.front())); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
244 ASSERT_EQ(42 * 2 * 3 * 4 * 5, boost::lexical_cast<int>(l.back())); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1005
diff
changeset
|
245 |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
995
diff
changeset
|
246 for (IServerCommand::ListOfStrings::iterator i = l.begin(); i != l.end(); i++) |
| 765 | 247 { |
| 248 printf("** %s\n", i->c_str()); | |
| 249 } | |
| 250 | |
| 2140 | 251 //SystemToolbox::ServerBarrier(); |
|
2242
4e8e0ad2001c
move USleep() in SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2222
diff
changeset
|
252 //SystemToolbox::USleep(3000000); |
| 768 | 253 |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
254 scheduler.Stop(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
255 |
| 770 | 256 done = true; |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
257 if (t.joinable()) |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
258 { |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
259 t.join(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
260 } |
| 765 | 261 } |
| 2556 | 262 |
| 263 | |
| 264 | |
| 265 | |
| 266 | |
| 267 #if !defined(ORTHANC_SANDBOXED) | |
| 268 # error The macro ORTHANC_SANDBOXED must be defined | |
| 269 #endif | |
| 270 | |
| 271 #if ORTHANC_SANDBOXED == 1 | |
| 272 # error The job engine cannot be used in sandboxed environments | |
| 273 #endif | |
| 274 | |
| 275 #include <boost/date_time/posix_time/posix_time.hpp> | |
| 276 | |
| 277 namespace Orthanc | |
| 278 { | |
| 279 enum JobState | |
| 280 { | |
| 281 JobState_Pending, | |
| 282 JobState_Running, | |
| 283 JobState_Success, | |
| 284 JobState_Failure, | |
| 285 JobState_Paused, | |
| 286 JobState_Retry | |
| 287 }; | |
| 288 | |
| 289 enum JobStepStatus | |
| 290 { | |
| 291 JobStepStatus_Success, | |
| 292 JobStepStatus_Error, | |
| 293 JobStepStatus_Continue, | |
| 294 JobStepStatus_Retry | |
| 295 }; | |
| 296 | |
| 297 | |
| 298 class IJobStepResult : public boost::noncopyable | |
| 299 { | |
| 300 private: | |
| 301 JobStepStatus status_; | |
| 302 | |
| 303 public: | |
| 304 explicit IJobStepResult(JobStepStatus status) : | |
| 305 status_(status) | |
| 306 { | |
| 307 } | |
| 308 | |
| 309 virtual ~IJobStepResult() | |
| 310 { | |
| 311 } | |
| 312 | |
| 313 JobStepStatus GetStatus() const | |
| 314 { | |
| 315 return status_; | |
| 316 } | |
| 317 }; | |
| 318 | |
| 319 | |
| 320 class RetryResult : public IJobStepResult | |
| 321 { | |
| 322 private: | |
| 323 unsigned int timeout_; // Retry after "timeout_" milliseconds | |
| 324 | |
| 325 public: | |
| 326 RetryResult(unsigned int timeout) : | |
| 327 IJobStepResult(JobStepStatus_Retry), | |
| 328 timeout_(timeout) | |
| 329 { | |
| 330 } | |
| 331 | |
| 332 unsigned int GetTimeout() const | |
| 333 { | |
| 334 return timeout_; | |
| 335 } | |
| 336 }; | |
| 337 | |
| 338 | |
| 339 class IJob : public boost::noncopyable | |
| 340 { | |
| 341 public: | |
| 342 virtual ~IJob() | |
| 343 { | |
| 344 } | |
| 345 | |
| 346 virtual IJobStepResult* ExecuteStep() = 0; | |
| 347 | |
| 348 virtual void ReleaseResources() = 0; // For pausing jobs | |
| 349 | |
| 350 virtual float GetProgress() = 0; | |
| 351 | |
| 352 virtual void FormatStatus(Json::Value& value) = 0; | |
| 353 }; | |
| 354 | |
| 355 | |
| 356 class JobsMonitor : public boost::noncopyable | |
| 357 { | |
| 358 private: | |
| 359 class JobHandler : public boost::noncopyable | |
| 360 { | |
| 361 private: | |
| 362 std::string id_; | |
| 363 JobState state_; | |
| 364 std::auto_ptr<IJob> job_; | |
| 365 int priority_; // "+inf()" means highest priority | |
| 366 boost::posix_time::ptime creationTime_; | |
| 367 boost::posix_time::ptime lastUpdateTime_; | |
| 368 uint64_t runtime_; // In milliseconds | |
| 369 | |
| 370 public: | |
| 371 JobHandler(IJob* job, | |
| 372 int priority) : | |
| 373 id_(Toolbox::GenerateUuid()), | |
| 374 state_(JobState_Pending), | |
| 375 job_(job), | |
| 376 priority_(priority), | |
| 377 creationTime_(boost::posix_time::microsec_clock::universal_time()), | |
| 378 lastUpdateTime_(creationTime_), | |
| 379 runtime_(0) | |
| 380 { | |
| 381 if (job == NULL) | |
| 382 { | |
| 383 throw OrthancException(ErrorCode_NullPointer); | |
| 384 } | |
| 385 } | |
| 386 | |
| 387 const std::string& GetId() const | |
| 388 { | |
| 389 return id_; | |
| 390 } | |
| 391 }; | |
| 392 | |
| 393 public: | |
| 394 void Submit(std::string& id, | |
| 395 IJob* job, | |
| 396 int priority) | |
| 397 { | |
| 398 std::auto_ptr<JobHandler> handler(new JobHandler(job, priority)); | |
| 399 id = handler->GetId(); | |
| 400 } | |
| 401 | |
| 402 void SetPriority(const std::string& id, | |
| 403 int priority) | |
| 404 { | |
| 405 // TODO | |
| 406 } | |
| 407 | |
| 408 void Pause(const std::string& id) | |
| 409 { | |
| 410 // TODO | |
| 411 } | |
| 412 | |
| 413 void Resume(const std::string& id) | |
| 414 { | |
| 415 // TODO | |
| 416 } | |
| 417 | |
| 418 void Resubmit(const std::string& id) | |
| 419 { | |
| 420 // TODO | |
| 421 } | |
| 422 | |
| 423 class JobToRun : public boost::noncopyable | |
| 424 { | |
| 425 private: | |
| 426 JobHandler* handler_; | |
| 427 | |
| 428 public: | |
| 429 JobToRun(JobsMonitor& that, | |
| 430 unsigned int timeout) : | |
| 431 handler_(NULL) | |
| 432 { | |
| 433 } | |
| 434 | |
| 435 bool IsValid() const | |
| 436 { | |
| 437 return handler_ != NULL; | |
| 438 } | |
| 439 | |
| 440 | |
| 441 }; | |
| 442 }; | |
| 443 } |