mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-29 00:41:38 +02:00
* new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII)
* all lock/unlock and unlock/lock pairs are done by RAII guards now * fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752. * fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics * fixed #422
This commit is contained in:
@ -73,11 +73,9 @@ public:
|
||||
void applyOnGS(CGameState *gs, void *pack) const
|
||||
{
|
||||
T *ptr = static_cast<T*>(pack);
|
||||
gs->mx->lock();
|
||||
// while(!gs->mx->try_lock())
|
||||
// boost::this_thread::sleep(boost::posix_time::milliseconds(1)); //give other threads time to finish
|
||||
|
||||
boost::unique_lock<boost::shared_mutex> lock(*gs->mx);
|
||||
ptr->applyGs(gs);
|
||||
gs->mx->unlock();
|
||||
}
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user