From fa734bdf9f351cd30bf7bb3c6731fcb29c7abd65 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 27 May 2011 11:18:22 +0000
Subject: [PATCH] better memory protection in search logger

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7748 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/search/AccessTracker.java | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/source/de/anomic/search/AccessTracker.java b/source/de/anomic/search/AccessTracker.java
index 5b9b8f5d1..0b9210a5e 100644
--- a/source/de/anomic/search/AccessTracker.java
+++ b/source/de/anomic/search/AccessTracker.java
@@ -38,11 +38,12 @@ import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.document.UTF8;
 import net.yacy.document.LibraryProvider;
 import net.yacy.kelondro.logging.Log;
+import net.yacy.kelondro.util.MemoryControl;
 
 public class AccessTracker {
 
-    public static final int minSize = 1000;
-    public static final int maxSize = 5000;
+    public static final int minSize = 100;
+    public static final int maxSize = 1000;
     public static final int maxAge = 10 * 60 * 1000;
     
     public enum Location {local, remote}
@@ -57,21 +58,29 @@ public class AccessTracker {
     }
     
     private static void add(LinkedList<QueryParams> list, QueryParams query) {
+        // learn that this word can be a word completion for the DidYouMeanLibrary
+        if (query.resultcount > 10 && query.queryString != null && query.queryString.length() > 0) LibraryProvider.dymLib.learn(query.queryString);
+        
+        // add query to statistics list
         list.add(query);
-        while (list.size() > maxSize) {
-            addToDump(list.removeFirst());
-        }
-        if (list.size() <= minSize) {
-            return;
+
+        // shrink dump list but keep essentials in dump
+        while (list.size() > maxSize || (list.size() > 0 && MemoryControl.shortStatus())) {
+            synchronized (list) {
+                if (list.size() > 0) addToDump(list.removeFirst()); else break;
+            }
         }
+        
+        // if the list is small we can terminate
+        if (list.size() <= minSize) return;
+        
+        // if the list is large we look for too old entries
         long timeout = System.currentTimeMillis() - maxAge;
         while (list.size() > 0) {
             QueryParams q = list.getFirst();
             if (q.time.longValue() > timeout) break;
             addToDump(list.removeFirst());
         }
-        // learn that this word can be a word completion for the DidYouMeanLibrary
-        if (query.resultcount > 0 && query.queryString != null && query.queryString.length() > 0) LibraryProvider.dymLib.learn(query.queryString);
     }
     
     public static Iterator<QueryParams> get(Location location) {