Changeset 6678

Timestamp:

Jan 13, 2015, 11:16:57 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1904: Display more memory usage details

Groups display in heap and non-heap memory and display a warning if a region has used more than 50% of it's available memory.

File:

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

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

@@ -41 +41 @@
   import="java.lang.management.ManagementFactory"
   import="java.lang.management.MemoryPoolMXBean"
+  import="java.lang.management.MemoryType"
   import="java.lang.management.MemoryUsage"
 %>
@@ -77 +78 @@
   padding-left: 1em;
   padding-right: 1.5em;
+}
+
+.memory-warning
+{
+  color: #C80000;
+  font-weight: bold;
+  background-image: url('../images/warning_small.png');
+  background-repeat: no-repeat;
+  background-position: 100% 50%;
 }
 </style>
@@ -154 +164 @@
       <table id="memoryTable" style="xwidth:100%;">
       <tr style="border-bottom-width: 1px;">
-        <th>Region</th>
+        <th></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) 
+      for (MemoryType mtype : MemoryType.values())
       {
-        MemoryUsage usage = mbean.getUsage();
+        long sumUsed = 0;
+        long sumMax = 0;
+        for (MemoryPoolMXBean mbean : beans) 
+        {
+          if (mbean.getType() == mtype)
+          {
+            MemoryUsage usage = mbean.getUsage();
+            sumUsed += usage.getUsed();
+            sumMax += usage.getMax();
+            long percent = 100*usage.getUsed() / usage.getMax();
+            %>
+            <tr>
+            <td><%=mbean.getName() %></td>
+            <td><%=Values.formatBytes(usage.getUsed()) %></td>
+            <td><%=Values.formatBytes(usage.getMax()) %></td>
+            <td class="<%=percent > 50 ? "memory-warning" : "" %>"><%=percent %>%</td>
+            </tr>
+          <%
+          }
+        }
         %>
-        <tr>
-        <td><%=mbean.getName() %></td>
-        <td><%=Values.formatBytes(usage.getUsed()) %></td>
-        <td><%=Values.formatBytes(usage.getMax()) %></td>
-        <td><%=100*usage.getUsed() / usage.getMax() %>%
+        <tr style="border-bottom-width: 1px; xborder-top-width: 1px; font-weight: bold;" class="xbg-filled-100">
+          <td>Sum <%=mtype.toString() %></td>
+          <td><%=Values.formatBytes(sumUsed) %></td>
+          <td><%=Values.formatBytes(sumMax) %></td>
+          <td><%=100*sumUsed / sumMax %>%</td>
         </tr>
         <%
       }
       %>
+      
       </table>
   </tr>