dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trace restrict: Handle removing mapping from refcount 2 empty program.

Browse Source 
Instead of leaving the other mapping pointing to an empty unshared
program, find and delete it.
This commit is contained in:
Jonathan G Rennison
2015-08-19 18:52:49 +01:00
parent 29c4f244f3
commit 614b3d8ab5
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tracerestrict.cpp
View File

@@ -49,11 +49,10 @@
* This is not done for shared programs as this would delete the shared aspect whenever * This is not done for shared programs as this would delete the shared aspect whenever
* the program became empty. * the program became empty.
* *
* Empty programs with a refcount of 1 may still exist due to the edge case where: * Special case: In the case where an empty program with refcount 2 has one of its
* 1: There is an empty program with refcount 2 * mappings removed, the other mapping is left pointing to an empty unshared program.
* 2: One of the two mappings is deleted * This other mapping is then removed by performing a linear search of the mappings,
* Finding the other mapping would entail a linear search of the mappings, and there is little * and removing the reference to that program ID.
* to be gained by doing so.
*/ */
TraceRestrictProgramPool _tracerestrictprogram_pool("TraceRestrictProgram"); TraceRestrictProgramPool _tracerestrictprogram_pool("TraceRestrictProgram");
@@ -604,7 +603,13 @@ void TraceRestrictRemoveProgramMapping(TraceRestrictRefId ref)
TraceRestrictMapping::iterator iter = _tracerestrictprogram_mapping.find(ref); TraceRestrictMapping::iterator iter = _tracerestrictprogram_mapping.find(ref);
if (iter != _tracerestrictprogram_mapping.end()) { if (iter != _tracerestrictprogram_mapping.end()) {
// Found // Found
_tracerestrictprogram_pool.Get(iter->second.program_id)->DecrementRefCount(); TraceRestrictProgram *prog = _tracerestrictprogram_pool.Get(iter->second.program_id);
// check to see if another mapping needs to be removed as well
// do this before decrementing the refcount
bool remove_other_mapping = prog->refcount == 2 && prog->items.empty();
prog->DecrementRefCount();
_tracerestrictprogram_mapping.erase(iter); _tracerestrictprogram_mapping.erase(iter);
TileIndex tile = GetTraceRestrictRefIdTileIndex(ref); TileIndex tile = GetTraceRestrictRefIdTileIndex(ref);
@@ -612,6 +617,17 @@ void TraceRestrictRemoveProgramMapping(TraceRestrictRefId ref)
SetIsSignalRestrictedBit(tile); SetIsSignalRestrictedBit(tile);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
YapfNotifyTrackLayoutChange(tile, track); YapfNotifyTrackLayoutChange(tile, track);
if (remove_other_mapping) {
TraceRestrictProgramID id = prog->index;
for (TraceRestrictMapping::iterator rm_iter = _tracerestrictprogram_mapping.begin();
rm_iter != _tracerestrictprogram_mapping.end(); ++rm_iter) {
if (rm_iter->second.program_id == id) {
TraceRestrictRemoveProgramMapping(rm_iter->first);
break;
}
}
}
} }
} }