fixed memory calculation in performanceMemory web page

fixed also maximum cache size computation

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2429 6c8d7289-2bf4-0310-a012-ef5d649a1542

1 files changed, 40 insertions, 26 deletions

diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index 3b96369e6..d645186f9 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -82,7 +82,7 @@
 <td class="small" rowspan="2">Database<br>&nbsp;</td>

 <td class="small" rowspan="2">DB&nbsp;Size<br>&nbsp;</td>

 <td class="small" colspan="4">Node Cache</td>

-<td class="small" colspan="4">Object Cache</td>

+<td class="small" colspan="5">Object Cache</td>

 <td class="small" colspan="4">Memory Occupation (KBytes)</td>

 <td class="small" rowspan="2">Description<br>&nbsp;</td>

 </tr>

@@ -92,7 +92,8 @@
 <td class="small">Empty<br>(avail.)<br>Slots</td>

 <td class="small">Used<br>(filled)<br>Slots</td>

 <td class="small">Node-Cache<br>Hit:Miss<br>Uniq:Doub<br>Del:Flush<br></td>

-<td class="small">&nbsp;<br>Max<br>Size</td>

+<td class="small">Chunk<br>Size<br>(bytes)</td>

+<td class="small">Max<br>Size<br>Hit/Miss</td>

 <td class="small">&nbsp;<br>Hit-Size<br>Miss-Size</td>

 <td class="small">Hit-Cache<br>Hit:Miss<br>Uniq:Doub<br>Del:Flush<br></td>

 <td class="small">Miss-Cache<br>Hit:Miss<br>Uniq:Doub<br>Del:Flush<br></td>

@@ -105,11 +106,12 @@
 <tr class="TableCellDark">

 <td class="small" align="left">RWI Assortment Cluster</td>

 <td class="small" align="right">#[slreqRWI]#</td>

-<td class="small" align="right">#[chunkRWI]#</td>

+<td class="small" align="right">#[nodszRWI]#</td>

 <td class="small" align="right">#[slempRWI]#</td>

 <td class="small" align="right">#[slfilRWI]#</td>

 <td class="small" align="right">#[slhittmissRWI]#<br>#[sluniqdoubRWI]#<br>#[slflushRWI]#</td>

-<td class="small" align="right">#[ochunkmaxRWI]#</td>

+<td class="small" align="right">#[ochunksizRWI]#</td>

+<td class="small" align="right">#[ochunkmaxRWI]#<br>#[omisscmaxRWI]#</td>

 <td class="small" align="right">#[ochunkcurRWI]#</td>

 <td class="small" align="right">#[ohittmissRWI]#<br>#[ouniqdoubRWI]#<br>#[oflushRWI]#</td>

 <td class="small" align="right">#[nhittmissRWI]#<br>#[nuniqdoubRWI]#<br>#[nflushRWI]#</td>

@@ -125,11 +127,12 @@ cache will speed up crawls with a depth > 3.</td>
 <tr class="TableCellDark">

 <td class="small" align="left">HTTP Response Header</td>

 <td class="small" align="right">#[slreqHTTP]#</td>

-<td class="small" align="right">#[chunkHTTP]#</td>

+<td class="small" align="right">#[nodszHTTP]#</td>

 <td class="small" align="right">#[slempHTTP]#</td>

 <td class="small" align="right">#[slfilHTTP]#</td>

 <td class="small" align="right">#[slhittmissHTTP]#<br>#[sluniqdoubHTTP]#<br>#[slflushHTTP]#</td>

-<td class="small" align="right">#[ochunkmaxHTTP]#</td>

+<td class="small" align="right">#[ochunksizHTTP]#</td>

+<td class="small" align="right">#[ochunkmaxHTTP]#<br>#[omisscmaxHTTP]#</td>

 <td class="small" align="right">#[ochunkcurHTTP]#</td>

 <td class="small" align="right">#[ohittmissHTTP]#<br>#[ouniqdoubHTTP]#<br>#[oflushHTTP]#</td>

 <td class="small" align="right">#[nhittmissHTTP]#<br>#[nuniqdoubHTTP]#<br>#[nflushHTTP]#</td>

@@ -145,11 +148,12 @@ Increasing this cache will be most important for a fast proxy mode.</td>
 <tr class="TableCellDark">

 <td class="small" align="left">'loaded' URLs</td>

 <td class="small" align="right">#[slreqLURL]#</td>

-<td class="small" align="right">#[chunkLURL]#</td>

