echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Summary Bar: Fix max memory value

Browse Source
This commit is contained in:
zzz
2017-11-09 13:08:05 +00:00
parent 1fbf188d61
commit f060287df8
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -27,6 +27,7 @@ import net.i2p.router.transport.TransportUtil;
import net.i2p.stat.Rate; import net.i2p.stat.Rate;
import net.i2p.stat.RateStat; import net.i2p.stat.RateStat;
import net.i2p.util.PortMapper; import net.i2p.util.PortMapper;
import net.i2p.util.SystemVersion;
/** /**
* Simple helper to query the appropriate router for data necessary to render * Simple helper to query the appropriate router for data necessary to render
@ -298,9 +299,11 @@ public class SummaryHelper extends HelperBase {
*/ */
public String getMemory() { public String getMemory() {
DecimalFormat integerFormatter = new DecimalFormat("###,###,##0"); DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
long used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())/1024/1024; long tot = SystemVersion.getMaxMemory();
long usedPc = 100 - ((Runtime.getRuntime().freeMemory() * 100) / Runtime.getRuntime().totalMemory()); long free = Runtime.getRuntime().freeMemory();
long total = (Runtime.getRuntime().totalMemory())/1024/1024; long used = (tot - free) / (1024*1024);
//long usedPc = 100 - ((free * 100) / tot);
long total = tot / (1024*1024);
// long free = Runtime.getRuntime().freeMemory()/1024/1024; // long free = Runtime.getRuntime().freeMemory()/1024/1024;
// return integerFormatter.format(used) + "MB (" + usedPc + "%)"; // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
// return integerFormatter.format(used) + "MB / " + free + " MB"; // return integerFormatter.format(used) + "MB / " + free + " MB";
@ -310,13 +313,16 @@ public class SummaryHelper extends HelperBase {
/** @since 0.9.32 */ /** @since 0.9.32 */
public String getMemoryBar() { public String getMemoryBar() {
DecimalFormat integerFormatter = new DecimalFormat("###,###,##0"); DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
long used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())/1024/1024; long tot = SystemVersion.getMaxMemory();
long usedPc = 100 - ((Runtime.getRuntime().freeMemory() * 100) / Runtime.getRuntime().totalMemory()); long free = Runtime.getRuntime().freeMemory();
long total = (Runtime.getRuntime().totalMemory())/1024/1024; long used = (tot - free) / (1024*1024);
long usedPc = 100 - ((free * 100) / tot);
long total = tot / (1024*1024);
// long free = Runtime.getRuntime().freeMemory()/1024/1024; // long free = Runtime.getRuntime().freeMemory()/1024/1024;
// return integerFormatter.format(used) + "MB (" + usedPc + "%)"; // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
// return integerFormatter.format(used) + "MB / " + free + " MB"; // return integerFormatter.format(used) + "MB / " + free + " MB";
return "<div class=\"percentBarOuter\" id=\"sb_memoryBar\"><div class=\"percentBarText\">RAM: " + integerFormatter.format(used) + " / " + total + "MB" + return "<div class=\"percentBarOuter\" id=\"sb_memoryBar\"><div class=\"percentBarText\">RAM: " +
integerFormatter.format(used) + " / " + total + " MB" +
"</div><div class=\"percentBarInner\" style=\"width: " + integerFormatter.format(usedPc) + "</div><div class=\"percentBarInner\" style=\"width: " + integerFormatter.format(usedPc) +
"%;\"></div></div>"; "%;\"></div></div>";
} }