You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/04/23 15:57:17 UTC
svn commit: r1470964 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java
webapp/root/job.details.table.processes.jsp
Author: degenaro
Date: Tue Apr 23 13:57:17 2013
New Revision: 1470964
URL: http://svn.apache.org/r1470964
Log: (empty)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1470964&r1=1470963&r2=1470964&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Tue Apr 23 13:57:17 2013
@@ -609,6 +609,7 @@ public class DuccHandler extends DuccAbs
sb.append("<td align=\"right\">");
sb.append(displayGC);
sb.append("</td>");
+ /*
// Count:gc
long countGC = 0;
try {
@@ -619,6 +620,7 @@ public class DuccHandler extends DuccAbs
sb.append("<td align=\"right\">");
sb.append(countGC);
sb.append("</td>");
+
// %gc
double pctGC = 0;
double timeTotal = timeInitMillis + timeRunMillis;
@@ -630,6 +632,37 @@ public class DuccHandler extends DuccAbs
sb.append("<td align=\"right\">");
sb.append(formatter.format(pctGC));
sb.append("</td>");
+ */
+ // PgIn
+ long faults = 0;
+ try {
+ faults = process.getMajorFaults();
+ }
+ catch(Exception e) {
+ }
+ sb.append("<td align=\"right\">");
+ sb.append(faults);
+ sb.append("</td>");
+ // Swap
+ if(process.isComplete()) {
+ double swap = process.getSwapUsageMax();
+ swap = swap/GB;
+ String displaySwap = formatter.format(swap);
+ sb.append("<td align=\"right\" "+">");
+ sb.append(displaySwap);
+ sb.append("</td>");
+ }
+ else {
+ double swap = process.getSwapUsage();
+ swap = swap/GB;
+ String displaySwap = formatter.format(swap);
+ double swapMax = process.getSwapUsageMax();
+ swapMax = swapMax/GB;
+ String displaySwapMax = formatter.format(swapMax);
+ sb.append("<td title=\"max="+displaySwapMax+"\" align=\"right\" "+">");
+ sb.append(displaySwap);
+ sb.append("</td>");
+ }
}
/*
// Time:cpu
@@ -670,14 +703,25 @@ public class DuccHandler extends DuccAbs
sb.append(displayPctRss);
sb.append("</td>");
*/
-
- double rss = process.getResidentMemory();
- rss = rss/GB;
- String displayRss = formatter.format(rss);
- sb.append("<td align=\"right\" "+">");
- sb.append(displayRss);
- sb.append("</td>");
-
+ if(process.isComplete()) {
+ double rss = process.getResidentMemoryMax();
+ rss = rss/GB;
+ String displayRss = formatter.format(rss);
+ sb.append("<td align=\"right\" "+">");
+ sb.append(displayRss);
+ sb.append("</td>");
+ }
+ else {
+ double rss = process.getResidentMemory();
+ rss = rss/GB;
+ String displayRss = formatter.format(rss);
+ double rssMax = process.getResidentMemoryMax();
+ rssMax = rssMax/GB;
+ String displayRssMax = formatter.format(rssMax);
+ sb.append("<td title=\"max="+displayRssMax+"\" align=\"right\" "+">");
+ sb.append(displayRss);
+ sb.append("</td>");
+ }
if(type.equals("SP")) {
//
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp?rev=1470964&r1=1470963&r2=1470964&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp Tue Apr 23 13:57:17 2013
@@ -38,8 +38,12 @@ under the License.
<th title="Process initialization time, hh:mm:ss, as reported by the agent managing the process. The agent reports initialization start and end times. The time reported here is the difference between them, unless initialization is ongoing then the end time is estimated as now.">Time<br>Init</th>
<th title="Process run time (not including process initialization time), hh:mm:ss, as reported by the agent managing the process. The agent reports run start and end times. The time reported here is the difference between them, unless the process is still running then the end time is estimated as now.">Time<br>Run</th>
<th title="Process total time spent performing garbage collections, hh:mm:ss">Time<br>GC</th>
+ <!--
<th title="Process total number of garbage collections that have occurred">Count<br>GC</th>
<th title="Process percentage of time spent in garbage collections, relative to total of initialization + run times">%GC</th>
+ -->
+ <th title="Process count of major faults which required loading a memory page from disk">PgIn</th>
+ <th title="Process GB swapped out to disk, current if state=running or maximum if state=completed">Swap</th>
<!--
<th title="Cumulative CPU time, hh:mm:ss">CPU</th>
-->