assure threading safety

visiblelight · visiblelight · commit ffdf3d7b670c · 2014-05-23T17:59:34.000+08:00
diff --git a/cocos/renderer/CCTextureCache.cpp b/cocos/renderer/CCTextureCache.cpp
@@ -143,27 +143,27 @@ void TextureCache::addImageAsync(const std::string &path, const std::function<vo
 
 void TextureCache::unbindImageAsync(const std::string& filename)
 {
+    _imageInfoMutex.lock();
     if (_imageInfoQueue && !_imageInfoQueue->empty())
     {
-        _imageInfoMutex.lock();
         std::string fullpath = FileUtils::getInstance()->fullPathForFilename(filename);
         auto found = std::find_if(_imageInfoQueue->begin(), _imageInfoQueue->end(), [&fullpath](ImageInfo* ptr)->bool{ return ptr->asyncStruct->filename == fullpath; });
         if (found != _imageInfoQueue->end())
         {
             (*found)->asyncStruct->callback = nullptr;
         }
-        _imageInfoMutex.unlock();
     }
+    _imageInfoMutex.unlock();
 }
 
 void TextureCache::unbindAllImageAsync()
 {
+    _imageInfoMutex.lock();
     if (_imageInfoQueue && !_imageInfoQueue->empty())
     {
-        _imageInfoMutex.lock();
         std::for_each(_imageInfoQueue->begin(), _imageInfoQueue->end(), [](ImageInfo* ptr) { ptr->asyncStruct->callback = nullptr; });
-        _imageInfoMutex.unlock();
     }
+    _imageInfoMutex.unlock();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -143,27 +143,27 @@ void TextureCache::addImageAsync(const std::string &path, const std::function<vo`
`143`	`143`
`144`	`144`	`void TextureCache::unbindImageAsync(const std::string& filename)`
`145`	`145`	`{`
	`146`	`+ _imageInfoMutex.lock();`
`146`	`147`	`if (_imageInfoQueue && !_imageInfoQueue->empty())`
`147`	`148`	`{`
`148`		`- _imageInfoMutex.lock();`
`149`	`149`	`std::string fullpath = FileUtils::getInstance()->fullPathForFilename(filename);`
`150`	`150`	`auto found = std::find_if(_imageInfoQueue->begin(), _imageInfoQueue->end(), [&fullpath](ImageInfo* ptr)->bool{ return ptr->asyncStruct->filename == fullpath; });`
`151`	`151`	`if (found != _imageInfoQueue->end())`
`152`	`152`	`{`
`153`	`153`	`(*found)->asyncStruct->callback = nullptr;`
`154`	`154`	`}`
`155`		`- _imageInfoMutex.unlock();`
`156`	`155`	`}`
	`156`	`+ _imageInfoMutex.unlock();`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`void TextureCache::unbindAllImageAsync()`
`160`	`160`	`{`
	`161`	`+ _imageInfoMutex.lock();`
`161`	`162`	`if (_imageInfoQueue && !_imageInfoQueue->empty())`
`162`	`163`	`{`
`163`		`- _imageInfoMutex.lock();`
`164`	`164`	`std::for_each(_imageInfoQueue->begin(), _imageInfoQueue->end(), [](ImageInfo* ptr) { ptr->asyncStruct->callback = nullptr; });`
`165`		`- _imageInfoMutex.unlock();`
`166`	`165`	`}`
	`166`	`+ _imageInfoMutex.unlock();`
`167`	`167`	`}`
`168`	`168`
`169`	`169`