Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 00:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clarify use of procedural's dirty atomic flag

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-15 10:51:55 -07:00
parent ff07e47626
commit 1a8cca3dcc
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/procedural/src/procedural/Procedural.cpp
View file

@ -77,6 +77,9 @@ void Procedural::parse(const QString& userDataJson) {
// This will be called by Procedural::ready
std::lock_guard<std::mutex> lock(_proceduralDataMutex);
_proceduralData = proceduralData.toObject();
// Mark as dirty after modifying _proceduralData, but before releasing lock
// to avoid setting it after parsing has begun
_proceduralDataDirty = true;
}
@ -166,9 +169,13 @@ void Procedural::parse(const QJsonObject& proceduralData) {
bool Procedural::ready() {
// Load any changes to the procedural
// Check for changes atomically, in case they are currently being made
if (_proceduralDataDirty) {
std::lock_guard<std::mutex> lock(_proceduralDataMutex);
parse(_proceduralData);
// Reset dirty flag after reading _proceduralData, but before releasing lock
// to avoid resetting it after more data is set
_proceduralDataDirty = false;
}