+<td class="small" align="right">#[nodszLURL]#</td>

 <td class="small" align="right">#[slempLURL]#</td>

 <td class="small" align="right">#[slfilLURL]#</td>

 <td class="small" align="right">#[slhittmissLURL]#<br>#[sluniqdoubLURL]#<br>#[slflushLURL]#</td>

-<td class="small" align="right">#[ochunkmaxLURL]#</td>

+<td class="small" align="right">#[ochunksizLURL]#</td>

+<td class="small" align="right">#[ochunkmaxLURL]#<br>#[omisscmaxLURL]#</td>

 <td class="small" align="right">#[ochunkcurLURL]#</td>

 <td class="small" align="right">#[ohittmissLURL]#<br>#[ouniqdoubLURL]#<br>#[oflushLURL]#</td>

 <td class="small" align="right">#[nhittmissLURL]#<br>#[nuniqdoubLURL]#<br>#[nflushLURL]#</td>

@@ -164,11 +168,12 @@ This cache is very important for a fast search process. Increasing the cache siz
 <tr class="TableCellDark">

 <td class="small" align="left">'pre-noticed' URLs</td>

 <td class="small" align="right">#[slreqPreNURL]#</td>

-<td class="small" align="right">#[chunkPreNURL]#</td>

+<td class="small" align="right">#[nodszPreNURL]#</td>

 <td class="small" align="right">#[slempPreNURL]#</td>

 <td class="small" align="right">#[slfilPreNURL]#</td>

 <td class="small" align="right">#[slhittmissPreNURL]#<br>#[sluniqdoubPreNURL]#<br>#[slflushPreNURL]#</td>

-<td class="small" align="right">#[ochunkmaxPreNURL]#</td>

+<td class="small" align="right">#[ochunksizPreNURL]#</td>

+<td class="small" align="right">#[ochunkmaxPreNURL]#<br>#[omisscmaxPreNURL]#</td>

 <td class="small" align="right">#[ochunkcurPreNURL]#</td>

 <td class="small" align="right">#[ohittmissPreNURL]#<br>#[ouniqdoubPreNURL]#<br>#[oflushPreNURL]#</td>

 <td class="small" align="right">#[nhittmissPreNURL]#<br>#[nuniqdoubPreNURL]#<br>#[nflushPreNURL]#</td>

@@ -182,11 +187,12 @@ This cache is very important for a fast search process. Increasing the cache siz
 <tr class="TableCellDark">

 <td class="small" align="left">'noticed' URLs</td>

 <td class="small" align="right">#[slreqNURL]#</td>

-<td class="small" align="right">#[chunkNURL]#</td>

+<td class="small" align="right">#[nodszNURL]#</td>

 <td class="small" align="right">#[slempNURL]#</td>

 <td class="small" align="right">#[slfilNURL]#</td>

 <td class="small" align="right">#[slhittmissNURL]#<br>#[sluniqdoubNURL]#<br>#[slflushNURL]#</td>

-<td class="small" align="right">#[ochunkmaxNURL]#</td>

+<td class="small" align="right">#[ochunksizNURL]#</td>

+<td class="small" align="right">#[ochunkmaxNURL]#<br>#[omisscmaxNURL]#</td>

 <td class="small" align="right">#[ochunkcurNURL]#</td>

 <td class="small" align="right">#[ohittmissNURL]#<br>#[ouniqdoubNURL]#<br>#[oflushNURL]#</td>

 <td class="small" align="right">#[nhittmissNURL]#<br>#[nuniqdoubNURL]#<br>#[nflushNURL]#</td>

@@ -201,11 +207,12 @@ Increasing the cache size will result in faster double-check during URL recognit
 <tr class="TableCellDark">

 <td class="small" align="left">'error' URLs</td>

 <td class="small" align="right">#[slreqEURL]#</td>

-<td class="small" align="right">#[chunkEURL]#</td>

+<td class="small" align="right">#[nodszEURL]#</td>

 <td class="small" align="right">#[slempEURL]#</td>

 <td class="small" align="right">#[slfilEURL]#</td>

 <td class="small" align="right">#[slhittmissEURL]#<br>#[sluniqdoubEURL]#<br>#[slflushEURL]#</td>

-<td class="small" align="right">#[ochunkmaxEURL]#</td>

+<td class="small" align="right">#[ochunksizEURL]#</td>

+<td class="small" align="right">#[ochunkmaxEURL]#<br>#[omisscmaxEURL]#</td>

 <td class="small" align="right">#[ochunkcurEURL]#</td>

 <td class="small" align="right">#[ohittmissEURL]#<br>#[ouniqdoubEURL]#<br>#[oflushEURL]#</td>

 <td class="small" align="right">#[nhittmissEURL]#<br>#[nuniqdoubEURL]#<br>#[nflushEURL]#</td>

