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

modified memory behaviour (use up to memoryclass only when neccessary)

Browse source
This commit is contained in:
Arndt Brenschede 2019-07-20 10:24:00 +02:00
parent 2213d4f7fc
commit 80e36d4bb5
3 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -782,7 +782,7 @@ public class RoutingEngine extends Thread
addToOpenset( startPath1 );
addToOpenset( startPath2 );
}
ArrayList<OsmPath> openBorderList = new ArrayList<OsmPath>();
ArrayList<OsmPath> openBorderList = new ArrayList<OsmPath>(4096);
boolean memoryPanicMode = false;
boolean needNonPanicProcessing = false;
@ -793,8 +793,6 @@ public class RoutingEngine extends Thread
throw new IllegalArgumentException( "operation killed by thread-priority-watchdog after " + ( System.currentTimeMillis() - startTime)/1000 + " seconds" );
}
if ( maxRunningTime > 0 )
{
long timeout = ( matchPath == null && fastPartialRecalc ) ? maxRunningTime/3 : maxRunningTime;
@ -803,11 +801,11 @@ public class RoutingEngine extends Thread
throw new IllegalArgumentException( operationName + " timeout after " + (timeout/1000) + " seconds" );
}
}
OsmPath path = null;
synchronized( openSet )
{
path = openSet.popLowestKeyValue();
synchronized( openSet )
{
OsmPath path = openSet.popLowestKeyValue();
if ( path == null )
{
if ( openBorderList.isEmpty() )
@ -823,7 +821,6 @@ public class RoutingEngine extends Thread
needNonPanicProcessing = true;
continue;
}
}
if ( path.airdistance == -1 )
{
@ -835,14 +832,13 @@ public class RoutingEngine extends Thread
{
if ( !memoryPanicMode )
{
if ( !nodesCache.nodesMap.isInMemoryBounds( openSet.getSize() ) )
if ( !nodesCache.nodesMap.isInMemoryBounds( openSet.getSize(), false ) )
{
// System.out.println( "collecting..." );
int nodesBefore = nodesCache.nodesMap.nodesCreated;
int pathsBefore = openSet.getSize();
nodesCache.nodesMap.collectOutreachers();
synchronized( openSet )
{
for(;;)
{
OsmPath p3 = openSet.popLowestKeyValue();
@ -852,14 +848,14 @@ public class RoutingEngine extends Thread
openBorderList.add( p3 );
}
}
nodesCache.nodesMap.clearTemp();
for( OsmPath p : openBorderList )
{
openSet.add( p.cost + (int)(p.airdistance*airDistanceCostFactor), p );
}
}
openBorderList.clear();
logInfo( "collected, nodes/paths before=" + nodesBefore + "/" + pathsBefore + " after=" + nodesCache.nodesMap.nodesCreated + "/" + openSet.getSize() + " maxTotalCost=" + maxTotalCost );
if ( !nodesCache.nodesMap.isInMemoryBounds( openSet.getSize()) ) // TODO
if ( !nodesCache.nodesMap.isInMemoryBounds( openSet.getSize(), true ) )
{
if ( maxTotalCost < 1000000000 || needNonPanicProcessing || fastPartialRecalc )
{
@ -1133,16 +1129,14 @@ public class RoutingEngine extends Thread
}
bestPath.treedepth = path.treedepth + 1;
link.addLinkHolder( bestPath, currentNode );
synchronized( openSet )
{
addToOpenset( bestPath );
}
addToOpenset( bestPath );
}
}
}
}
path.unregisterUpTree( routingContext );
}
}
if ( nodesVisited < MAXNODES_ISLAND_CHECK && islandNodePairs.getFreezeCount() < 5 )