performance

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

@@ -0,0 +1,69 @@
+/**
+ * Container for link between two Osm nodes
+ *
+ * @author ab
+ */
+package btools.mapaccess;
+
+import btools.util.ByteDataReader;
+
+
+public final class GeometryDecoder
+{
+  private ByteDataReader r = new ByteDataReader( null );
+  private OsmTransferNode[] cachedNodes;
+  private int nCachedNodes = 128;
+
+  public GeometryDecoder()
+  {
+    // create some caches
+    cachedNodes = new OsmTransferNode[nCachedNodes];
+    for( int i=0; i<nCachedNodes; i++ )
+    {
+      cachedNodes[i] = new OsmTransferNode();
+    }
+  }
+
+
+
+  public OsmTransferNode decodeGeometry( byte[] geometry, OsmNode sourceNode, OsmNode targetNode, boolean reverseLink )
+  {
+      OsmTransferNode firstTransferNode = null;
+      OsmTransferNode lastTransferNode = null;
+      OsmNode startnode =  reverseLink ? targetNode : sourceNode;
+      r.reset( geometry );
+      int olon = startnode.ilon;
+      int olat = startnode.ilat;
+      int oselev = startnode.selev;
+      int idx = 0;
+      while ( r.hasMoreData() )
+      {
+        OsmTransferNode trans = idx < nCachedNodes ? cachedNodes[idx++] : new OsmTransferNode();
+        trans.ilon = olon + r.readVarLengthSigned();
+        trans.ilat = olat + r.readVarLengthSigned();
+        trans.selev = (short)(oselev + r.readVarLengthSigned());
+        olon = trans.ilon;
+        olat = trans.ilat;
+        oselev = trans.selev;
+        if ( reverseLink ) // reverse chaining
+        {
+          trans.next = firstTransferNode;
+          firstTransferNode = trans;
+        }
+        else
+        {
+          trans.next = null;
+          if ( lastTransferNode == null )
+          {
+            firstTransferNode = trans;
+          }
+          else
+          {
+            lastTransferNode.next = trans;
+          }
+          lastTransferNode = trans;
+        }
+      }
+      return firstTransferNode;
+  }
+}

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

@@ -7,9 +7,7 @@ package btools.mapaccess;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 import btools.codec.DataBuffers;
 import btools.codec.MicroCache;
@@ -43,10 +41,15 @@ public final class NodesCache
   
   private boolean garbageCollectionEnabled = false;
   private boolean ghostCleaningDone = false;
+
+
+  private long cacheSumClean = 0;
+  private long ghostSum = 0;
+  private long ghostWakeup = 0;
   
   public String formatStatus()
   {
-    return "collecting=" + garbageCollectionEnabled + " noGhosts=" + ghostCleaningDone + " cacheSum=" + cacheSum;
+    return "collecting=" + garbageCollectionEnabled + " noGhosts=" + ghostCleaningDone + " cacheSum=" + cacheSum + " cacheSumClean=" + cacheSumClean + " ghostSum=" + ghostSum + " ghostWakeup=" + ghostWakeup ;
   }
 
   public NodesCache( String segmentDir, OsmNodesMap nodesMap, BExpressionContextWay ctxWay, boolean forceSecondaryData, long maxmem, NodesCache oldCache )
@@ -90,6 +93,7 @@ public final class NodesCache
       dataBuffers = new DataBuffers();
       secondarySegmentsDir = StorageConfigHelper.getSecondarySegmentDir( segmentDir );
     }
+    ghostSum = cacheSum;
   }
   
   public void cleanNonVirgin()
@@ -110,39 +114,28 @@ public final class NodesCache
   private void checkEnableCacheCleaning()
   {
     if ( cacheSum < maxmem || ghostCleaningDone )
+    {
       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 ( garbageCollectionEnabled )
         {
-          if ( osmf.ghost )
-          {
-            nghosts++;
-          }
+          cacheSum -= osmf.cleanGhosts();
         }
         else
         {
-          osmf.cleanAll();
+          cacheSum -= osmf.collectAll();
         }
       }
-      if ( nghosts == 0 )
-        continue;
-      int j = 0;
-      OsmFile[] frow = new OsmFile[fileRow.length - nghosts];
-      for ( OsmFile osmf : fileRow )
-      {
-        if ( osmf.ghost )
-          continue;
-        frow[j++] = osmf;
-      }
-      fileRows[i] = frow;
     }
     
     if ( garbageCollectionEnabled )