@@ -220,11 +227,12 @@ Increasing the cache size will most probably speed up crawling slightly, but not
 <tr class="TableCellDark">

 <td class="small" align="left">DHT Control</td>

 <td class="small" align="right">#[slreqDHT]#</td>

-<td class="small" align="right">#[chunkDHT]#</td>

+<td class="small" align="right">#[nodszDHT]#</td>

 <td class="small" align="right">#[slempDHT]#</td>

 <td class="small" align="right">#[slfilDHT]#</td>

 <td class="small" align="right">#[slhittmissDHT]#<br>#[sluniqdoubDHT]#<br>#[slflushDHT]#</td>

-<td class="small" align="right">#[ochunkmaxDHT]#</td>

+<td class="small" align="right">#[ochunksizDHT]#</td>

+<td class="small" align="right">#[ochunkmaxDHT]#<br>#[omisscmaxDHT]#</td>

 <td class="small" align="right">#[ochunkcurDHT]#</td>

 <td class="small" align="right">#[ohittmissDHT]#<br>#[ouniqdoubDHT]#<br>#[oflushDHT]#</td>

 <td class="small" align="right">#[nhittmissDHT]#<br>#[nuniqdoubDHT]#<br>#[nflushDHT]#</td>

@@ -240,11 +248,12 @@ Increasing this cache may speed up many functions, but we need to test this to s
 <tr class="TableCellDark">

 <td class="small" align="left">Messages</td>

 <td class="small" align="right">#[slreqMessage]#</td>

-<td class="small" align="right">#[chunkMessage]#</td>

+<td class="small" align="right">#[nodszMessage]#</td>

 <td class="small" align="right">#[slempMessage]#</td>

 <td class="small" align="right">#[slfilMessage]#</td>

 <td class="small" align="right">#[slhittmissMessage]#<br>#[sluniqdoubMessage]#<br>#[slflushMessage]#</td>

-<td class="small" align="right">#[ochunkmaxMessage]#</td>

+<td class="small" align="right">#[ochunksizMessage]#</td>

+<td class="small" align="right">#[ochunkmaxMessage]#<br>#[omisscmaxMessage]#</td>

 <td class="small" align="right">#[ochunkcurMessage]#</td>

 <td class="small" align="right">#[ohittmissMessage]#<br>#[ouniqdoubMessage]#<br>#[oflushMessage]#</td>

 <td class="small" align="right">#[nhittmissMessage]#<br>#[nuniqdoubMessage]#<br>#[nflushMessage]#</td>

@@ -258,11 +267,12 @@ Increasing this cache may speed up many functions, but we need to test this to s
 <tr class="TableCellDark">

 <td class="small" align="left">Wiki</td>

 <td class="small" align="right">#[slreqWiki]#</td>

-<td class="small" align="right">#[chunkWiki]#</td>

+<td class="small" align="right">#[nodszWiki]#</td>

 <td class="small" align="right">#[slempWiki]#</td>

 <td class="small" align="right">#[slfilWiki]#</td>

 <td class="small" align="right">#[slhittmissWiki]#<br>#[sluniqdoubWiki]#<br>#[slflushWiki]#</td>

-<td class="small" align="right">#[ochunkmaxWiki]#</td>

+<td class="small" align="right">#[ochunksizWiki]#</td>

+<td class="small" align="right">#[ochunkmaxWiki]#<br>#[omisscmaxWiki]#</td>

 <td class="small" align="right">#[ochunkcurWiki]#</td>

 <td class="small" align="right">#[ohittmissWiki]#<br>#[ouniqdoubWiki]#<br>#[oflushWiki]#</td>

 <td class="small" align="right">#[nhittmissWiki]#<br>#[nuniqdoubWiki]#<br>#[nflushWiki]#</td>

@@ -278,10 +288,11 @@ Increasing this cache may speed up access to the wiki pages.</td>
 <tr class="TableCellDark">

 <td class="small" align="left">Blog</td>

 <td class="small" align="right">#[slreqBlog]#</td>

-<td class="small" align="right">#[chunkBlog]#</td>

+<td class="small" align="right">#[nodszBlog]#</td>

 <td class="small" align="right">#[slempBlog]#</td>

 <td class="small" align="right">#[slfilBlog]#</td>

 <td class="small" align="right">#[slhittmissBlog]#<br>#[sluniqdoubBlog]#<br>#[slflushBlog]#</td>

