more re-use after timeout

brouter-core/src/main/java/btools/router/OsmTrack.java

@@ -31,6 +31,7 @@ public final class OsmTrack
 
   public MatchedWaypoint endPoint;
   public long[] nogoChecksums;
+  public boolean isDirty;
 
   private static class OsmPathElementHolder
   {
@@ -38,7 +39,6 @@ public final class OsmTrack
     public OsmPathElementHolder nextHolder;
   }
 
-	
   public ArrayList<OsmPathElement> nodes = new ArrayList<OsmPathElement>();
 
   private CompactLongMap<OsmPathElementHolder> nodesMap;
@@ -110,7 +110,9 @@ public final class OsmTrack
 
   /**
    * writes the track in binary-format to a file
-   * @param filename the filename to write to
+   * 
+   * @param filename
+   *          the filename to write to
    */
   public void writeBinary( String filename ) throws Exception
   {
@@ -125,6 +127,7 @@ public final class OsmTrack
     dos.writeLong( nogoChecksums[0] );
     dos.writeLong( nogoChecksums[1] );
     dos.writeLong( nogoChecksums[2] );
+    dos.writeBoolean( isDirty );
     dos.close();
   }
 
@@ -164,7 +167,14 @@ public final class OsmTrack
             al[0] = dis.readLong();
             al[1] = dis.readLong();
             al[2] = dis.readLong();
-          } catch( EOFException eof ) { /* kind of expected */ }
+          }
+          catch (EOFException eof) { /* kind of expected */ }
+          try
+          {
+            boolean isDirty = dis.readBoolean();
+            if ( t != null ) t.isDirty = isDirty;
+          }
+          catch (EOFException eof) { /* kind of expected */ }
           dis.close();
           boolean nogoCheckOk = Math.abs( al[0] - nogoChecksums[0] ) <= 20
                              && Math.abs( al[1] - nogoChecksums[1] ) <= 20
@@ -182,7 +192,8 @@ public final class OsmTrack
 
   public void addNodes( OsmTrack t )
   {
-    for( OsmPathElement n : t.nodes ) addNode( n );
+    for ( OsmPathElement n : t.nodes )
+      addNode( n );
     buildMap();
   }
 
