showing MB instead of KB in PerformanceMemory

pull/390/head
Michael Peter Christen 4 years ago
parent 3431f91db9
commit d7b2d82faa

@ -61,25 +61,25 @@
</tr> </tr>
<tr class="TableCellLight"> <tr class="TableCellLight">
<th scope="row" class="TableCellDark" style="text-align:left;">Total</th> <th scope="row" class="TableCellDark" style="text-align:left;">Total</th>
<td style="text-align:right;">#[memoryTotalAfterStartup]# KByte</td> <td style="text-align:right;">#[memoryTotalAfterStartup]# MByte</td>
<td style="text-align:right;">#[memoryTotalAfterInitBGC]# KByte</td> <td style="text-align:right;">#[memoryTotalAfterInitBGC]# MByte</td>
<td style="text-align:right;">#[memoryTotalAfterInitAGC]# KByte</td> <td style="text-align:right;">#[memoryTotalAfterInitAGC]# MByte</td>
<td style="text-align:right;">#[memoryTotalNow]# MByte</td> <td style="text-align:right;">#[memoryTotalNow]# MByte</td>
<td style="text-align:left;">total memory taken from the OS</td> <td style="text-align:left;">total memory taken from the OS</td>
</tr> </tr>
<tr class="TableCellLight"> <tr class="TableCellLight">
<th scope="row" class="TableCellDark" style="text-align:left;">Free</th> <th scope="row" class="TableCellDark" style="text-align:left;">Free</th>
<td style="text-align:right;">#[memoryFreeAfterStartup]# KByte</td> <td style="text-align:right;">#[memoryFreeAfterStartup]# MByte</td>
<td style="text-align:right;">#[memoryFreeAfterInitBGC]# KByte</td> <td style="text-align:right;">#[memoryFreeAfterInitBGC]# MByte</td>
<td style="text-align:right;">#[memoryFreeAfterInitAGC]# KByte</td> <td style="text-align:right;">#[memoryFreeAfterInitAGC]# MByte</td>
<td style="text-align:right;">#[memoryFreeNow]# MByte</td> <td style="text-align:right;">#[memoryFreeNow]# MByte</td>
<td style="text-align:left;">free memory in the JVM within total amount</td> <td style="text-align:left;">free memory in the JVM within total amount</td>
</tr> </tr>
<tr class="TableCellLight"> <tr class="TableCellLight">
<th scope="row" class="TableCellDark" style="text-align:left;">Used</th> <th scope="row" class="TableCellDark" style="text-align:left;">Used</th>
<td style="text-align:right;">#[memoryUsedAfterStartup]# KByte</td> <td style="text-align:right;">#[memoryUsedAfterStartup]# MByte</td>
<td style="text-align:right;">#[memoryUsedAfterInitBGC]# KByte</td> <td style="text-align:right;">#[memoryUsedAfterInitBGC]# MByte</td>
<td style="text-align:right;">#[memoryUsedAfterInitAGC]# KByte</td> <td style="text-align:right;">#[memoryUsedAfterInitAGC]# MByte</td>
<td style="text-align:right;">#[memoryUsedNow]# MByte</td> <td style="text-align:right;">#[memoryUsedNow]# MByte</td>
<td style="text-align:left;">used memory in the JVM within total amount</td> <td style="text-align:left;">used memory in the JVM within total amount</td>
</tr> </tr>

@ -90,17 +90,17 @@ public class PerformanceMemory_p {
prop.putNum("memoryAvailAfterInitBGC", (MemoryControl.maxMemory() - memoryTotalAfterInitBGC + memoryFreeAfterInitBGC) / MB); prop.putNum("memoryAvailAfterInitBGC", (MemoryControl.maxMemory() - memoryTotalAfterInitBGC + memoryFreeAfterInitBGC) / MB);
prop.putNum("memoryAvailAfterInitAGC", (MemoryControl.maxMemory() - memoryTotalAfterInitAGC + memoryFreeAfterInitAGC) / MB); prop.putNum("memoryAvailAfterInitAGC", (MemoryControl.maxMemory() - memoryTotalAfterInitAGC + memoryFreeAfterInitAGC) / MB);
prop.putNum("memoryAvailNow", MemoryControl.available() / MB); prop.putNum("memoryAvailNow", MemoryControl.available() / MB);
prop.putNum("memoryTotalAfterStartup", memoryTotalAfterStartup / KB); prop.putNum("memoryTotalAfterStartup", memoryTotalAfterStartup / MB);
prop.putNum("memoryTotalAfterInitBGC", memoryTotalAfterInitBGC / KB); prop.putNum("memoryTotalAfterInitBGC", memoryTotalAfterInitBGC / MB);
prop.putNum("memoryTotalAfterInitAGC", memoryTotalAfterInitAGC / KB); prop.putNum("memoryTotalAfterInitAGC", memoryTotalAfterInitAGC / MB);
prop.putNum("memoryTotalNow", MemoryControl.total() / MB); prop.putNum("memoryTotalNow", MemoryControl.total() / MB);
prop.putNum("memoryFreeAfterStartup", memoryFreeAfterStartup / KB); prop.putNum("memoryFreeAfterStartup", memoryFreeAfterStartup / MB);
prop.putNum("memoryFreeAfterInitBGC", memoryFreeAfterInitBGC / KB); prop.putNum("memoryFreeAfterInitBGC", memoryFreeAfterInitBGC / MB);
prop.putNum("memoryFreeAfterInitAGC", memoryFreeAfterInitAGC / KB); prop.putNum("memoryFreeAfterInitAGC", memoryFreeAfterInitAGC / MB);
prop.putNum("memoryFreeNow", MemoryControl.free() / MB); prop.putNum("memoryFreeNow", MemoryControl.free() / MB);
prop.putNum("memoryUsedAfterStartup", (memoryTotalAfterStartup - memoryFreeAfterStartup) / KB); prop.putNum("memoryUsedAfterStartup", (memoryTotalAfterStartup - memoryFreeAfterStartup) / MB);
prop.putNum("memoryUsedAfterInitBGC", (memoryTotalAfterInitBGC - memoryFreeAfterInitBGC) / KB); prop.putNum("memoryUsedAfterInitBGC", (memoryTotalAfterInitBGC - memoryFreeAfterInitBGC) / MB);
prop.putNum("memoryUsedAfterInitAGC", (memoryTotalAfterInitAGC - memoryFreeAfterInitAGC) / KB); prop.putNum("memoryUsedAfterInitAGC", (memoryTotalAfterInitAGC - memoryFreeAfterInitAGC) / MB);
prop.putNum("memoryUsedNow", MemoryControl.used() / MB); prop.putNum("memoryUsedNow", MemoryControl.used() / MB);

Loading…
Cancel
Save