diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index d6e603ef8..e27c1bb6a 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -61,25 +61,25 @@ Total - #[memoryTotalAfterStartup]# KByte - #[memoryTotalAfterInitBGC]# KByte - #[memoryTotalAfterInitAGC]# KByte + #[memoryTotalAfterStartup]# MByte + #[memoryTotalAfterInitBGC]# MByte + #[memoryTotalAfterInitAGC]# MByte #[memoryTotalNow]# MByte total memory taken from the OS Free - #[memoryFreeAfterStartup]# KByte - #[memoryFreeAfterInitBGC]# KByte - #[memoryFreeAfterInitAGC]# KByte + #[memoryFreeAfterStartup]# MByte + #[memoryFreeAfterInitBGC]# MByte + #[memoryFreeAfterInitAGC]# MByte #[memoryFreeNow]# MByte free memory in the JVM within total amount Used - #[memoryUsedAfterStartup]# KByte - #[memoryUsedAfterInitBGC]# KByte - #[memoryUsedAfterInitAGC]# KByte + #[memoryUsedAfterStartup]# MByte + #[memoryUsedAfterInitBGC]# MByte + #[memoryUsedAfterInitAGC]# MByte #[memoryUsedNow]# MByte used memory in the JVM within total amount diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 3f9dc6b09..b5619ecab 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -90,17 +90,17 @@ public class PerformanceMemory_p { prop.putNum("memoryAvailAfterInitBGC", (MemoryControl.maxMemory() - memoryTotalAfterInitBGC + memoryFreeAfterInitBGC) / MB); prop.putNum("memoryAvailAfterInitAGC", (MemoryControl.maxMemory() - memoryTotalAfterInitAGC + memoryFreeAfterInitAGC) / MB); prop.putNum("memoryAvailNow", MemoryControl.available() / MB); - prop.putNum("memoryTotalAfterStartup", memoryTotalAfterStartup / KB); - prop.putNum("memoryTotalAfterInitBGC", memoryTotalAfterInitBGC / KB); - prop.putNum("memoryTotalAfterInitAGC", memoryTotalAfterInitAGC / KB); + prop.putNum("memoryTotalAfterStartup", memoryTotalAfterStartup / MB); + prop.putNum("memoryTotalAfterInitBGC", memoryTotalAfterInitBGC / MB); + prop.putNum("memoryTotalAfterInitAGC", memoryTotalAfterInitAGC / MB); prop.putNum("memoryTotalNow", MemoryControl.total() / MB); - prop.putNum("memoryFreeAfterStartup", memoryFreeAfterStartup / KB); - prop.putNum("memoryFreeAfterInitBGC", memoryFreeAfterInitBGC / KB); - prop.putNum("memoryFreeAfterInitAGC", memoryFreeAfterInitAGC / KB); + prop.putNum("memoryFreeAfterStartup", memoryFreeAfterStartup / MB); + prop.putNum("memoryFreeAfterInitBGC", memoryFreeAfterInitBGC / MB); + prop.putNum("memoryFreeAfterInitAGC", memoryFreeAfterInitAGC / MB); prop.putNum("memoryFreeNow", MemoryControl.free() / MB); - prop.putNum("memoryUsedAfterStartup", (memoryTotalAfterStartup - memoryFreeAfterStartup) / KB); - prop.putNum("memoryUsedAfterInitBGC", (memoryTotalAfterInitBGC - memoryFreeAfterInitBGC) / KB); - prop.putNum("memoryUsedAfterInitAGC", (memoryTotalAfterInitAGC - memoryFreeAfterInitAGC) / KB); + prop.putNum("memoryUsedAfterStartup", (memoryTotalAfterStartup - memoryFreeAfterStartup) / MB); + prop.putNum("memoryUsedAfterInitBGC", (memoryTotalAfterInitBGC - memoryFreeAfterInitBGC) / MB); + prop.putNum("memoryUsedAfterInitAGC", (memoryTotalAfterInitAGC - memoryFreeAfterInitAGC) / MB); prop.putNum("memoryUsedNow", MemoryControl.used() / MB);