Changeset 6676

Timestamp:

Jan 12, 2015, 2:17:19 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1904: Display more memory usage details

File:

• branches/3.4-stable/www/info/about.jsp (modified) (3 diffs)

branches/3.4-stable/www/info/about.jsp

@@ -38 +38 @@
   import="java.sql.Driver"
   import="java.util.Properties"
+  import="java.util.List"
+  import="java.lang.management.ManagementFactory"
+  import="java.lang.management.MemoryPoolMXBean"
+  import="java.lang.management.MemoryUsage"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -63 +67 @@
 final Properties properties = System.getProperties();
 final Runtime runtime = Runtime.getRuntime();
-
+List<MemoryPoolMXBean> beans = ManagementFactory.getMemoryPoolMXBeans();
 %>
 <base:page type="popup" title="About">
-<base:head scripts="tabcontrol-2.js,~info.js" styles="tabcontrol.css" />
+<base:head scripts="tabcontrol-2.js,~info.js" styles="tabcontrol.css">
+<style>
+#memoryTable th, #memoryTable td
+{
+  text-align: right;
+  padding-left: 1em;
+  padding-right: 1.5em;
+}
+</style>
+</base:head>
 <base:body data-read-only="1">
   <h1>BASE - BioArray Software Environment</h1>
@@ -135 +148 @@
       </td>
   </tr>
-  <tr>
+  <tr class="dynamic">
     <th>Memory</th>
-    <td class="info">Total: <%=Values.formatBytes(runtime.totalMemory())%><br>
-      Free: <%=Values.formatBytes(runtime.freeMemory()) %><br>
-      Max: <%=Values.formatBytes(runtime.maxMemory()) %></td>
-  </tr>
-  <tr class="dynamic">
-    <th></th>
-    <td></td>
+    <td class="info">
+      
+      <table id="memoryTable" style="xwidth:100%;">
+      <tr style="border-bottom-width: 1px;">
+        <th>Region</th>
+        <th>Used</th>
+        <th>Max</th>
+        <th></th>
+      </tr>
+      <tr>
+        <td>Heap</td>
+        <td><%=Values.formatBytes(runtime.totalMemory()-runtime.freeMemory()) %></td>
+        <td><%=Values.formatBytes(runtime.maxMemory())%></td>
+        <td><%=100*(runtime.totalMemory()-runtime.freeMemory()) / runtime.maxMemory() %>%
+      </tr>
+      <%
+      for (MemoryPoolMXBean mbean : beans) 
+      {
+        MemoryUsage usage = mbean.getUsage();
+        %>
+        <tr>
+        <td><%=mbean.getName() %></td>
+        <td><%=Values.formatBytes(usage.getUsed()) %></td>
+        <td><%=Values.formatBytes(usage.getMax()) %></td>
+        <td><%=100*usage.getUsed() / usage.getMax() %>%
+        </tr>
+        <%
+      }
+      %>
+      </table>
   </tr>
   </table>