kbytes instead of bytes in performance settings; new default values

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@808 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Sep 28, 2005 · 3dd7e90 · 3dd7e90
1 parent 1669eaa
commit 3dd7e90
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
@@ -51,12 +51,12 @@ <h2>Performance Settings of Queues and Processes</h2>
 <td class="small" align="right">#[memusepercycle]#</td>
 <td class="small" align="right"><input name="#[threadname]#_idlesleep" type="text" align="right" size="7" maxlength="7" value="#[idlesleep]#"> milliseconds</td>
 <td class="small" align="right"><input name="#[threadname]#_busysleep" type="text" align="right" size="7" maxlength="7" value="#[busysleep]#"> milliseconds</td>
-<td class="small" align="right"><input name="#[threadname]#_memprereq" type="text" align="right" size="8" maxlength="8" value="#[memprereq]#"> bytes</td>
+<td class="small" align="right"><input name="#[threadname]#_memprereq" type="text" align="right" size="5" maxlength="5" value="#[memprereq]#"> kbytes</td>
 <td class="small" align="left">#[longdescr]#</td>
 </tr>
 #{/table}#
 <tr class="TableCellLight">
-<td class="small" align="left" colspan="18">
+<td class="small" align="left" colspan="19">
 <input type="submit" name="submitdelay" value="Submit New Delay Values">&nbsp;&nbsp;&nbsp;
 <input type="submit" name="submitdefault" value="Reset To Default Values">&nbsp;&nbsp;&nbsp;
 Changes take effect immediately</td>

diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java
@@ -126,7 +126,7 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
                 // 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 static serverObjects respond(httpHeader header, serverObjects post, serve
             }
             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
@@ -256,7 +256,7 @@ public void run() {
                         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
@@ -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