fly/flightgear
1
0
Fork 0
Code Activity

NavCache: make Transaction a no-op when read-only.

Browse source 
Avoid BEGINing a transaction when we’re in read-only mode, since this
is not wise.
This commit is contained in:
James Turner 2020-11-10 13:05:41 +00:00
parent 134e06af68
commit 2683a27513
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Input/FGDeviceConfigurationMap.cxx
View file

@ -179,6 +179,8 @@ void FGDeviceConfigurationMap::refreshCacheForFile(const SGPath& path)
}
auto cache = flightgear::NavDataCache::instance();
cache->stampCacheFile(path);
cache->writeStringListProperty(path.utf8Str(), names);
if (!cache->isReadOnly()) {
cache->stampCacheFile(path);
cache->writeStringListProperty(path.utf8Str(), names);
}
}

13
src/Navaids/NavDataCache.cxx
View file

@ -235,6 +235,7 @@ public:
const string& ident, const SGGeod& pos) :
FGPositioned(guid, FGPositioned::TOWER, ident, pos)
{
SG_UNUSED(airport);
}
};
@ -2622,11 +2623,17 @@ NavDataCache::Transaction::Transaction(NavDataCache* cache) :
_committed(false)
{
assert(cache);
_instance->beginTransaction();
if (!cache->isReadOnly()) {
_instance->beginTransaction();
}
}
NavDataCache::Transaction::~Transaction()
{
if (_instance->isReadOnly()) {
return;
}
if (!_committed) {
SG_LOG(SG_NAVCACHE, SG_INFO, "aborting cache transaction!");
_instance->abortTransaction();
@ -2635,6 +2642,10 @@ NavDataCache::Transaction::~Transaction()
void NavDataCache::Transaction::commit()
{
if (_instance->isReadOnly()) {
return;
}
assert(!_committed);
_committed = true;
_instance->commitTransaction();