From c41b31dcb37404fe936c1c5eb53fad285f81c183 Mon Sep 17 00:00:00 2001 From: luccioman Date: Tue, 20 Jun 2017 09:21:55 +0200 Subject: [PATCH] Cleaned up memory usage page HTML - fixed validation errors - removed deprecated attributes - improved accessibility with richer table semantics (headers and caption elements) and language declaration --- htroot/PerformanceMemory_p.html | 299 ++++++++++++++------------------ locales/cn.lng | 16 +- locales/de.lng | 14 +- locales/fr.lng | 4 +- locales/master.lng.xlf | 10 +- locales/ru.lng | 14 +- locales/sk.lng | 3 +- locales/uk.lng | 12 +- 8 files changed, 166 insertions(+), 206 deletions(-) diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index 1f655361b..d6e603ef8 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -1,5 +1,5 @@ - - + + YaCy '#[clientname]#': Performance Settings for Memory #%env/templates/metas.template%# @@ -19,7 +19,7 @@

Performance Settings for Memory

PerformanceGraph

-

+

@@ -33,201 +33,169 @@ (current: #[memoryStrategy]#)

-

Memory Usage:

- - - - - - - - - +
 
Type		After Startup
 		After Initializations
before GC		After Initializations
after GC		Now
#(gc)#before GC::after GC#(/gc)#		Description
 
+ + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + +
Memory Usage
 
Type		After Startup
 		After Initializations
before GC		After Initializations
after GC		Now
#(gc)#before GC::after GC#(/gc)#		Description
 
Max#[memoryMax]# MBytemaximum memory that the JVM will attempt to useMax#[memoryMax]# MBytemaximum memory that the JVM will attempt to use
Available#[memoryAvailAfterStartup]# MByte#[memoryAvailAfterInitBGC]# MByte#[memoryAvailAfterInitAGC]# MByte#[memoryAvailNow]# MBytetotal available memory including free for the JVM within maximumAvailable#[memoryAvailAfterStartup]# MByte#[memoryAvailAfterInitBGC]# MByte#[memoryAvailAfterInitAGC]# MByte#[memoryAvailNow]# MBytetotal available memory including free for the JVM within maximum
Total#[memoryTotalAfterStartup]# KByte#[memoryTotalAfterInitBGC]# KByte#[memoryTotalAfterInitAGC]# KByte#[memoryTotalNow]# MBytetotal memory taken from the OSTotal#[memoryTotalAfterStartup]# KByte#[memoryTotalAfterInitBGC]# KByte#[memoryTotalAfterInitAGC]# KByte#[memoryTotalNow]# MBytetotal memory taken from the OS
Free#[memoryFreeAfterStartup]# KByte#[memoryFreeAfterInitBGC]# KByte#[memoryFreeAfterInitAGC]# KByte#[memoryFreeNow]# MBytefree memory in the JVM within total amountFree#[memoryFreeAfterStartup]# KByte#[memoryFreeAfterInitBGC]# KByte#[memoryFreeAfterInitAGC]# KByte#[memoryFreeNow]# MBytefree memory in the JVM within total amount
Used#[memoryUsedAfterStartup]# KByte#[memoryUsedAfterInitBGC]# KByte#[memoryUsedAfterInitAGC]# KByte#[memoryUsedNow]# MByteused memory in the JVM within total amount
Used#[memoryUsedAfterStartup]# KByte#[memoryUsedAfterInitBGC]# KByte#[memoryUsedAfterInitAGC]# KByte#[memoryUsedNow]# MByteused memory in the JVM within total amount
-

Solr Resources:

- - - - - - - - +
ClassTypeDescriptionStatisticsSize
+ + + + + + + + + + + #{SolrList}# - - - - - + + + + + #{/SolrList}# + + - + +
Solr Resources
ClassTypeDescriptionStatisticsSize
#[class]##[type]##[description]##[statistics]##[size]##[class]##[type]##[description]##[statistics]##[size]#
Total Cache Count = #[SolrCacheCount]#Total Cache Count = #[SolrCacheCount]#
-

Table RAM Index:

- - - - - - - - - - - - - +
TableSizeKeyValue
Chunk SizeUsed MemoryChunk SizeUsed Memory
+ + + + + + + + + + + + + + + + #{EcoList}# - - - - - - + + + + + + #{/EcoList}# + + - + +
Table RAM Index
TableSizeKeyValue
Chunk SizeUsed MemoryChunk SizeUsed Memory
#[tableIndexPath]##[tableSize]##[tableKeyChunkSize]##[tableKeyMem]##[tableValueChunkSize]##[tableValueMem]##[tableIndexPath]##[tableSize]##[tableKeyChunkSize]##[tableKeyMem]##[tableValueChunkSize]##[tableValueMem]#
Total Mem = #[EcoIndexTotalMem]# MBTotal Mem = #[EcoIndexTotalMem]# MB
-

Object Index Caches:

- - - - - - - - - +
TableSizeChunk SizeNeeded MemoryUsed Memory
+ + + + + + + + + + + + #{indexcache}# - - - - - + + + + + #{/indexcache}# + + - + +
Object Index Caches
TableSizeChunk SizeNeeded MemoryUsed Memory
#[Name]##[Count]##[ChunkSize]##[NeededMem]##[UsedMem]##[Name]##[Count]##[ChunkSize]##[NeededMem]##[UsedMem]#
Total Mem: #[indexcacheTotalMem]# MBTotal Mem: #[indexcacheTotalMem]# MB
- - -

Other Caching Structures:

- - - - - - - - - +
TypeSizeHitMissInsertDelete
+ + + + + + + + + + + + - + @@ -235,7 +203,7 @@ - + @@ -243,7 +211,7 @@ - + @@ -251,7 +219,7 @@ - + @@ -259,13 +227,14 @@ - + +
Other Caching Structures
TypeSizeHitMissInsertDelete
DNSCache/HitDNSCache/Hit #[namecacheHit.size]# #[namecacheHit.Hit]# #[namecacheHit.Miss]#(ARC)
DNSCache/MissDNSCache/Miss #[namecacheMiss.size]# #[namecacheMiss.Hit]# #[namecacheMiss.Miss]#(ARC)
DNSNoCacheDNSNoCache #[namecache.noCache]#
HashBlacklistedCacheHashBlacklistedCache #[blacklistcache.size]#
Search Event CacheSearch Event Cache #[searchevent.size]# #[searchevent.hit]# #[searchevent.miss]# #[searchevent.insert]# #[searchevent.delete]#
#%env/templates/footer.template%# diff --git a/locales/cn.lng b/locales/cn.lng index 838303423..e1a47b9dd 100644 --- a/locales/cn.lng +++ b/locales/cn.lng @@ -1996,7 +1996,7 @@ Attributes==属性 #File: Performance_p.html #--------------------------- -== +== Performance Settings==性能设置 Memory Settings==内存设置 Memory reserved for JVM==JVM内存设置 @@ -2039,9 +2039,10 @@ Remote Search:==远端搜索: #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==内存性能设置 refresh graph==刷新图表 -Memory Usage:==内存使用: +Memory Usage==内存使用 After Startup==启动后 After Initializations==初始化后 before GC==GC前 @@ -2058,18 +2059,13 @@ total memory taken from the OS==操作系统分配内存 free memory in the JVM within total amount==JVM空闲内存 >Used<==>已用< used memory in the JVM within total amount==JVM已用内存 -#EcoTable RAM Index:==EcoTabelle RAM Index: -Table RAM Index:==Table使用内存: +Table RAM Index==Table使用内存 >Size==>大小 >Key==>关键字 >Value==>值 -#FlexTable RAM Index:==FlexTabelle RAM Index: -#Table==Table Chunk Size<==块大小< -#Count==Anzahl Used Memory<==已用内存< -#Node Caches:==Knoten Cache: -Object Index Caches:==Object索引缓存: +Object Index Caches==Object索引缓存 Needed Memory==所需内存大小 Object Read Caches==Object读缓存 @@ -2087,7 +2083,7 @@ MB (miss)==MB (丢失) Stop Grow when less than #[objectCacheStopGrow]# MB available left==可用内存低于 #[objectCacheStopGrow]# MB时停止增长 Start Shrink when less than #[objectCacheStartShrink]# MB availabe left==可用内存低于 #[objectCacheStartShrink]# MB开始减少 -Other Caching Structures:==其他缓存结构: +Other Caching Structures==其他缓存结构 Type==类型 >Hit<==>命中< >Miss<==>丢失< diff --git a/locales/de.lng b/locales/de.lng index 2827f5aca..d59b05bf2 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -2471,11 +2471,12 @@ Remote Search:==Remote Suche: #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==Performanceeinstellungen für Speicher refresh graph==Aktualisiere Diagramm simulate short memory status==Simuliere kurzen Speicherstatus use Standard Memory Strategy (current: #[memoryStrategy]#)==Verwende Standard Speicher-Strategie (Aktuell: #[memoryStrategy]#) -Memory Usage:==Speichernutzung: +Memory Usage==Speichernutzung After Startup==Nach Start After Initializations==Nach Initialisierungen before GC==vor GC @@ -2492,22 +2493,19 @@ total memory taken from the OS==gesamter vom Betriebssystem zugewiesener Speiche free memory in the JVM within total amount==freier Speicher in der JVM innerhalb des Gesamten Speichers >Used<==>Belegt< used memory in the JVM within total amount==genutzter Speicher in der JVM innerhalb des Gesamten Speichers -Solr Resources:==Solr Resourcen: +Solr Resources==Solr Resourcen >Class<==>Klasse< >Type<==>Typ< >Statistics<==>Statistiken< >Size<==>Größe< -#EcoTable RAM Index:==EcoTabelle RAM Index: -Table RAM Index:==Tabelle RAM Speicher Index: +Table RAM Index==Tabelle RAM Speicher Index >Key==>Schlüssel >Value==>Wert -#FlexTable RAM Index:==FlexTabelle RAM Index: Table==Tabelle Chunk Size<==Chunk Größe< #Count==Anzahl Used Memory<==Benutzter Speicher< -#Node Caches:==Knoten Cache: -Object Index Caches:==Objekt Index Caches: +Object Index Caches==Objekt Index Caches Needed Memory==Benötigter Speicher Object Read Caches==Objekt Lese Caches @@ -2525,7 +2523,7 @@ MB (miss)==MB (Verfehler) Stop Grow when less than #[objectCacheStopGrow]# MB available left==Beende Erweiterung wenn weniger als #[objectCacheStopGrow]# MB verfügbar sind Start Shrink when less than #[objectCacheStartShrink]# MB availabe left==Starte Verkleinerung wenn weniger als #[objectCacheStartShrink]# MB verfügbar sind -Other Caching Structures:==Andere Zwischenspeicher Strukturen: +Other Caching Structures==Andere Zwischenspeicher Strukturen >Hit<==>Treffer< >Miss<==>Verfehler< Insert<==Einfügen< diff --git a/locales/fr.lng b/locales/fr.lng index 2c94223e9..69a877e52 100644 --- a/locales/fr.lng +++ b/locales/fr.lng @@ -1543,8 +1543,9 @@ milliseconds==millisecondes #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==Paramètre de performance pour la mémoire -Memory Usage:==Utilisation mémoire +Memory Usage==Utilisation mémoire After Startup==Après démarrage After Initializations==Après initialisation before GC==avant GC @@ -1566,7 +1567,6 @@ Re-Configuration of Startup Paramenters:==Reconfiguration des paramètres Changes take effect after re-start of YaCy==Les modifications prendront effet après le redémarrage de YaCy RAM Cache for Database Files:==Cache RAM pour les fichiers de base de données: Chunk Size==Taille de bloc -#Slots== Memory Occupation==Occupation mémoire Needed
==Nécessaire
DB Size==Taille de la DB diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf index 64f3750dd..fad95cadf 100644 --- a/locales/master.lng.xlf +++ b/locales/master.lng.xlf @@ -6230,7 +6230,7 @@ use Standard Memory Strategy</label> (current: #[memoryStrategy]#) - Memory Usage: + Memory Usage After Startup @@ -6284,7 +6284,7 @@ used memory in the JVM within total amount - Solr Resources: + Solr Resources >Class< @@ -6299,7 +6299,7 @@ >Size< - Table RAM Index: + Table RAM Index >Key @@ -6317,7 +6317,7 @@ Used Memory< - Object Index Caches: + Object Index Caches Needed Memory @@ -6365,7 +6365,7 @@ Start Shrink when less than #[objectCacheStartShrink]# MB availabe left - Other Caching Structures: + Other Caching Structures >Hit< diff --git a/locales/ru.lng b/locales/ru.lng index 7635bfe7e..811b789bb 100644 --- a/locales/ru.lng +++ b/locales/ru.lng @@ -2577,11 +2577,12 @@ Remote Search:==Удалённый поиск: #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==Настройки производительности памяти refresh graph==Обновлять диаграмму simulate short memory status==Имитация состояния малого размера памяти use Standard Memory Strategy (current: #[memoryStrategy]#)==Использовать стратегию стандартного размера памяти (Текущая: #[memoryStrategy]#) -Memory Usage:==Использование памяти: +Memory Usage==Использование памяти After Startup==После запуска After Initializations==После инициализации before GC==до GC @@ -2599,22 +2600,19 @@ total memory taken from the OS==всего памяти, выделенной о free memory in the JVM within total amount==свободная память в Java без учёта всей памяти >Used<==>Используется< used memory in the JVM within total amount==используемая память в Java без учёта всей памяти -Solr Resources:==Ресурсы базы данных Solr: +Solr Resources==Ресурсы базы данных Solr >Class<==>Класс< >Type<==>Тип< >Statistics<==>Статистика< >Size<==>Размер< -#EcoTable RAM Index:==EcoTabelle RAM Index: -Table RAM Index:==Таблица индекса RAM: +Table RAM Index==Таблица индекса RAM >Key==>Ключ >Value==>Значение -#FlexTable RAM Index:==FlexTabelle RAM Index: Table==Таблица Chunk Size<==Размер части< #Count==Счёт Used Memory<==Использовано памяти< -#Node Caches:==Кэш нода: -Object Index Caches:==Кэш индекса объектов: +Object Index Caches==Кэш индекса объектов Needed Memory==Необходимо памяти Object Read Caches==Чтение кэшированных объектов @@ -2632,7 +2630,7 @@ MB (miss)==MB (попадания) Stop Grow when less than #[objectCacheStopGrow]# MB available left==Остановить рост при сокращении до #[objectCacheStopGrow]# MB из доступной Start Shrink when less than #[objectCacheStartShrink]# MB availabe left==Начать сжатие при сокращении до #[objectCacheStartShrink]# MB из доступной -Other Caching Structures:==Другие структуры кэша: +Other Caching Structures==Другие структуры кэша >Hit<==>Удары< >Miss<==>Попадания< Insert<==Вставлено< diff --git a/locales/sk.lng b/locales/sk.lng index d8afb3105..3d534d642 100644 --- a/locales/sk.lng +++ b/locales/sk.lng @@ -1174,8 +1174,9 @@ Maximum URLs currently assigned==Maximalny pocet prave priradenych URL adries #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==Nastavenia vykonu pamate -Memory Usage:==Vyuzitie pamate: +Memory Usage==Vyuzitie pamate After Startup==Po starte After Initializations==Po inicializacii before GC==pred GC diff --git a/locales/uk.lng b/locales/uk.lng index aa2634752..ee8c13d28 100644 --- a/locales/uk.lng +++ b/locales/uk.lng @@ -2212,9 +2212,10 @@ MByte==МБайт #File: PerformanceMemory_p.html #--------------------------- +== Performance Settings for Memory==Налаштування швидкодії для пам’яті