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: Use Rate instead of instantaneous value for used memory

Browse Source
This commit is contained in:
zzz
2017-11-09 17:39:14 +00:00
parent f060287df8
commit 8212d68c41
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,9 +300,15 @@ public class SummaryHelper extends HelperBase {
public String getMemory() { public String getMemory() {
DecimalFormat integerFormatter = new DecimalFormat("###,###,##0"); DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
long tot = SystemVersion.getMaxMemory(); long tot = SystemVersion.getMaxMemory();
long free = Runtime.getRuntime().freeMemory(); // This reads much higher than the graph, possibly because it's right in
long used = (tot - free) / (1024*1024); // the middle of a console refresh... so get it from the Rate instead.
//long usedPc = 100 - ((free * 100) / tot); //long free = Runtime.getRuntime().freeMemory();
long used = (long) _context.statManager().getRate("router.memoryUsed").getRate(60*1000).getAvgOrLifetimeAvg();
if (used <= 0) {
long free = Runtime.getRuntime().freeMemory();
used = tot - free;
}
used /= 1024*1024;
long total = tot / (1024*1024); 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 + "%)";
@ -314,9 +320,19 @@ public class SummaryHelper extends HelperBase {
public String getMemoryBar() { public String getMemoryBar() {
DecimalFormat integerFormatter = new DecimalFormat("###,###,##0"); DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
long tot = SystemVersion.getMaxMemory(); long tot = SystemVersion.getMaxMemory();
long free = Runtime.getRuntime().freeMemory(); // This reads much higher than the graph, possibly because it's right in
long used = (tot - free) / (1024*1024); // the middle of a console refresh... so get it from the Rate instead.
long usedPc = 100 - ((free * 100) / tot); //long free = Runtime.getRuntime().freeMemory();
long used = (long) _context.statManager().getRate("router.memoryUsed").getRate(60*1000).getAvgOrLifetimeAvg();
long usedPc;
if (used <= 0) {
long free = Runtime.getRuntime().freeMemory();
usedPc = 100 - ((free * 100) / tot);
used = (tot - free) / (1024*1024);
} else {
usedPc = used * 100 / tot;
used /= 1024*1024;
}
long total = tot / (1024*1024); 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 + "%)";