Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 14:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

guard MyAvatar::_scriptEngine with mutex

Browse source
This commit is contained in:
Andrew Meadows 2019-05-30 16:08:47 -07:00
parent 987d5e7662
commit 0c916e0c03
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/avatar/MyAvatar.cpp
View file

@ -1598,6 +1598,7 @@ void MyAvatar::handleChangedAvatarEntityData() {
blobFailed = true; // blob doesn't exist
return;
}
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_myScriptEngine, itr.value(), properties)) {
blobFailed = true; // blob is corrupt
}
@ -1630,6 +1631,7 @@ void MyAvatar::handleChangedAvatarEntityData() {
skip = true;
return;
}
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_myScriptEngine, itr.value(), properties)) {
skip = true;
}
@ -1737,7 +1739,10 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const {
if (found) {
++numFound;
QByteArray blob;
EntityItemProperties::propertiesToBlob(*_myScriptEngine, getID(), properties, blob);
{
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
EntityItemProperties::propertiesToBlob(*_myScriptEngine, getID(), properties, blob);
}
_avatarEntitiesLock.withWriteLock([&] {
_cachedAvatarEntityBlobs[id] = blob;
});
@ -2476,15 +2481,18 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() {
if (!entity) {
continue;
}
QVariantMap avatarEntityData;
EncodeBitstreamParams params;
auto desiredProperties = entity->getEntityProperties(params);
desiredProperties += PROP_LOCAL_POSITION;
desiredProperties += PROP_LOCAL_ROTATION;
EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(_myScriptEngine, entityProperties);
QVariantMap avatarEntityData;
avatarEntityData["id"] = entityID;
avatarEntityData["properties"] = scriptProperties.toVariant();
{
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(_myScriptEngine, entityProperties);
avatarEntityData["properties"] = scriptProperties.toVariant();
}
avatarEntitiesData.append(QVariant(avatarEntityData));
}
}

1
interface/src/avatar/MyAvatar.h
View file

@ -2741,6 +2741,7 @@ private:
mutable std::set<QUuid> _staleCachedAvatarEntityBlobs;
//
// keep a ScriptEngine around so we don't have to instantiate on the fly (these are very slow to create/delete)
mutable std::mutex _myScriptEngineLock;
QScriptEngine* _myScriptEngine { nullptr };
bool _needToSaveAvatarEntitySettings { false };
};