Mercurial > hg > orthanc-stone
annotate Resources/Orthanc/Core/MultiThreading/BagOfTasksProcessor.cpp @ 202:e7f90aba3c97
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 26 Mar 2018 18:10:34 +0200 |
parents | 03afbee0cc7b |
children |
rev | line source |
---|---|
200
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #include "BagOfTasksProcessor.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 #include "../Logging.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 #include "../OrthancException.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 #include <stdio.h> |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 namespace Orthanc |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 class BagOfTasksProcessor::Task : public IDynamicObject |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 private: |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 uint64_t bag_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 std::auto_ptr<ICommand> command_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 public: |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 Task(uint64_t bag, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 ICommand* command) : |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 bag_(bag), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 command_(command) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 bool Execute() |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 try |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 return command_->Execute(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 catch (OrthancException& e) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 LOG(ERROR) << "Exception while processing a bag of tasks: " << e.What(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
67 return false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 catch (std::runtime_error& e) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
71 LOG(ERROR) << "Runtime exception while processing a bag of tasks: " << e.what(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
72 return false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 catch (...) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 LOG(ERROR) << "Native exception while processing a bag of tasks"; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
77 return false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
78 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
79 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
80 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 uint64_t GetBag() |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
82 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
83 return bag_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
84 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
85 }; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
86 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
87 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
88 void BagOfTasksProcessor::SignalProgress(Task& task, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
89 Bag& bag) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
90 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
91 assert(bag.done_ < bag.size_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
92 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
93 bag.done_ += 1; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
94 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
95 if (bag.done_ == bag.size_) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
96 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
97 exitStatus_[task.GetBag()] = (bag.status_ == BagStatus_Running); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
98 bagFinished_.notify_all(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
99 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
100 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
101 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
102 void BagOfTasksProcessor::Worker(BagOfTasksProcessor* that) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
103 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
104 while (that->continue_) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
105 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
106 std::auto_ptr<IDynamicObject> obj(that->queue_.Dequeue(100)); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
107 if (obj.get() != NULL) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
108 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
109 Task& task = *dynamic_cast<Task*>(obj.get()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
110 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
111 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
112 boost::mutex::scoped_lock lock(that->mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
113 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
114 Bags::iterator bag = that->bags_.find(task.GetBag()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
115 assert(bag != that->bags_.end()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 assert(bag->second.done_ < bag->second.size_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 if (bag->second.status_ != BagStatus_Running) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 // Do not execute this task, as its parent bag of tasks |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 // has failed or is tagged as canceled |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 that->SignalProgress(task, bag->second); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 continue; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
124 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
127 bool success = task.Execute(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
128 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
129 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
130 boost::mutex::scoped_lock lock(that->mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
131 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
132 Bags::iterator bag = that->bags_.find(task.GetBag()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
133 assert(bag != that->bags_.end()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
134 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
135 if (!success) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
136 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
137 bag->second.status_ = BagStatus_Failed; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
138 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
139 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
140 that->SignalProgress(task, bag->second); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
141 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
142 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
143 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
144 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
145 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
146 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
147 void BagOfTasksProcessor::Cancel(int64_t bag) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
148 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
149 boost::mutex::scoped_lock lock(mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
150 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
151 Bags::iterator it = bags_.find(bag); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
152 if (it != bags_.end()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
153 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
154 it->second.status_ = BagStatus_Canceled; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
155 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
157 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
158 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
159 bool BagOfTasksProcessor::Join(int64_t bag) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
160 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
161 boost::mutex::scoped_lock lock(mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
162 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
163 while (continue_) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
164 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
165 ExitStatus::iterator it = exitStatus_.find(bag); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
166 if (it == exitStatus_.end()) // The bag is still running |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
167 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
168 bagFinished_.wait(lock); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
169 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
170 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
171 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
172 bool status = it->second; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
173 exitStatus_.erase(it); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
174 return status; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
175 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
176 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
177 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
178 return false; // The processor is stopping |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
179 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
180 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
181 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
182 float BagOfTasksProcessor::GetProgress(int64_t bag) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
183 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
184 boost::mutex::scoped_lock lock(mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
185 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
186 Bags::const_iterator it = bags_.find(bag); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
187 if (it == bags_.end()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
188 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
189 // The bag of tasks has finished |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
190 return 1.0f; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
191 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
192 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
193 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
194 return (static_cast<float>(it->second.done_) / |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
195 static_cast<float>(it->second.size_)); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
196 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
197 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
198 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
199 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
200 bool BagOfTasksProcessor::Handle::Join() |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
201 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
202 if (hasJoined_) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
203 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
204 return status_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
205 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
206 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
207 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
208 status_ = that_.Join(bag_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
209 hasJoined_ = true; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
210 return status_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
211 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
212 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
213 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
214 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
215 BagOfTasksProcessor::BagOfTasksProcessor(size_t countThreads) : |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
216 countBags_(0), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
217 continue_(true) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
218 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
219 if (countThreads == 0) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
220 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
221 throw OrthancException(ErrorCode_ParameterOutOfRange); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
222 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
223 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
224 threads_.resize(countThreads); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
225 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
226 for (size_t i = 0; i < threads_.size(); i++) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
227 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
228 threads_[i] = new boost::thread(Worker, this); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
229 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
230 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
231 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
232 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
233 BagOfTasksProcessor::~BagOfTasksProcessor() |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
234 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
235 continue_ = false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
236 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
237 bagFinished_.notify_all(); // Wakes up all the pending "Join()" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
238 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
239 for (size_t i = 0; i < threads_.size(); i++) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
240 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
241 if (threads_[i]) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
242 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
243 if (threads_[i]->joinable()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
244 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
245 threads_[i]->join(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
246 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
247 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
248 delete threads_[i]; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
249 threads_[i] = NULL; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
250 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
251 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
252 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
253 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
254 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
255 BagOfTasksProcessor::Handle* BagOfTasksProcessor::Submit(BagOfTasks& tasks) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
256 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
257 if (tasks.GetSize() == 0) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
258 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
259 return new Handle(*this, 0, true); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
260 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
261 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
262 boost::mutex::scoped_lock lock(mutex_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
263 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
264 uint64_t id = countBags_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
265 countBags_ += 1; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
266 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
267 Bag bag(tasks.GetSize()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
268 bags_[id] = bag; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
269 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
270 while (!tasks.IsEmpty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
271 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
272 queue_.Enqueue(new Task(id, tasks.Pop())); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
273 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
274 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
275 return new Handle(*this, id, false); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
276 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
277 } |