diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index b59a4413c..94de8d185 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -28,10 +28,13 @@ + basedir="../jsp/" excludes="web.xml, *.java, *.jsp, web-fragment.xml"> + + + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 9583aaff0..50ac4ca88 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -64,6 +64,17 @@ public class SummaryHelper { else return DataHelper.formatDuration(router.getUptime()); } + + + /** + * Retrieve amount of used memory. + * + */ + public String getMemory() { + long used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())/1024; + long usedPc = 100 - ((Runtime.getRuntime().freeMemory() * 100) / Runtime.getRuntime().totalMemory()); + return used + "KB (" + usedPc + "%)"; + } /** * How many active peers the router has. diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp index 64cda9550..c0d5103fa 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsp @@ -7,6 +7,7 @@ Ident:
Version:
Uptime:
+ Memory:

Peers