Mercurial > hg > orthanc-stone

comparison Framework/Loaders/LoaderCache.cpp @ 933:f75f6cb69c1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Commented-out traces for debug
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 26 Jul 2019 20:09:42 +0200
parents bf03cb879eb4
children 86ac61a040c9
comparison
equal deleted inserted replaced
932:061a58c0011a 933:f75f6cb69c1b
57 boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> 57 boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader>
58 LoaderCache::GetSeriesVolumeProgressiveLoader(std::string seriesUuid) 58 LoaderCache::GetSeriesVolumeProgressiveLoader(std::string seriesUuid)
59 { 59 {
60 try 60 try
61 { 61 {
62
62 // normalize keys a little 63 // normalize keys a little
63 seriesUuid = Orthanc::Toolbox::StripSpaces(seriesUuid); 64 seriesUuid = Orthanc::Toolbox::StripSpaces(seriesUuid);
64 Orthanc::Toolbox::ToLowerCase(seriesUuid); 65 Orthanc::Toolbox::ToLowerCase(seriesUuid);
65 66
66 // find in cache 67 // find in cache
67 if (seriesVolumeProgressiveLoaders_.find(seriesUuid) == seriesVolumeProgressiveLoaders_.end()) 68 if (seriesVolumeProgressiveLoaders_.find(seriesUuid) == seriesVolumeProgressiveLoaders_.end())
68 { 69 {
69 #if ORTHANC_ENABLE_WASM == 1 70 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : CACHEMISS --> need to load seriesUUid = " << seriesUuid;
70 LOG(WARNING) << "Performing request for series " << seriesUuid << " sbrk(0) = " << sbrk(0); 71 #if ORTHANC_ENABLE_WASM == 1
71 #else 72 // LOG(TRACE) << "Performing request for series " << seriesUuid << " sbrk(0) = " << sbrk(0);
72 LOG(WARNING) << "Performing request for series " << seriesUuid; 73 #else
74 // LOG(TRACE) << "Performing request for series " << seriesUuid;
73 #endif 75 #endif
74 boost::shared_ptr<DicomVolumeImage> volumeImage(new DicomVolumeImage); 76 boost::shared_ptr<DicomVolumeImage> volumeImage(new DicomVolumeImage);
75 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> loader; 77 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> loader;
76 78 // LOG(TRACE) << "volumeImage = " << volumeImage.get();
77 { 79 {
78 #if ORTHANC_ENABLE_WASM == 1 80 #if ORTHANC_ENABLE_WASM == 1
79 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, oracle_)); 81 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, oracle_));
80 #else 82 #else
81 LockingEmitter::WriterLock lock(lockingEmitter_); 83 LockingEmitter::WriterLock lock(lockingEmitter_);
82 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, lock.GetOracleObservable())); 84 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, lock.GetOracleObservable()));
83 #endif 85 #endif
86 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader = " << loader.get();
84 loader->LoadSeries(seriesUuid); 87 loader->LoadSeries(seriesUuid);
88 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader->LoadSeries successful";
85 } 89 }
86 seriesVolumeProgressiveLoaders_[seriesUuid] = loader; 90 seriesVolumeProgressiveLoaders_[seriesUuid] = loader;
91 }
92 else
93 {
94 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : returning cached loader for seriesUUid = " << seriesUuid;
87 } 95 }
88 return seriesVolumeProgressiveLoaders_[seriesUuid]; 96 return seriesVolumeProgressiveLoaders_[seriesUuid];
89 } 97 }
90 catch (const Orthanc::OrthancException& e) 98 catch (const Orthanc::OrthancException& e)
91 { 99 {