diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
index fdbefd288..77e9b44b2 100644
--- a/htroot/PerformanceQueues_p.html
+++ b/htroot/PerformanceQueues_p.html
@@ -51,12 +51,12 @@
#[memusepercycle]# |
milliseconds |
milliseconds |
- bytes |
+ kbytes |
#[longdescr]# |
#{/table}#
-
+ |
Changes take effect immediately |
diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java
index 021ab893e..c0e954836 100644
--- a/htroot/PerformanceQueues_p.java
+++ b/htroot/PerformanceQueues_p.java
@@ -126,7 +126,7 @@ public class PerformanceQueues_p {
// load with new values
idlesleep = Long.parseLong((String) post.get(threadName + "_idlesleep", "1000"));
busysleep = Long.parseLong((String) post.get(threadName + "_busysleep", "100"));
- memprereq = Long.parseLong((String) post.get(threadName + "_memprereq", "0"));
+ memprereq = Long.parseLong((String) post.get(threadName + "_memprereq", "0")) * 1024;
// check values to prevent short-cut loops
if (idlesleep < 1000) idlesleep = 1000;
@@ -164,7 +164,7 @@ public class PerformanceQueues_p {
}
prop.put("table_" + c + "_idlesleep", idlesleep);
prop.put("table_" + c + "_busysleep", busysleep);
- prop.put("table_" + c + "_memprereq", memprereq);
+ prop.put("table_" + c + "_memprereq", memprereq / 1024);
c++;
}
diff --git a/source/de/anomic/server/serverAbstractThread.java b/source/de/anomic/server/serverAbstractThread.java
index c7c670575..7d7724bf3 100644
--- a/source/de/anomic/server/serverAbstractThread.java
+++ b/source/de/anomic/server/serverAbstractThread.java
@@ -256,7 +256,7 @@ public abstract class serverAbstractThread extends Thread implements serverThrea
memuse += memstamp1 - memstamp0;
} else {
// GC was obviously in between. Add an average as simple heuristic
- memuse += memuse / busyCycles;
+ if (busyCycles > 0) memuse += memuse / busyCycles;
}
busytime += System.currentTimeMillis() - timestamp;
busyCycles++;
diff --git a/yacy.init b/yacy.init
index 5fca7ffd5..0d62b0081 100644
--- a/yacy.init
+++ b/yacy.init
@@ -399,29 +399,29 @@ xpstopw=true
# be available/free in the heap; othervise the loop is not executed
# and another idlesleep is performed
20_dhtdistribution_idlesleep=20000
-20_dhtdistribution_busysleep=10000
-20_dhtdistribution_memprereq=1000000
+20_dhtdistribution_busysleep=5000
+20_dhtdistribution_memprereq=8388608
30_peerping_idlesleep=120000
30_peerping_busysleep=120000
-30_peerping_memprereq=100000
+30_peerping_memprereq=1048576
40_peerseedcycle_idlesleep=1800000
40_peerseedcycle_busysleep=1200000
-40_peerseedcycle_memprereq=1000000
+40_peerseedcycle_memprereq=4194304
50_localcrawl_idlesleep=10000
-50_localcrawl_busysleep=100
-50_localcrawl_memprereq=1000000
+50_localcrawl_busysleep=200
+50_localcrawl_memprereq=1048576
61_globalcrawltrigger_idlesleep=10000
-61_globalcrawltrigger_busysleep=100
-61_globalcrawltrigger_memprereq=1000000
+61_globalcrawltrigger_busysleep=200
+61_globalcrawltrigger_memprereq=1048576
62_remotetriggeredcrawl_idlesleep=10000
-62_remotetriggeredcrawl_busysleep=2000
-62_remotetriggeredcrawl_memprereq=1000000
+62_remotetriggeredcrawl_busysleep=200
+62_remotetriggeredcrawl_memprereq=1048576
70_cachemanager_idlesleep=5000
70_cachemanager_busysleep=0
-70_cachemanager_memprereq=100000
+70_cachemanager_memprereq=1048576
80_indexing_idlesleep=5000
80_indexing_busysleep=0
-80_indexing_memprereq=1000000
+80_indexing_memprereq=2097152
90_cleanup_idlesleep=300000
90_cleanup_busysleep=300000
90_cleanup_memprereq=0