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

changed thread-kill logic

Browse source
This commit is contained in:
Arndt Brenschede 2015-10-23 19:18:37 +02:00
parent 850e8049fb
commit 723cf90dd2
2 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ public class RoutingEngine extends Thread
OsmTrack[] lastTracks = new OsmTrack[nsections];
OsmTrack track = null;
ArrayList<String> messageList = new ArrayList<String>();
for( int i=0; !terminated; i++ )
for( int i=0;; i++ )
{
track = findTrack( refTracks, lastTracks );
track.message = "track-length = " + track.distance + " filtered ascend = " + track.ascend
@ -516,6 +516,8 @@ public class RoutingEngine extends Thread
}
catch( IllegalArgumentException iae )
{
if ( terminated ) throw iae;
// fast partial recalcs: if that timed out, but we had a match,
// build the concatenation from the partial and the nearby track
if ( matchPath != null )
@ -530,7 +532,7 @@ public class RoutingEngine extends Thread
if ( track == null )
{
for( int cfi = 0; cfi < airDistanceCostFactors.length && !terminated; cfi++ )
for( int cfi = 0; cfi < airDistanceCostFactors.length; cfi++ )
{
airDistanceCostFactor = airDistanceCostFactors[cfi];
@ -775,8 +777,13 @@ public class RoutingEngine extends Thread
addToOpenset( startPath1 );
addToOpenset( startPath2 );
}
while(!terminated)
for(;;)
{
if ( terminated )
{
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;