Mercurial > hg > orthanc
annotate Core/Cache/SharedArchive.cpp @ 3316:4b1017928fc4
Fix performance issue in DICOM protocol by disabling Nagle's algorithm
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 28 Feb 2019 18:21:28 +0100 |
| parents | 4e43e67f8ecf |
| children | 94f4a18a79cc |
| rev | line source |
|---|---|
| 1367 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 1367 | 4 * Department, University Hospital of Liege, Belgium |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2976
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 1367 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #include "../PrecompiledHeaders.h" | |
| 35 #include "SharedArchive.h" | |
| 36 | |
|
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
37 #include "../Toolbox.h" |
|
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
38 |
| 1367 | 39 |
| 40 namespace Orthanc | |
| 41 { | |
| 42 void SharedArchive::RemoveInternal(const std::string& id) | |
| 43 { | |
| 44 Archive::iterator it = archive_.find(id); | |
| 45 | |
| 46 if (it != archive_.end()) | |
| 47 { | |
| 48 delete it->second; | |
| 49 archive_.erase(it); | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
50 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
51 lru_.Invalidate(id); |
| 1367 | 52 } |
| 53 } | |
| 54 | |
| 55 | |
| 56 SharedArchive::Accessor::Accessor(SharedArchive& that, | |
| 57 const std::string& id) : | |
| 58 lock_(that.mutex_) | |
| 59 { | |
| 60 Archive::iterator it = that.archive_.find(id); | |
| 61 | |
| 62 if (it == that.archive_.end()) | |
| 63 { | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
64 item_ = NULL; |
| 1367 | 65 } |
| 66 else | |
| 67 { | |
| 68 that.lru_.MakeMostRecent(id); | |
| 69 item_ = it->second; | |
| 70 } | |
| 71 } | |
| 72 | |
| 73 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
74 IDynamicObject& SharedArchive::Accessor::GetItem() const |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
75 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
76 if (item_ == NULL) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
77 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
78 // "IsValid()" should have been called |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
79 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
80 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
81 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
82 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
83 return *item_; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
84 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
85 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
86 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
87 |
| 1368 | 88 SharedArchive::SharedArchive(size_t maxSize) : |
| 89 maxSize_(maxSize) | |
| 90 { | |
| 91 if (maxSize == 0) | |
| 92 { | |
| 93 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 94 } | |
| 95 } | |
| 96 | |
| 97 | |
| 1367 | 98 SharedArchive::~SharedArchive() |
| 99 { | |
| 100 for (Archive::iterator it = archive_.begin(); | |
| 1386 | 101 it != archive_.end(); ++it) |
| 1367 | 102 { |
| 103 delete it->second; | |
| 104 } | |
| 105 } | |
| 106 | |
| 107 | |
| 108 std::string SharedArchive::Add(IDynamicObject* obj) | |
| 109 { | |
| 110 boost::mutex::scoped_lock lock(mutex_); | |
| 111 | |
| 112 if (archive_.size() == maxSize_) | |
| 113 { | |
| 114 // The quota has been reached, remove the oldest element | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
115 RemoveInternal(lru_.GetOldest()); |
| 1367 | 116 } |
| 117 | |
|
2512
4dcafa8d6633
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
118 std::string id = Toolbox::GenerateUuid(); |
| 1367 | 119 RemoveInternal(id); // Should never be useful because of UUID |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
120 |
| 1367 | 121 archive_[id] = obj; |
| 122 lru_.Add(id); | |
| 123 | |
| 124 return id; | |
| 125 } | |
| 126 | |
| 127 | |
| 128 void SharedArchive::Remove(const std::string& id) | |
| 129 { | |
| 130 boost::mutex::scoped_lock lock(mutex_); | |
| 131 RemoveInternal(id); | |
| 132 } | |
| 133 | |
| 134 | |
| 135 void SharedArchive::List(std::list<std::string>& items) | |
| 136 { | |
| 137 items.clear(); | |
| 138 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
139 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
140 boost::mutex::scoped_lock lock(mutex_); |
| 1367 | 141 |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
142 for (Archive::const_iterator it = archive_.begin(); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
143 it != archive_.end(); ++it) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
144 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
145 items.push_back(it->first); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2512
diff
changeset
|
146 } |
| 1367 | 147 } |
| 148 } | |
| 149 } |