@@ -228,7 +239,9 @@ public final class OsmTrack
 
   /**
    * writes the track in gpx-format to a file
-   * @param filename the filename to write to
+   * 
+   * @param filename
+   *          the filename to write to
    */
   public void writeGpx( String filename ) throws Exception
   {
@@ -246,8 +259,10 @@ public final class OsmTrack
     for ( int i = messageList.size() - 1; i >= 0; i-- )
     {
       String message = messageList.get( i );
-      if ( i < messageList.size()-1 ) message = "(alt-index " + i + ": " + message + " )";
+      if ( i < messageList.size() - 1 )
-      if ( message != null ) sb.append("<!-- ").append(message).append(" -->\n");
+        message = "(alt-index " + i + ": " + message + " )";
+      if ( message != null )
+        sb.append( "<!-- " ).append( message ).append( " -->\n" );
     }
     sb.append( "<gpx \n" );
     sb.append( " xmlns=\"http://www.topografix.com/GPX/1/1\" \n" );
@@ -261,7 +276,8 @@ public final class OsmTrack
     for ( OsmPathElement n : nodes )
     {
       String sele = n.getSElev() == Short.MIN_VALUE ? "" : "<ele>" + n.getElev() + "</ele>";
-      sb.append("   <trkpt lon=\"").append(formatPos(n.getILon() - 180000000)).append("\" lat=\"").append(formatPos(n.getILat() - 90000000)).append("\">").append(sele).append("</trkpt>\n");
+      sb.append( "   <trkpt lon=\"" ).append( formatPos( n.getILon() - 180000000 ) ).append( "\" lat=\"" )
+          .append( formatPos( n.getILat() - 90000000 ) ).append( "\">" ).append( sele ).append( "</trkpt>\n" );
     }
 
     sb.append( "  </trkseg>\n" );
@@ -304,7 +320,6 @@ public final class OsmTrack
     sb.append( "          <tessellate>1</tessellate>\n" );
     sb.append( "         <coordinates> " );
 
-
     for ( OsmPathElement n : nodes )
     {
       sb.append( formatPos( n.getILon() - 180000000 ) ).append( "," ).append( formatPos( n.getILat() - 90000000 ) ).append( "\n" );
@@ -366,7 +381,8 @@ public final class OsmTrack
     for ( OsmPathElement n : nodes )
     {
       String sele = n.getSElev() == Short.MIN_VALUE ? "" : ", " + n.getElev();
-      sb.append( "          [" ).append(formatPos(n.getILon() - 180000000)).append(", ").append(formatPos(n.getILat() - 90000000)).append(sele).append( "],\n" );
+      sb.append( "          [" ).append( formatPos( n.getILon() - 180000000 ) ).append( ", " ).append( formatPos( n.getILat() - 90000000 ) )
+          .append( sele ).append( "],\n" );
     }
     sb.deleteCharAt( sb.lastIndexOf( "," ) );
 
@@ -382,16 +398,19 @@ public final class OsmTrack
   private static String formatPos( int p )
   {
     boolean negative = p < 0;
-    if ( negative ) p = -p;
+    if ( negative )
+      p = -p;
     char[] ac = new char[12];
     int i = 11;
     while (p != 0 || i > 3)
     {
       ac[i--] = (char) ( '0' + ( p % 10 ) );
       p /= 10;
-      if ( i == 5 ) ac[i--] = '.';
+      if ( i == 5 )
+        ac[i--] = '.';
     }
-    if ( negative ) ac[i--] = '-';
+    if ( negative )
+      ac[i--] = '-';
     return new String( ac, i + 1, 11 - i );
   }
 
@@ -408,7 +427,8 @@ public final class OsmTrack
     {
       dumpLine( bw, m );
     }
-    if ( bw != null ) bw.close();
+    if ( bw != null )
+      bw.close();
   }
 
   private void dumpLine( BufferedWriter bw, String s ) throws Exception
@@ -427,15 +447,15 @@ public final class OsmTrack
   public void readGpx( String filename ) throws Exception
   {
     File f = new File( filename );
-      if ( !f.exists() ) return;
+    if ( !f.exists() )
-      BufferedReader br = new BufferedReader(
+      return;
-                           new InputStreamReader(
+    BufferedReader br = new BufferedReader( new InputStreamReader( new FileInputStream( f ) ) );
-                            new FileInputStream( f ) ) );
 
     for ( ;; )
     {
       String line = br.readLine();
-        if ( line == null ) break;
+      if ( line == null )
+        break;
 
       int idx0 = line.indexOf( "<trkpt lon=\"" );
       if ( idx0 >= 0 )
@@ -444,7 +464,8 @@ public final class OsmTrack
         int idx1 = line.indexOf( '"', idx0 );
         int ilon = (int) ( ( Double.parseDouble( line.substring( idx0, idx1 ) ) + 180. ) * 1000000. + 0.5 );
         int idx2 = line.indexOf( " lat=\"" );
-          if ( idx2 < 0 ) continue;
+        if ( idx2 < 0 )
+          continue;
         idx2 += 6;
         int idx3 = line.indexOf( '"', idx2 );
         int ilat = (int) ( ( Double.parseDouble( line.substring( idx2, idx3 ) ) + 90. ) * 1000000. + 0.5 );
@@ -456,12 +477,14 @@ public final class OsmTrack
 
   public boolean equalsTrack( OsmTrack t )
   {
-    if ( nodes.size() != t.nodes.size() ) return false;
+    if ( nodes.size() != t.nodes.size() )
+      return false;
     for ( int i = 0; i < nodes.size(); i++ )
     {
       OsmPathElement e1 = nodes.get( i );
       OsmPathElement e2 = t.nodes.get( i );
-      if ( e1.getILon() != e2.getILon() || e1.getILat() != e2.getILat() ) return false;
+      if ( e1.getILon() != e2.getILon() || e1.getILat() != e2.getILat() )
+        return false;
     }
     return true;
   }

brouter-core/src/main/java/btools/router/ProfileCache.java

@@ -0,0 +1,98 @@
+/**
+ * Container for routig configs
+ *
+ * @author ab
+ */
+package btools.router;
+
+import java.io.File;
+
+import btools.expressions.BExpressionContextGlobal;
+import btools.expressions.BExpressionContextNode;
+import btools.expressions.BExpressionContextWay;
+import btools.expressions.BExpressionMetaData;
+
+public final class ProfileCache 
+{
+  private static BExpressionContextWay expctxWay;
+  private static BExpressionContextNode expctxNode;
+ 
+  private static File lastLookupFile;
+  private static File lastProfileFile;
+
+  private static long lastLookupTimestamp;
+  private static long lastProfileTimestamp;
+  
+  private static boolean profilesBusy;
+
+  public static synchronized boolean parseProfile( RoutingContext rc )
+  {
+      String profileBaseDir = System.getProperty( "profileBaseDir" );
+      File profileDir;
+      File profileFile;
+      if ( profileBaseDir == null )
+      {
+        profileDir = new File( rc.localFunction ).getParentFile();
+        profileFile = new File( rc.localFunction ) ;
+      }
+      else
+      {
+        profileDir = new File( profileBaseDir );
+        profileFile = new File( profileDir, rc.localFunction + ".brf" ) ;
+      }
+      File lookupFile = new File( profileDir, "lookups.dat" );
+
+      // check for re-use
+      if ( expctxWay != null && expctxNode != null && !profilesBusy )
+      {
+        if ( profileFile.equals( lastProfileFile ) && lookupFile.equals( lastLookupFile ) )
+        {
+          if ( profileFile.lastModified() == lastProfileTimestamp
+            && lookupFile.lastModified() ==  lastLookupTimestamp )
+          {
+            rc.expctxWay = expctxWay;
+            rc.expctxNode = expctxNode;
+            profilesBusy = true;
+            rc.readGlobalConfig(expctxWay);
+            return true;
+          }
+        }
+      }
+      
+      BExpressionMetaData meta = new BExpressionMetaData();
+      
+      BExpressionContextGlobal expctxGlobal = new BExpressionContextGlobal( meta );
+      rc.expctxWay = new BExpressionContextWay( rc.serversizing ? 262144 : 8192, meta );
+      rc.expctxNode = new BExpressionContextNode( rc.serversizing ?  16384 : 2048, meta );
+      
+      meta.readMetaData( new File( profileDir, "lookups.dat" ) );
+
+      expctxGlobal.parseFile( profileFile, null );
+      expctxGlobal.evaluate( new int[0] );
+      rc.readGlobalConfig(expctxGlobal);
+
+      rc.expctxWay.parseFile( profileFile, "global" );
+      rc.expctxNode.parseFile( profileFile, "global" );
+      
+      lastProfileTimestamp = profileFile.lastModified();
+      lastLookupTimestamp = lookupFile.lastModified();
+      lastProfileFile = profileFile;
+      lastLookupFile = lookupFile;
+      expctxWay = rc.expctxWay;
+      expctxNode = rc.expctxNode;
+      profilesBusy = true;
+      return false;
+  }
+
+  public static synchronized void releaseProfile( RoutingContext rc )
+  {
+    // only the thread that holds the cached instance can release it
+    if ( rc.expctxWay == expctxWay && rc.expctxNode == expctxNode )
+    {
+      profilesBusy = false;
+    }
+    rc.expctxWay = null;
+    rc.expctxNode = null;
+  }
+
+}

brouter-core/src/main/java/btools/router/RoutingEngine.java

@@ -10,10 +10,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import btools.expressions.BExpressionContextGlobal;
-import btools.expressions.BExpressionContextNode;
-import btools.expressions.BExpressionContextWay;
-import btools.expressions.BExpressionMetaData;
 import btools.mapaccess.NodesCache;
 import btools.mapaccess.OsmLink;
 import btools.mapaccess.OsmLinkHolder;
@@ -42,7 +38,6 @@ public class RoutingEngine extends Thread
 
   private volatile boolean terminated;
 
-  protected File profileDir;
   protected String segmentDir;
   private String outfileBase;
   private String logfileBase;
@@ -71,36 +66,30 @@ public class RoutingEngine extends Thread
     this.infoLogEnabled = outfileBase != null;
     this.routingContext = rc;
 
-    if ( rc.localFunction != null )
+    try
     {
-      String profileBaseDir = System.getProperty( "profileBaseDir" );
+      File debugLog = new File( new File( routingContext.localFunction ).getParentFile(), "../debug.txt" );
-      File profileFile;
+      if ( debugLog.exists() )
-      if ( profileBaseDir == null )
       {
-        profileDir = new File( rc.localFunction ).getParentFile();
+        infoLogWriter = new FileWriter( debugLog, true );
-        profileFile = new File( rc.localFunction ) ;
+        logInfo( "********** start request at " );
+        logInfo( "********** " + new Date() );
       }
-      else
+    }
+    catch( IOException ioe )
     {
-        profileDir = new File( profileBaseDir );
+      throw new RuntimeException( "cannot open debug-log:" + ioe );
-        profileFile = new File( profileDir, rc.localFunction + ".brf" ) ;
+    }
+    boolean cachedProfile = ProfileCache.parseProfile( rc );
+    if ( hasInfo() )
+    {
+      logInfo( "parsed profile " + rc.localFunction + " cached=" + cachedProfile );
+    }
   }
 
-      BExpressionMetaData meta = new BExpressionMetaData();
+  private boolean hasInfo()
-      
+  {
-      BExpressionContextGlobal expctxGlobal = new BExpressionContextGlobal( meta );
+    return infoLogEnabled || infoLogWriter != null;
-      rc.expctxWay = new BExpressionContextWay( rc.serversizing ? 262144 : 8192, meta );
-      rc.expctxNode = new BExpressionContextNode( rc.serversizing ?  16384 : 2048, meta );
-      
-      meta.readMetaData( new File( profileDir, "lookups.dat" ) );
-
-      expctxGlobal.parseFile( profileFile, null );
-      expctxGlobal.evaluate( new int[0] );
-      rc.readGlobalConfig(expctxGlobal);
-
-      rc.expctxWay.parseFile( profileFile, "global" );
-      rc.expctxNode.parseFile( profileFile, "global" );
-    }
   }
 
   private void logInfo( String s )
@@ -141,13 +130,6 @@ public class RoutingEngine extends Thread
   {
     try
     {        	
-      File debugLog = new File( profileDir, "../debug.txt" );
-      if ( debugLog.exists() )
-      {
-        infoLogWriter = new FileWriter( debugLog, true );
-        logInfo( "start request at " + new Date() );
-      }
-        	
       // delete nogos with waypoints in them
       routingContext.cleanNogolist( waypoints );
 
@@ -232,6 +214,8 @@ public class RoutingEngine extends Thread
     }
     finally
     {
+      ProfileCache.releaseProfile( routingContext );
+
       if ( nodesCache != null )
       {
         nodesCache.close();
@@ -313,6 +297,10 @@ public class RoutingEngine extends Thread
       nearbyTrack = OsmTrack.readBinary( routingContext.rawTrackPath, waypoints.get( waypoints.size()-1), routingContext.getNogoChecksums() );
       if ( nearbyTrack != null )
       {
+        if ( hasInfo() )
+        {
+          logInfo( "read referenceTrack, dirty=" + nearbyTrack.isDirty );
+        }
         nUnmatched--;
       }
     }
@@ -506,6 +494,7 @@ public class RoutingEngine extends Thread
     OsmTrack track = null;
     double[] airDistanceCostFactors = new double[]{ routingContext.pass1coefficient, routingContext.pass2coefficient };
     boolean isDirty = false;
+    IllegalArgumentException dirtyMessage = null;
     
     if ( nearbyTrack != null )
     {
@@ -524,6 +513,7 @@ public class RoutingEngine extends Thread
         {
           track = mergeTrack( matchPath, nearbyTrack );
           isDirty = true;
+          dirtyMessage = iae;
           logInfo( "using fast partial recalc" );
         }
     	maxRunningTime += System.currentTimeMillis() - startTime; // reset timeout...
@@ -541,7 +531,24 @@ public class RoutingEngine extends Thread
           continue;
         }
       
-        OsmTrack t = findTrack( cfi == 0 ? "pass0" : "pass1", startWp, endWp, track , refTrack, false  );
+        OsmTrack t;
+        try
+        {
+          t = findTrack( cfi == 0 ? "pass0" : "pass1", startWp, endWp, track , refTrack, false  );
+        }
+        catch( IllegalArgumentException iae )
+        {
+          if ( !terminated && matchPath != null ) // timeout, but eventually prepare a dirty ref track
+          {
+            logInfo( "supplying dirty reference track after timeout" );
+            foundRawTrack = mergeTrack( matchPath, track );
+            foundRawTrack.endPoint = endWp;
+            foundRawTrack.nogoChecksums = routingContext.getNogoChecksums();
+            foundRawTrack.isDirty = true;
+          }
+          throw iae;
+        }
+
         if ( t == null && track != null && matchPath != null )
         {
           // ups, didn't find it, use a merge
@@ -560,17 +567,25 @@ public class RoutingEngine extends Thread
     }
     if ( track == null ) throw new IllegalArgumentException( "no track found" );
     
-    if ( refTrack == null && !isDirty )
+    boolean wasClean = nearbyTrack != null && !nearbyTrack.isDirty;
+    if ( refTrack == null && !(wasClean && isDirty) ) // do not overwrite a clean with a dirty track
     {
-      logInfo( "supplying new reference track" );
+      logInfo( "supplying new reference track, dirty=" + isDirty );
       track.endPoint = endWp;
       track.nogoChecksums = routingContext.getNogoChecksums();
+      track.isDirty = isDirty;
       foundRawTrack = track;
     }
 
+    if ( !wasClean && isDirty )
+    {
+      throw dirtyMessage;
+    }
+
     // final run for verbose log info and detail nodes
     airDistanceCostFactor = 0.;
     guideTrack = track;
+    startTime = System.currentTimeMillis(); // reset timeout...
     try
     {
       OsmTrack tt = findTrack( "re-tracking", startWp, endWp, null , refTrack, false );
@@ -804,7 +819,8 @@ public class RoutingEngine extends Thread
         continue;
       }
 
-      if ( matchPath != null && fastPartialRecalc && firstMatchCost < 500 && path.cost > 30L*firstMatchCost )
+      if ( matchPath != null && fastPartialRecalc && firstMatchCost < 500 && path.cost > 30L*firstMatchCost
+          && !costCuttingTrack.isDirty )
       {
         logInfo( "early exit: firstMatchCost=" + firstMatchCost + " path.cost=" + path.cost );
         throw new IllegalArgumentException( "early exit for a close recalc" );

brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java

@@ -194,7 +194,7 @@ public final class NodesCache
     }
     catch (Exception e)
     {
-      throw new RuntimeException( "error reading datafile " + currentFileName + ": ", e );
+      throw new RuntimeException( "error reading datafile " + currentFileName + ": " + e, e );
     }
   }
 

brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java

@@ -108,7 +108,7 @@ final public class PhysicalFile
 
     if ( len < pos+extraLen ) // > is o.k. for future extensions!
     {
-      throw new IOException( "file of size " + len + " + too short, should be " + (pos+extraLen) );
+      throw new IOException( "file of size " + len + " too short, should be " + (pos+extraLen) );
     }
     
     ra.seek( pos );

brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java

@@ -52,12 +52,9 @@ public class BRouterWorker
     RoutingEngine cr = new RoutingEngine( null, null, segmentDir, readPositions(params), rc );
     cr.quite = true;
     cr.doRun( maxRunningTime );
-    if ( cr.getErrorMessage() != null )
-    {
-      return cr.getErrorMessage();
-    }
 	
     // store new reference track if any
+    // (can exist fot timeed-out search)
     if ( cr.getFoundRawTrack() != null )
     {
       try
@@ -67,6 +64,10 @@ public class BRouterWorker
       catch( Exception e ) {}
     }
     
+    if ( cr.getErrorMessage() != null )
+    {
+      return cr.getErrorMessage();
+    }
     
 	String format = params.getString("trackFormat");
 	boolean writeKml = format != null && "kml".equals( format );