+<td class="small" align="right">#[ochunksizBlog]#</td>

 <td class="small" align="right">#[ochunkmaxBlog]#</td>

 <td class="small" align="right">#[ochunkcurBlog]#</td>

 <td class="small" align="right">#[ohittmissBlog]#<br>#[ouniqdoubBlog]#<br>#[oflushBlog]#</td>

@@ -297,10 +308,11 @@ Increasing this cache may speed up access to the Blog.</td>
 <tr class="TableCellDark">

 <td class="small" align="left">News</td>

 <td class="small" align="right">#[slreqNews]#</td>

-<td class="small" align="right">#[chunkNews]#</td>

+<td class="small" align="right">#[nodszNews]#</td>

 <td class="small" align="right">#[slempNews]#</td>

 <td class="small" align="right">#[slfilNews]#</td>

 <td class="small" align="right">#[slhittmissNews]#<br>#[sluniqdoubNews]#<br>#[slflushNews]#</td>

+<td class="small" align="right">#[ochunksizNews]#</td>

 <td class="small" align="right">#[ochunkmaxNews]#</td>

 <td class="small" align="right">#[ochunkcurNews]#</td>

 <td class="small" align="right">#[ohittmissNews]#<br>#[ouniqdoubNews]#<br>#[oflushNews]#</td>

@@ -316,10 +328,11 @@ Increasing this cache may speed up the peer-ping.</td>
 <tr class="TableCellDark">

 <td class="small" align="left">robots.txt DB</td>

 <td class="small" align="right">#[slreqRobots]#</td>

-<td class="small" align="right">#[chunkRobots]#</td>

+<td class="small" align="right">#[nodszRobots]#</td>

 <td class="small" align="right">#[slempRobots]#</td>

 <td class="small" align="right">#[slfilRobots]#</td>

 <td class="small" align="right">#[slhittmissRobots]#<br>#[sluniqdoubRobots]#<br>#[slflushRobots]#</td>

+<td class="small" align="right">#[ochunksizRobots]#</td>

 <td class="small" align="right">#[ochunkmaxRobots]#</td>

 <td class="small" align="right">#[ochunkcurRobots]#</td>

 <td class="small" align="right">#[ohittmissRobots]#<br>#[ouniqdoubRobots]#<br>#[oflushRobots]#</td>

@@ -335,10 +348,11 @@ Increasing this cache may speed up validation if crawling of the URL is allowed.
 <tr class="TableCellDark">

 <td class="small" align="left">Crawl Profiles</td>

 <td class="small" align="right">#[slreqProfiles]#</td>

-<td class="small" align="right">#[chunkProfiles]#</td>

+<td class="small" align="right">#[nodszProfiles]#</td>

 <td class="small" align="right">#[slempProfiles]#</td>

 <td class="small" align="right">#[slfilProfiles]#</td>

 <td class="small" align="right">#[slhittmissProfiles]#<br>#[sluniqdoubProfiles]#<br>#[slflushProfiles]#</td>

+<td class="small" align="right">#[ochunksizProfiles]#</td>

 <td class="small" align="right">#[ochunkmaxProfiles]#</td>

 <td class="small" align="right">#[ochunkcurProfiles]#</td>

 <td class="small" align="right">#[ohittmissProfiles]#<br>#[ouniqdoubProfiles]#<br>#[oflushProfiles]#</td>

@@ -352,7 +366,7 @@ Increasing this cache may speed up crawling, but not much space is needed, so th
 </tr>

 

 <tr class="TableCellSummary">

-<td class="small" align="left" colspan="10">Totals</td>

+<td class="small" align="left" colspan="11">Totals</td>

 <td class="small" align="right">#[usedTotal]# MB</td>

 <td class="small" align="right">#[currTotal]# MB</td>

 <td class="small" align="right">#[dfltTotal]# MB</td>

@@ -361,7 +375,7 @@ Increasing this cache may speed up crawling, but not much space is needed, so th
 </tr>

 

 <tr class="TableCellLight">

-<td class="small" align="right" colspan="11">Re-Configuration:</td>

+<td class="small" align="right" colspan="12">Re-Configuration:</td>

 <td class="small" align="center"><input type="submit" name="setCustom" value="Set"><br>these<br>custom<br>values<br>&nbsp;</td>

 <td class="small" align="center"><input type="submit" name="setDefault" value="Set"><br>all<br>default<br>values<br>&nbsp;</td>

 <td class="small" align="center"><input type="submit" name="setBest" value="Set"><br>all<br>optimum<br>values<br>&nbsp;</td>