@@ -150,7 +143,8 @@ public final class NodesCache
       ghostCleaningDone = true;
     }
     else
-    {    
+    {
+      cacheSumClean = cacheSum;
       garbageCollectionEnabled = true;
     }
   }
@@ -189,7 +183,6 @@ public final class NodesCache
         newFileRow[ndegrees] = osmf;
         fileRows[latDegree] = newFileRow;
       }
-      osmf.ghost = false;
       currentFileName = osmf.filename;
 
       if ( !osmf.hasData() )
@@ -208,6 +201,7 @@ public final class NodesCache
       else if ( segment.ghost )
       {
         segment.unGhost();
+        ghostWakeup += segment.getDataSize();
       }
       return segment;
     }
@@ -240,7 +234,7 @@ public final class NodesCache
 
     if ( garbageCollectionEnabled ) // garbage collection
     {
-      segment.collect( segment.getSize() >> 2 ); // threshold = 1/4 of size is deleted
+      cacheSum -= segment.collect( segment.getSize() >> 1 ); // threshold = 1/2 of size is deleted
     }
 
     return !node.isHollow();

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

@@ -29,8 +29,6 @@ final class OsmFile
 
   public String filename;
 
-  public boolean ghost = false;
-
   private int divisor;
   private int cellsize;
   private int ncaches;
@@ -162,7 +160,6 @@ final class OsmFile
   long setGhostState()
   {
     long sum = 0;
-    ghost = true;
     int nc = microCaches == null ? 0 : microCaches.length;
     for ( int i = 0; i < nc; i++ )
     {
@@ -182,8 +179,26 @@ final class OsmFile
     return sum;
   }
 
-  void cleanAll()
+  long collectAll()
   {
+    long deleted = 0;
+    int nc = microCaches == null ? 0 : microCaches.length;
+    for ( int i = 0; i < nc; i++ )
+    {
+      MicroCache mc = microCaches[i];
+      if ( mc == null )
+        continue;
+      if ( !mc.ghost )
+      {
+        deleted += mc.collect( 0 );
+      }
+    }
+    return deleted;
+  }
+
+  long cleanGhosts()
+  {
+    long deleted = 0;
     int nc = microCaches == null ? 0 : microCaches.length;
     for ( int i = 0; i < nc; i++ )
     {
@@ -194,11 +209,8 @@ final class OsmFile
       {
         microCaches[i] = null;
       }
-      else
-      {
-        mc.collect( 0 );
-      }
     }
+    return deleted;
   }
 
   void cleanNonVirgin()

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

@@ -5,7 +5,6 @@
  */
 package btools.mapaccess;
 
-import btools.util.ByteDataReader;
 
 
 public class OsmLink
@@ -33,47 +32,6 @@ public class OsmLink
     this.geometry = geometry;
   }
 
-  final public OsmTransferNode decodeFirsttransfer( OsmNode sourceNode )
-  {
-      if ( geometry == null ) return null;
-
-      OsmTransferNode firstTransferNode = null;
-      OsmTransferNode lastTransferNode = null;
-      OsmNode startnode =  counterLinkWritten ? targetNode : sourceNode;
-      ByteDataReader r = new ByteDataReader( geometry );
-      int olon = startnode.ilon;
-      int olat = startnode.ilat;
-      int oselev = startnode.selev;
-      while ( r.hasMoreData() )
-      {
-        OsmTransferNode trans = new OsmTransferNode();
-        trans.ilon = olon + r.readVarLengthSigned();
-        trans.ilat = olat + r.readVarLengthSigned();
-        trans.selev = (short)(oselev + r.readVarLengthSigned());
-        olon = trans.ilon;
-        olat = trans.ilat;
-        oselev = trans.selev;
-        if ( counterLinkWritten ) // reverse chaining
-        {
-          trans.next = firstTransferNode;
-          firstTransferNode = trans;
-        }
-        else
-        {
-          if ( lastTransferNode == null )
-          {
-            firstTransferNode = trans;
-          }
-          else
-          {
-            lastTransferNode.next = trans;
-          }
-          lastTransferNode = trans;
-        }
-      }
-      return firstTransferNode;
-  }
-
    final public void addLinkHolder( OsmLinkHolder holder )
    {
      if ( firstlinkholder != null ) { holder.setNextForLink( firstlinkholder ); }