integrated oOo's memory usage patch (the % shown is unfortunately % of peak, not % of max) [thanks oOo!]

cleaned up build script to make sure we always build fresh JSPs and xml [thanks oOo^2!]
This commit is contained in:
jrandom
2004-08-11 22:23:48 +00:00
committed by zzz
parent d524c77560
commit 2f28a635a9
3 changed files with 16 additions and 1 deletions

View File

@ -28,10 +28,13 @@
</target> </target>
<target name="war" depends="precompilejsp"> <target name="war" depends="precompilejsp">
<war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml" <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
basedir="../jsp/" excludes="web.xml, *.java, *.jsp"> basedir="../jsp/" excludes="web.xml, *.java, *.jsp, web-fragment.xml">
</war> </war>
</target> </target>
<target name="precompilejsp"> <target name="precompilejsp">
<delete dir="../jsp/WEB-INF/" />
<delete dir="../jsp/web-fragment.xml" />
<delete dir="../jsp/web-out.xml" />
<mkdir dir="../jsp/WEB-INF/" /> <mkdir dir="../jsp/WEB-INF/" />
<mkdir dir="../jsp/WEB-INF/classes" /> <mkdir dir="../jsp/WEB-INF/classes" />
<!-- there are various jspc ant tasks, but they all seem a bit flakey --> <!-- there are various jspc ant tasks, but they all seem a bit flakey -->

View File

@ -64,6 +64,17 @@ public class SummaryHelper {
else else
return DataHelper.formatDuration(router.getUptime()); 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. * How many active peers the router has.

View File

@ -7,6 +7,7 @@
<b>Ident:</b> <jsp:getProperty name="helper" property="ident" /><br /> <b>Ident:</b> <jsp:getProperty name="helper" property="ident" /><br />
<b>Version:</b> <jsp:getProperty name="helper" property="version" /><br /> <b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
<b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br /> <b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
<b>Memory:</b> <jsp:getProperty name="helper" property="memory" /><br />
<hr /> <hr />
<u><b>Peers</b></u><br /> <u><b>Peers</b></u><br />