Mercurial > hg > orthanc-stone

comparison Framework/Loaders/LoaderCache.cpp @ 1097:4383382db01d broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating LockingEmitter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Oct 2019 22:31:18 +0200
parents f6be9412e42a
children 477203923f26
comparison
equal deleted inserted replaced
1096:97cbb2c31a65 1097:4383382db01d
63 : oracle_(oracle) 63 : oracle_(oracle)
64 { 64 {
65 65
66 } 66 }
67 #else 67 #else
68 LoaderCache::LoaderCache(ThreadedOracle& oracle, LockingEmitter& lockingEmitter) 68 LoaderCache::LoaderCache(ThreadedOracle& oracle, Deprecated::LockingEmitter& lockingEmitter)
69 : oracle_(oracle) 69 : oracle_(oracle)
70 , lockingEmitter_(lockingEmitter) 70 , lockingEmitter_(lockingEmitter)
71 { 71 {
72 } 72 }
73 #endif 73 #endif
96 // LOG(TRACE) << "volumeImage = " << volumeImage.get(); 96 // LOG(TRACE) << "volumeImage = " << volumeImage.get();
97 { 97 {
98 #if ORTHANC_ENABLE_WASM == 1 98 #if ORTHANC_ENABLE_WASM == 1
99 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, oracle_)); 99 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, oracle_));
100 #else 100 #else
101 LockingEmitter::WriterLock lock(lockingEmitter_); 101 Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
102 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, lock.GetOracleObservable())); 102 loader.reset(new OrthancSeriesVolumeProgressiveLoader(volumeImage, oracle_, lock.GetOracleObservable()));
103 #endif 103 #endif
104 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader = " << loader.get(); 104 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader = " << loader.get();
105 loader->LoadSeries(seriesUuid); 105 loader->LoadSeries(seriesUuid);
106 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader->LoadSeries successful"; 106 // LOG(TRACE) << "LoaderCache::GetSeriesVolumeProgressiveLoader : loader->LoadSeries successful";
165 165
166 { 166 {
167 #if ORTHANC_ENABLE_WASM == 1 167 #if ORTHANC_ENABLE_WASM == 1
168 loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, oracle_)); 168 loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, oracle_));
169 #else 169 #else
170 LockingEmitter::WriterLock lock(lockingEmitter_); 170 Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
171 loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, lock.GetOracleObservable())); 171 loader.reset(new OrthancMultiframeVolumeLoader(volumeImage, oracle_, lock.GetOracleObservable()));
172 #endif 172 #endif
173 loader->LoadInstance(instanceUuid); 173 loader->LoadInstance(instanceUuid);
174 } 174 }
175 multiframeVolumeLoaders_[instanceUuid] = loader; 175 multiframeVolumeLoaders_[instanceUuid] = loader;
266 266
267 { 267 {
268 #if ORTHANC_ENABLE_WASM == 1 268 #if ORTHANC_ENABLE_WASM == 1
269 loader.reset(new DicomStructureSetLoader(oracle_, oracle_)); 269 loader.reset(new DicomStructureSetLoader(oracle_, oracle_));
270 #else 270 #else
271 LockingEmitter::WriterLock lock(lockingEmitter_); 271 Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
272 loader.reset(new DicomStructureSetLoader(oracle_, lock.GetOracleObservable())); 272 loader.reset(new DicomStructureSetLoader(oracle_, lock.GetOracleObservable()));
273 #endif 273 #endif
274 loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures); 274 loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures);
275 } 275 }
276 dicomStructureSetLoaders_[entryKey] = loader; 276 dicomStructureSetLoaders_[entryKey] = loader;
362 362
363 363
364 void LoaderCache::ClearCache() 364 void LoaderCache::ClearCache()
365 { 365 {
366 #if ORTHANC_ENABLE_WASM != 1 366 #if ORTHANC_ENABLE_WASM != 1
367 LockingEmitter::WriterLock lock(lockingEmitter_); 367 Deprecated::LockingEmitter::WriterLock lock(lockingEmitter_);
368 #endif 368 #endif
369 369
370 //#ifndef NDEBUG 370 //#ifndef NDEBUG
371 // ISO way of checking for debug builds 371 // ISO way of checking for debug builds
372 DebugDisplayObjRefCounts(); 372 DebugDisplayObjRefCounts();