Mercurial > hg > orthanc
annotate OrthancServer/Scheduler/ServerJob.cpp @ 1753:faf2ecab3472 db-changes
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 27 Oct 2015 20:31:34 +0100 |
| parents | 0a2ad4a6858f |
| children | b1291df2f780 |
| rev | line source |
|---|---|
| 781 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1009
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1009
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 781 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 10 * | |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 22 * | |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
1624
0a2ad4a6858f
fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
33 #include "../PrecompiledHeadersServer.h" |
| 781 | 34 #include "ServerJob.h" |
| 35 | |
| 36 #include "../../Core/OrthancException.h" | |
| 37 #include "../../Core/Toolbox.h" | |
| 38 #include "../../Core/Uuid.h" | |
| 39 | |
| 40 namespace Orthanc | |
| 41 { | |
| 42 void ServerJob::CheckOrdering() | |
| 43 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
44 std::map<ServerCommandInstance*, unsigned int> index; |
| 781 | 45 |
| 46 unsigned int count = 0; | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
47 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 48 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 49 { |
| 50 index[*it] = count++; | |
| 51 } | |
| 52 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
53 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 54 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 55 { |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
56 const std::list<ServerCommandInstance*>& nextCommands = (*it)->GetNextCommands(); |
| 781 | 57 |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
58 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 59 next = nextCommands.begin(); next != nextCommands.end(); ++next) |
| 781 | 60 { |
| 61 if (index.find(*next) == index.end() || | |
| 62 index[*next] <= index[*it]) | |
| 63 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
64 // You must reorder your calls to "ServerJob::AddCommand" |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1304
diff
changeset
|
65 throw OrthancException(ErrorCode_BadJobOrdering); |
| 781 | 66 } |
| 67 } | |
| 68 } | |
| 69 } | |
| 70 | |
| 71 | |
| 72 size_t ServerJob::Submit(SharedMessageQueue& target, | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
73 ServerCommandInstance::IListener& listener) |
| 781 | 74 { |
| 75 if (submitted_) | |
| 76 { | |
| 77 // This job has already been submitted | |
| 78 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 79 } | |
| 80 | |
| 81 CheckOrdering(); | |
| 82 | |
| 83 size_t size = filters_.size(); | |
| 84 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
85 for (std::list<ServerCommandInstance*>::iterator |
| 1304 | 86 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 87 { |
| 88 target.Enqueue(*it); | |
| 89 } | |
| 90 | |
| 91 filters_.clear(); | |
| 92 submitted_ = true; | |
| 93 | |
| 94 return size; | |
| 95 } | |
| 96 | |
| 97 | |
| 1304 | 98 ServerJob::ServerJob() : |
| 99 jobId_(Toolbox::GenerateUuid()), | |
| 100 submitted_(false), | |
| 101 description_("no description") | |
| 781 | 102 { |
| 103 } | |
| 104 | |
| 105 | |
| 106 ServerJob::~ServerJob() | |
| 107 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
108 for (std::list<ServerCommandInstance*>::iterator |
| 1304 | 109 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 110 { |
| 111 delete *it; | |
| 112 } | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
113 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
114 for (std::list<IDynamicObject*>::iterator |
| 1304 | 115 it = payloads_.begin(); it != payloads_.end(); ++it) |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
116 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
117 delete *it; |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
118 } |
| 781 | 119 } |
| 120 | |
| 121 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
122 ServerCommandInstance& ServerJob::AddCommand(IServerCommand* filter) |
| 781 | 123 { |
| 124 if (submitted_) | |
| 125 { | |
| 126 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 127 } | |
| 128 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
129 filters_.push_back(new ServerCommandInstance(filter, jobId_)); |
| 781 | 130 |
| 131 return *filters_.back(); | |
| 132 } | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
133 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
134 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
135 IDynamicObject& ServerJob::AddPayload(IDynamicObject* payload) |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
136 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
137 if (submitted_) |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
138 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
139 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
140 } |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
141 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
142 payloads_.push_back(payload); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
143 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
144 return *filters_.back(); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
145 } |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
146 |
| 781 | 147 } |