orthanc: OrthancFramework/Sources/FileStorage/StorageAccessor.cpp annotate

annotate OrthancFramework/Sources/FileStorage/StorageAccessor.cpp @ 5485:48b8dae6dc77

upgrade to year 2024

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 04 Jan 2024 15:10:42 +0100
parents	d37dff2c0028
children	f7adfb22e20e

rev	line source
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	4 * Department, University Hospital of Liege, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5420 diff changeset	5 * Copyright (C) 2017-2024 Osimis S.A., Belgium
48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5420 diff changeset	6 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * the License, or (at your option) any later version.
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	16 * Lesser General Public License for more details.
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * <http://www.gnu.org/licenses/>.
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	24 #include "../PrecompiledHeaders.h"
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "StorageAccessor.h"
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	26 #include "StorageCache.h"
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	28 #include "../Logging.h"
434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	29 #include "../StringMemoryBuffer.h"
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	30 #include "../Compatibility.h"
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	31 #include "../Compression/ZlibCompressor.h"
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	32 #include "../MetricsRegistry.h"
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	33 #include "../OrthancException.h"
2142 5a8840920121 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	34 #include "../Toolbox.h"
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	35
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	36 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	37 # include "../HttpServer/HttpStreamTranscoder.h"
75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	38 #endif
75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	39
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	40
5325 9c00e832985f refactoring MetricsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	41 static const std::string METRICS_CREATE_DURATION = "orthanc_storage_create_duration_ms";
9c00e832985f refactoring MetricsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	42 static const std::string METRICS_READ_DURATION = "orthanc_storage_read_duration_ms";
9c00e832985f refactoring MetricsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	43 static const std::string METRICS_REMOVE_DURATION = "orthanc_storage_remove_duration_ms";
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	44 static const std::string METRICS_READ_BYTES = "orthanc_storage_read_bytes";
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	45 static const std::string METRICS_WRITTEN_BYTES = "orthanc_storage_written_bytes";
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	46
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	47
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 namespace Orthanc
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	50 class StorageAccessor::MetricsTimer : public boost::noncopyable
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	51 {
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	52 private:
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	53 std::unique_ptr<MetricsRegistry::Timer> timer_;
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	54
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	55 public:
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	56 MetricsTimer(StorageAccessor& that,
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	57 const std::string& name)
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	58 {
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	59 if (that.metrics_ != NULL)
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	60 {
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	61 timer_.reset(new MetricsRegistry::Timer(*that.metrics_, name));
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	62 }
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	63 }
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	64 };
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	65
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	66
5184 dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	67 StorageAccessor::StorageAccessor(IStorageArea& area) :
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	68 area_(area),
5184 dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	69 cache_(NULL),
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	70 metrics_(NULL)
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	71 {
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	72 }
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	73
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	74
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	75 StorageAccessor::StorageAccessor(IStorageArea& area,
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	76 StorageCache& cache) :
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	77 area_(area),
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	78 cache_(&cache),
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	79 metrics_(NULL)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	80 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	81 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	82
5184 dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	83
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	84 StorageAccessor::StorageAccessor(IStorageArea& area,
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	85 MetricsRegistry& metrics) :
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	86 area_(area),
5184 dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	87 cache_(NULL),
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	88 metrics_(&metrics)
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	89 {
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	90 }
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	91
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	92 StorageAccessor::StorageAccessor(IStorageArea& area,
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	93 StorageCache& cache,
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	94 MetricsRegistry& metrics) :
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	95 area_(area),
dd085f7e7e71 cleaning new constructors of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 5059 diff changeset	96 cache_(&cache),
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	97 metrics_(&metrics)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	98 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	99 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	100
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	101
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	102 FileInfo StorageAccessor::Write(const void* data,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103 size_t size,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	104 FileContentType type,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	105 CompressionType compression,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	106 bool storeMd5)
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 {
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	108 std::string uuid = Toolbox::GenerateUuid();
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	110 std::string md5;
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	111
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	112 if (storeMd5)
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	113 {
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114 Toolbox::ComputeMD5(md5, data, size);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	115 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	116
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 switch (compression)
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 case CompressionType_None:
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 {
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	121 {
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	122 MetricsTimer timer(*this, METRICS_CREATE_DURATION);
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	123 area_.Create(uuid, data, size, type);
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	124 }
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	125
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	126 if (metrics_ != NULL)
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	127 {
5337 b376abae664a Metrics can be stored either as floating-point numbers, or as integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5329 diff changeset	128 metrics_->IncrementIntegerValue(METRICS_WRITTEN_BYTES, size);
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	129 }
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	130
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	131 if (cache_ != NULL)
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	132 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	133 StorageCache::Accessor cacheAccessor(*cache_);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	134 cacheAccessor.Add(uuid, type, data, size);
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	135 }
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	136
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	137 return FileInfo(uuid, type, size, md5);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	138 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	139
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	140 case CompressionType_ZlibWithSize:
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	141 {
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	142 ZlibCompressor zlib;
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	143
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	144 std::string compressed;
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	145 zlib.Compress(compressed, data, size);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	146
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	147 std::string compressedMD5;
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	148
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	149 if (storeMd5)
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	150 {
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	151 Toolbox::ComputeMD5(compressedMD5, compressed);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	152 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	153
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	154 {
5325 9c00e832985f refactoring MetricsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	155 MetricsTimer timer(*this, METRICS_CREATE_DURATION);
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	156
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	157 if (compressed.size() > 0)
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	158 {
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	159 area_.Create(uuid, &compressed[0], compressed.size(), type);
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	160 }
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	161 else
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	162 {
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	163 area_.Create(uuid, NULL, 0, type);
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	164 }
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	165 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	166
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	167 if (metrics_ != NULL)
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	168 {
5337 b376abae664a Metrics can be stored either as floating-point numbers, or as integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5329 diff changeset	169 metrics_->IncrementIntegerValue(METRICS_WRITTEN_BYTES, compressed.size());
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	170 }
d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	171
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	172 if (cache_ != NULL)
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	173 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	174 StorageCache::Accessor cacheAccessor(*cache_);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	175 cacheAccessor.Add(uuid, type, data, size); // always add uncompressed data to cache
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	176 }
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	177
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	178 return FileInfo(uuid, type, size, md5,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	179 CompressionType_ZlibWithSize, compressed.size(), compressedMD5);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	180 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	181
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	182 default:
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	183 throw OrthancException(ErrorCode_NotImplemented);
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 }
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 }
e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	187 FileInfo StorageAccessor::Write(const std::string &data,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	188 FileContentType type,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	189 CompressionType compression,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	190 bool storeMd5)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	191 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	192 return Write((data.size() == 0 ? NULL : data.c_str()),
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	193 data.size(), type, compression, storeMd5);
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	194 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	195
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	196
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	197 void StorageAccessor::Read(std::string& content,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	198 const FileInfo& info)
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	200 if (cache_ == NULL)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	201 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	202 ReadWholeInternal(content, info);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	203 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	204 else
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	206 StorageCache::Accessor cacheAccessor(*cache_);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	207
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	208 if (!cacheAccessor.Fetch(content, info.GetUuid(), info.GetContentType()))
4484 64f06e7d5fc7 new abstraction IMemoryBuffer to avoid unnecessary copies of std::string buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	209 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	210 ReadWholeInternal(content, info);
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	211
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	212 // always store the uncompressed data in cache
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	213 cacheAccessor.Add(info.GetUuid(), info.GetContentType(), content);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	214 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	215 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	216 }
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	217
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	218 void StorageAccessor::ReadWholeInternal(std::string& content,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	219 const FileInfo& info)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	220 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	221 switch (info.GetCompressionType())
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	222 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	223 case CompressionType_None:
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	224 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	225 std::unique_ptr<IMemoryBuffer> buffer;
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	226
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	227 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	228 MetricsTimer timer(*this, METRICS_READ_DURATION);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	229 buffer.reset(area_.Read(info.GetUuid(), info.GetContentType()));
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	230 }
4484 64f06e7d5fc7 new abstraction IMemoryBuffer to avoid unnecessary copies of std::string buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	231
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	232 if (metrics_ != NULL)
5046 2b3b0ab88c1d fix storage cache Alain Mazy <am@osimis.io> parents: 4912 diff changeset	233 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	234 metrics_->IncrementIntegerValue(METRICS_READ_BYTES, buffer->GetSize());
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	235 }
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	236
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	237 buffer->MoveToString(content);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	238
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	239 break;
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	240 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	241
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	242 case CompressionType_ZlibWithSize:
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	243 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	244 ZlibCompressor zlib;
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	245
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	246 std::unique_ptr<IMemoryBuffer> compressed;
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	247
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	248 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	249 MetricsTimer timer(*this, METRICS_READ_DURATION);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	250 compressed.reset(area_.Read(info.GetUuid(), info.GetContentType()));
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	251 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	252
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	253 if (metrics_ != NULL)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	254 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	255 metrics_->IncrementIntegerValue(METRICS_READ_BYTES, compressed->GetSize());
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	256 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	257
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	258 zlib.Uncompress(content, compressed->GetData(), compressed->GetSize());
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	259
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	260 break;
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	261 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	262
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	263 default:
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	264 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	265 throw OrthancException(ErrorCode_NotImplemented);
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	266 }
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	268
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	269 // TODO Check the validity of the uncompressed MD5?
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	270 }
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	271
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	272
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	273 void StorageAccessor::ReadRaw(std::string& content,
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	274 const FileInfo& info)
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	275 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	276 if (cache_ == NULL \|\| info.GetCompressionType() != CompressionType_None)
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	277 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	278 ReadRawInternal(content, info);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	279 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	280 else
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	281 {// use the cache only if the data is uncompressed.
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	282 StorageCache::Accessor cacheAccessor(*cache_);
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	283
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	284 if (!cacheAccessor.Fetch(content, info.GetUuid(), info.GetContentType()))
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	285 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	286 ReadRawInternal(content, info);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	287
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	288 cacheAccessor.Add(info.GetUuid(), info.GetContentType(), content);
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	289 }
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	290 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	291 }
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	292
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	293 void StorageAccessor::ReadRawInternal(std::string& content,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	294 const FileInfo& info)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	295 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	296 std::unique_ptr<IMemoryBuffer> buffer;
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	297
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	298 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	299 MetricsTimer timer(*this, METRICS_READ_DURATION);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	300 buffer.reset(area_.Read(info.GetUuid(), info.GetContentType()));
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	301 }
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	302
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	303 if (metrics_ != NULL)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	304 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	305 metrics_->IncrementIntegerValue(METRICS_READ_BYTES, buffer->GetSize());
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	306 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	307
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	308 buffer->MoveToString(content);
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	309 }
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	310
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	311
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	312 void StorageAccessor::Remove(const std::string& fileUuid,
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	313 FileContentType type)
574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	314 {
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	315 if (cache_ != NULL)
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	316 {
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	317 cache_->Invalidate(fileUuid, type);
22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	318 }
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	319
434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	320 {
5325 9c00e832985f refactoring MetricsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	321 MetricsTimer timer(*this, METRICS_REMOVE_DURATION);
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	322 area_.Remove(fileUuid, type);
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	323 }
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	324 }
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	325
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	326
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	327 void StorageAccessor::Remove(const FileInfo &info)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	328 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	329 Remove(info.GetUuid(), info.GetContentType());
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	330 }
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	331
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	332
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	333 void ReadStartRangeFromAreaInternal(std::string& target,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	334 IStorageArea& area,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	335 const std::string& fileUuid,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	336 FileContentType contentType,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	337 uint64_t end /* exclusive */)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	338 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	339
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	340 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	341
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	342 void StorageAccessor::ReadStartRange(std::string& target,
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	343 const FileInfo& info,
4900 ea5f1c6ed07e fix cache of storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	344 uint64_t end /* exclusive */)
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	345 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	346 if (cache_ == NULL)
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	347 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	348 ReadStartRangeInternal(target, info, end);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	349 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	350 else
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	351 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	352 StorageCache::Accessor accessorStartRange(*cache_);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	353 if (!accessorStartRange.FetchStartRange(target, info.GetUuid(), info.GetContentType(), end))
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	354 {
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	355 ReadStartRangeInternal(target, info, end);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	356 accessorStartRange.AddStartRange(info.GetUuid(), info.GetContentType(), target);
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	357 }
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	358 else
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	359 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	360 StorageCache::Accessor accessorWhole(*cache_);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	361 if (!accessorWhole.Fetch(target, info.GetUuid(), info.GetContentType()))
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	362 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	363 ReadWholeInternal(target, info);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	364 accessorWhole.Add(info.GetUuid(), info.GetContentType(), target);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	365 }
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	366
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	367 if (target.size() < end)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	368 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	369 throw OrthancException(ErrorCode_CorruptedFile);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	370 }
5329 d0752fd53aec added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5325 diff changeset	371
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	372 target.resize(end);
5048 22966345eaba skip StorageCache when verifying md5 or when re-compressing attachments Alain Mazy <am@osimis.io> parents: 5047 diff changeset	373 }
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	374 }
434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	375 }
434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	376
5420 d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	377 void StorageAccessor::ReadStartRangeInternal(std::string& target,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	378 const FileInfo& info,
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	379 uint64_t end /* exclusive */)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	380 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	381 std::unique_ptr<IMemoryBuffer> buffer;
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	382
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	383 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	384 MetricsTimer timer(*this, METRICS_READ_DURATION);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	385 buffer.reset(area_.ReadRange(info.GetUuid(), info.GetContentType(), 0, end));
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	386 assert(buffer->GetSize() == end);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	387 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	388
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	389 if (metrics_ != NULL)
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	390 {
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	391 metrics_->IncrementIntegerValue(METRICS_READ_BYTES, buffer->GetSize());
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	392 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	393
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	394 buffer->MoveToString(target);
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	395 }
d37dff2c0028 Optimized the MemoryStringCache to prevent loading the same file multiple times if multiple users request the same file at the same time Alain Mazy <am@osimis.io> parents: 5337 diff changeset	396
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4512 diff changeset	397
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	398 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	399 void StorageAccessor::SetupSender(BufferHttpSender& sender,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	400 const FileInfo& info,
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	401 const std::string& mime)
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	402 {
5059 5c997c72603c Fix the Storage Cache for compressed files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5048 diff changeset	403 Read(sender.GetBuffer(), info);
3175 574890d14c92 new metrics: orthanc_store_dicom_duration_ms, orthanc_storage_[create\|read\|remove]_duration_ms Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	404
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	405 sender.SetContentType(mime);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	406
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	407 const char* extension;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	408 switch (info.GetContentType())
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	409 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	410 case FileContentType_Dicom:
4512 cff7fdfc83a4 added FileContentType_DicomUntilPixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 4484 diff changeset	411 case FileContentType_DicomUntilPixelData:
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	412 extension = ".dcm";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	413 break;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	414
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	415 case FileContentType_DicomAsJson:
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	416 extension = ".json";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	417 break;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	418
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	419 default:
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	420 // Non-standard content type
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	421 extension = "";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	422 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	423
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	424 sender.SetContentFilename(info.GetUuid() + std::string(extension));
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	425 }
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	426 #endif
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	427
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	428
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	429 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	430 void StorageAccessor::AnswerFile(HttpOutput& output,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	431 const FileInfo& info,
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	432 MimeType mime)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	433 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	434 AnswerFile(output, info, EnumerationToString(mime));
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	435 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	436 #endif
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	437
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	438
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	439 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	440 void StorageAccessor::AnswerFile(HttpOutput& output,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	441 const FileInfo& info,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	442 const std::string& mime)
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	443 {
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	444 BufferHttpSender sender;
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	445 SetupSender(sender, info, mime);
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	446
5059 5c997c72603c Fix the Storage Cache for compressed files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5048 diff changeset	447 HttpStreamTranscoder transcoder(sender, CompressionType_None); // since 1.11.2, the storage accessor only returns uncompressed buffers
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	448 output.Answer(transcoder);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	449 }
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	450 #endif
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	451
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	452
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	453 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	454 void StorageAccessor::AnswerFile(RestApiOutput& output,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	455 const FileInfo& info,
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	456 MimeType mime)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	457 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	458 AnswerFile(output, info, EnumerationToString(mime));
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	459 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	460 #endif
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	461
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	462
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	463 #if ORTHANC_ENABLE_CIVETWEB == 1 \|\| ORTHANC_ENABLE_MONGOOSE == 1
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	464 void StorageAccessor::AnswerFile(RestApiOutput& output,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	465 const FileInfo& info,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	466 const std::string& mime)
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	467 {
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	468 BufferHttpSender sender;
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1750 diff changeset	469 SetupSender(sender, info, mime);
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	470
5059 5c997c72603c Fix the Storage Cache for compressed files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5048 diff changeset	471 HttpStreamTranscoder transcoder(sender, CompressionType_None); // since 1.11.2, the storage accessor only returns uncompressed buffers
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	472 output.AnswerStream(transcoder);
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 }
2394 75c779ca948c fix compilation without Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	474 #endif
221 e7432706b354 accessors to storage Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/FileStorage/StorageAccessor.cpp @ 5485:48b8dae6dc77