Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 13:10:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock

Browse source 
avoid a deadlock when clearing avatar entities
This commit is contained in:
Dante Ruiz 2018-01-18 10:07:07 -08:00 committed by GitHub
commit 92f8f9d2c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -328,13 +328,15 @@ void Avatar::updateAvatarEntities() {
AvatarEntityIDs recentlyDettachedAvatarEntities = getAndClearRecentlyDetachedIDs(); AvatarEntityIDs recentlyDettachedAvatarEntities = getAndClearRecentlyDetachedIDs();
if (!recentlyDettachedAvatarEntities.empty()) { if (!recentlyDettachedAvatarEntities.empty()) {
// only lock this thread when absolutely necessary // only lock this thread when absolutely necessary
AvatarEntityMap avatarEntityData;
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
foreach (auto entityID, recentlyDettachedAvatarEntities) { avatarEntityData = _avatarEntityData;
if (!_avatarEntityData.contains(entityID)) {
entityTree->deleteEntity(entityID, true, true);
}
}
}); });
foreach (auto entityID, recentlyDettachedAvatarEntities) {
if (!avatarEntityData.contains(entityID)) {
entityTree->deleteEntity(entityID, true, true);
}
}
// remove stale data hashes // remove stale data hashes
foreach (auto entityID, recentlyDettachedAvatarEntities) { foreach (auto entityID, recentlyDettachedAvatarEntities) {