From 0fe67735367898fe01f402ab4e4c35e498f2a1a8 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Thu, 13 Sep 2018 13:07:16 +0200 Subject: [PATCH] performance fix --- brouter-core/src/main/java/btools/router/ProfileCache.java | 2 +- brouter-core/src/main/java/btools/router/RoutingEngine.java | 3 +-- brouter-server/src/main/java/btools/server/BRouter.java | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/ProfileCache.java b/brouter-core/src/main/java/btools/router/ProfileCache.java index d823c96..4115004 100644 --- a/brouter-core/src/main/java/btools/router/ProfileCache.java +++ b/brouter-core/src/main/java/btools/router/ProfileCache.java @@ -78,7 +78,7 @@ public final class ProfileCache rc.expctxWay.setAllTagsUsed(); } - lastProfileTimestamp = profileFile.lastModified(); + lastProfileTimestamp = rc.profileTimestamp; lastLookupTimestamp = lookupFile.lastModified(); lastProfileFile = profileFile; lastLookupFile = lookupFile; diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 3c38cc2..e73925d 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -289,8 +289,6 @@ public class RoutingEngine extends Thread listOne.add( seedPoint ); matchWaypointsToNodes( listOne ); - routingContext.countTraffic = true; - findTrack( "seededSearch", seedPoint, null, null, null, false ); } catch( IllegalArgumentException e) @@ -310,6 +308,7 @@ public class RoutingEngine extends Thread } finally { + ProfileCache.releaseProfile( routingContext ); if ( nodesCache != null ) { nodesCache.close(); diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index 27ebb34..601bb1e 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -114,6 +114,7 @@ public class BRouter re = new RoutingEngine( "mytrack", "mylog", args[0], wplist, rc ); re.boundary = boundary; re.airDistanceCostFactor = rc.trafficDirectionFactor; + rc.countTraffic = true; re.doSearch(); if ( re.getErrorMessage() != null ) {