ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

added more cache reuse for better short-route performance

Browse source
This commit is contained in:
Arndt Brenschede 2014-02-02 20:37:22 +01:00
parent 702c614dd3
commit 87ed332a56
3 changed files with 138 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

57
brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java
View file

@ -19,13 +19,16 @@ public final class NodesCache
private HashMap<String,PhysicalFile> fileCache;
private byte[] iobuffer;
private OsmFile[][] fileRows = new OsmFile[180][];
private OsmFile[][] fileRows;
private ArrayList<MicroCache> segmentList = new ArrayList<MicroCache>();
public DistanceChecker distanceChecker;
public boolean oom_carsubset_hint = false;
private long cacheSum = 0;
private boolean garbageCollectionEnabled = false;
public NodesCache( String segmentDir, OsmNodesMap nodesMap, int lookupVersion, boolean carMode, NodesCache oldCache )
{
this.segmentDir = segmentDir;
@ -38,14 +41,55 @@ public final class NodesCache
fileCache = oldCache.fileCache;
iobuffer = oldCache.iobuffer;
oom_carsubset_hint = oldCache.oom_carsubset_hint;
// re-use old, virgin caches
fileRows = oldCache.fileRows;
for( OsmFile[] fileRow : fileRows )
{
if ( fileRow == null ) continue;
for( OsmFile osmf : fileRow )
{
cacheSum += osmf.setGhostState();
}
}
}
else
{
fileCache = new HashMap<String,PhysicalFile>(4);
fileRows = new OsmFile[180][];
iobuffer = new byte[65636];
}
}
// if the cache sum exceeded a threshold,
// clean all ghosts and enable garbage collection
private void checkEnableCacheCleaning()
{
if ( cacheSum < 200000 || garbageCollectionEnabled ) return;
for( int i=0; i<fileRows.length; i++ )
{
OsmFile[] fileRow = fileRows[i];
if ( fileRow == null ) continue;
int nghosts = 0;
for( OsmFile osmf : fileRow )
{
if ( osmf.ghost ) nghosts++;
else osmf.cleanAll();
}
if ( nghosts == 0 ) continue;
int j=0;
OsmFile[] frow = fileRows[fileRows.length-nghosts];
for( OsmFile osmf : fileRow )
{
if ( osmf.ghost ) continue;
frow[j++] = osmf;
}
fileRows[i] = frow;
}
garbageCollectionEnabled = true;
}
public int loadSegmentFor( int ilon, int ilat )
{
MicroCache mc = getSegmentFor( ilon, ilat );
@ -82,6 +126,7 @@ public final class NodesCache
newFileRow[ndegrees] = osmf;
fileRows[latDegree] = newFileRow;
}
osmf.ghost = false;
currentFileName = osmf.filename;
if ( osmf.microCaches == null )
{
@ -93,10 +138,18 @@ public final class NodesCache
{
// nodesMap.removeCompleteNodes();
checkEnableCacheCleaning();
segment = new MicroCache( osmf, lonIdx80, latIdx80, iobuffer );
cacheSum += segment.getDataSize();
osmf.microCaches[subIdx] = segment;
segmentList.add( segment );
}
else if ( segment.ghost )
{
segment.unGhost();
segmentList.add( segment );
}
return segment;
}
catch( RuntimeException re )
@ -119,7 +172,7 @@ public final class NodesCache
{
return false;
}
segment.fillNode( node, nodesMap, distanceChecker );
segment.fillNode( node, nodesMap, distanceChecker, garbageCollectionEnabled );
return !node.isHollow();
}