From 98a84ddb12c8cbe8f3732446b6607446fa131f7f Mon Sep 17 00:00:00 2001 From: karlchenofhell Date: Tue, 17 Oct 2006 22:22:36 +0000 Subject: [PATCH] - reverted last change partly, can't handle the template system git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2793 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/PerformanceMemory_p.html | 14 ++++----- htroot/PerformanceMemory_p.java | 52 +++++++++++++-------------------- 2 files changed, 27 insertions(+), 39 deletions(-) diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index 8824727a0..cacffacdf 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -96,7 +96,7 @@ Default Max Best Max - #(useRWICache)#:: + RWI Assortment Cluster #[slreqRWI]# @@ -116,7 +116,7 @@ The Assortment Cluster stores most of the page indexes. Flushing speed of the temporary RWI cache depends on the size of this file cache. Increasing the space of this cache will speed up crawls with a depth > 3. - #(/useRWICache)# + HTTP Response Header @@ -158,7 +158,7 @@ This is the database that holds the hash/url - relation and properties regarding the url like load date and server date. This cache is very important for a fast search process. Increasing the cache size will result in more search results and less IO during DHT transfer. - #(usePreNURLCache)#:: + 'pre-noticed' URLs #[slreqPreNURL]# @@ -176,7 +176,7 @@ #[dfltPreNURL]# #[bestPreNURL]# - #(/usePreNURLCache)# + 'noticed' URLs @@ -196,8 +196,8 @@ #[bestNURL]# A noticed URL is one that was discovered during crawling but was not loaded yet. Increasing the cache size will result in faster double-check during URL recognition when doing crawls. - - #(useEURLCache)#:: + + 'error' URLs #[slreqEURL]# @@ -216,7 +216,7 @@ #[bestEURL]# URLs that cannot be loaded are stored in this database. It is also used for double-checked during crawling. Increasing the cache size will most probably speed up crawling slightly, but not significantly. - #(/useEURLCache)# + DHT Control diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 3b7a98370..8de214e7c 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -166,18 +166,14 @@ public class PerformanceMemory_p { currTotal = 0; dfltTotal = 0; bestTotal = 0; - - if (sb.wordIndex.useCollectionIndex) { - prop.put("useRWICache", 0); - } else { - req = sb.wordIndex.size(); - chk = sb.wordIndex.assortmentsCacheChunkSizeAvg(); - obj = sb.wordIndex.assortmentsCacheObjectSizeAvg(); - slt = sb.wordIndex.assortmentsCacheNodeStatus(); - ost = sb.wordIndex.assortmentsCacheObjectStatus(); - putprop(prop, env, "RWI", set); - } - + + req = sb.wordIndex.size(); + chk = sb.wordIndex.assortmentsCacheChunkSizeAvg(); + obj = sb.wordIndex.assortmentsCacheObjectSizeAvg(); + slt = sb.wordIndex.assortmentsCacheNodeStatus(); + ost = sb.wordIndex.assortmentsCacheObjectStatus(); + putprop(prop, env, "RWI", set); + req = sb.cacheManager.dbSize(); chk = sb.cacheManager.cacheNodeChunkSize(); obj = sb.cacheManager.cacheObjectChunkSize(); @@ -192,16 +188,12 @@ public class PerformanceMemory_p { ost = sb.urlPool.loadedURL.cacheObjectStatus(); putprop(prop, env, "LURL", set); - if (sb.sbStackCrawlThread.getDBType() != de.anomic.plasma.plasmaCrawlStacker.QUEUE_DB_TYPE_TREE) { - prop.put("usePreNURLCache", 0); - } else { - req = sb.sbStackCrawlThread.size(); - chk = sb.sbStackCrawlThread.cacheNodeChunkSize(); - obj = sb.sbStackCrawlThread.cacheObjectChunkSize(); - slt = sb.sbStackCrawlThread.cacheNodeStatus(); - ost = sb.sbStackCrawlThread.cacheObjectStatus(); - putprop(prop, env, "PreNURL", set); - } + req = sb.sbStackCrawlThread.size(); + chk = sb.sbStackCrawlThread.cacheNodeChunkSize(); + obj = sb.sbStackCrawlThread.cacheObjectChunkSize(); + slt = sb.sbStackCrawlThread.cacheNodeStatus(); + ost = sb.sbStackCrawlThread.cacheObjectStatus(); + putprop(prop, env, "PreNURL", set); req = sb.urlPool.noticeURL.size(); chk = sb.urlPool.noticeURL.cacheNodeChunkSize(); @@ -210,16 +202,12 @@ public class PerformanceMemory_p { ost = sb.urlPool.noticeURL.cacheObjectStatus(); putprop(prop, env, "NURL", set); - if (sb.urlPool.errorURL.getUseNewDB()) { - prop.put("useEURLCache", 0); - } else { - req = sb.urlPool.errorURL.size(); - chk = sb.urlPool.errorURL.cacheNodeChunkSize(); - obj = sb.urlPool.errorURL.cacheObjectChunkSize(); - slt = sb.urlPool.errorURL.cacheNodeStatus(); - ost = sb.urlPool.errorURL.cacheObjectStatus(); - putprop(prop, env, "EURL", set); - } + req = sb.urlPool.errorURL.size(); + chk = sb.urlPool.errorURL.cacheNodeChunkSize(); + obj = sb.urlPool.errorURL.cacheObjectChunkSize(); + slt = sb.urlPool.errorURL.cacheNodeStatus(); + ost = sb.urlPool.errorURL.cacheObjectStatus(); + putprop(prop, env, "EURL", set); req = yacyCore.seedDB.sizeConnected() + yacyCore.seedDB.sizeDisconnected() + yacyCore.seedDB.sizePotential(); chk = yacyCore.seedDB.cacheNodeChunkSize();