mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made sf::Resource thread-safe

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1404 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-02-12 08:09:54 +00:00
parent 0a7d28b687
commit 8a1a6bbfab
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dotnet/extlibs/csfml-audio.dll
View File

Binary file not shown.

BIN
dotnet/extlibs/csfml-graphics.dll
View File

Binary file not shown.

BIN
dotnet/extlibs/csfml-window.dll
View File

Binary file not shown.

5
include/SFML/System/Resource.hpp
View File

@ -28,6 +28,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Lock.hpp>
#include <SFML/System/Mutex.hpp>
#include <set> #include <set>
@ -111,7 +113,8 @@ private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
mutable std::set<ResourcePtr<T>*> myObservers; mutable std::set<ResourcePtr<T>*> myObservers; ///< List of pointers to this resource
mutable Mutex myMutex; ///< Mutex for preventing concurrent access to the pointer list
}; };

2
include/SFML/System/Resource.inl
View File

@ -64,6 +64,7 @@ Resource<T>& Resource<T>::operator =(const Resource<T>&)
template <typename T> template <typename T>
void Resource<T>::Connect(ResourcePtr<T>& observer) const void Resource<T>::Connect(ResourcePtr<T>& observer) const
{ {
sf::Lock lock(myMutex);
myObservers.insert(&observer); myObservers.insert(&observer);
} }
@ -72,5 +73,6 @@ void Resource<T>::Connect(ResourcePtr<T>& observer) const
template <typename T> template <typename T>
void Resource<T>::Disconnect(ResourcePtr<T>& observer) const void Resource<T>::Disconnect(ResourcePtr<T>& observer) const
{ {
sf::Lock lock(myMutex);
myObservers.erase(&observer); myObservers.erase(&observer);
} }