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/05/03 20:40:19 UTC
svn commit: r1478912 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/
uima-ducc-web/src/main/java/org/apache/uima/ducc/w...
Author: degenaro
Date: Fri May 3 18:40:17 2013
New Revision: 1478912
URL: http://svn.apache.org/r1478912
Log: (empty)
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/Constants.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java
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/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/Constants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/Constants.java?rev=1478912&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/Constants.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/Constants.java Fri May 3 18:40:17 2013
@@ -0,0 +1,7 @@
+package org.apache.uima.ducc.transport;
+
+public class Constants {
+ public static long KB = 1024;
+ public static long MB = 1024*KB;
+ public static long GB = 1024*MB;
+}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java Fri May 3 18:40:17 2013
@@ -27,6 +27,7 @@ import org.apache.commons.lang.Serializa
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.transport.Constants;
import org.apache.uima.ducc.transport.event.common.IDuccProcess.ReasonForStoppingProcess;
import org.apache.uima.ducc.transport.event.common.IProcessState.ProcessState;
@@ -301,5 +302,43 @@ public class DuccProcessMap extends Tree
ArrayList<DuccId> list = getFailedNotInitialization();
return list.size();
}
-
+
+ public long getPgInCount() {
+ long retVal = 0;
+ synchronized(this) {
+ Iterator<IDuccProcess> iterator = this.values().iterator();
+ while(iterator.hasNext()) {
+ IDuccProcess process = iterator.next();
+ retVal += process.getMajorFaults();
+ }
+ }
+ return retVal;
+ }
+
+ public double getSwapUsageGb() {
+ double retVal = 0;
+ synchronized(this) {
+ Iterator<IDuccProcess> iterator = this.values().iterator();
+ while(iterator.hasNext()) {
+ IDuccProcess process = iterator.next();
+ double swap = process.getSwapUsage();
+ retVal += swap/Constants.GB;
+ }
+ }
+ return retVal;
+ }
+
+ public double getSwapUsageGbMax() {
+ double retVal = 0;
+ synchronized(this) {
+ Iterator<IDuccProcess> iterator = this.values().iterator();
+ while(iterator.hasNext()) {
+ IDuccProcess process = iterator.next();
+ double swap = process.getSwapUsageMax();
+ retVal += swap/Constants.GB;
+ }
+ }
+ return retVal;
+ }
+
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java Fri May 3 18:40:17 2013
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.transport.Constants;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
@@ -371,6 +372,52 @@ public class DuccWorkJob extends ADuccWo
return (getAliveProcessCount() > 0);
}
+ public long getPgInCount() {
+ long retVal = 0;
+ IDuccProcessMap map = getProcessMap();
+ if(map != null) {
+ retVal += map.getPgInCount();
+ }
+ DuccWorkPopDriver driver = getDriver();
+ if(driver != null) {
+ map = driver.getProcessMap();
+ retVal += map.getPgInCount();
+ }
+ return retVal;
+ }
+
+ public double getSwapUsageGb() {
+ double retVal = 0;
+ IDuccProcessMap map = getProcessMap();
+ if(map != null) {
+ double swap = map.getSwapUsageGb();
+ retVal += swap/Constants.GB;
+ }
+ DuccWorkPopDriver driver = getDriver();
+ if(driver != null) {
+ map = driver.getProcessMap();
+ double swap = map.getSwapUsageGb();
+ retVal += swap/Constants.GB;
+ }
+ return retVal;
+ }
+
+ public double getSwapUsageGbMax() {
+ long retVal = 0;
+ IDuccProcessMap map = getProcessMap();
+ if(map != null) {
+ double swap = map.getSwapUsageGbMax();
+ retVal += swap/Constants.GB;
+ }
+ DuccWorkPopDriver driver = getDriver();
+ if(driver != null) {
+ map = driver.getProcessMap();
+ double swap = map.getSwapUsageGbMax();
+ retVal += swap/Constants.GB;
+ }
+ return retVal;
+ }
+
// **********
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java Fri May 3 18:40:17 2013
@@ -46,4 +46,8 @@ public interface IDuccProcessMap extends
public Map<DuccId,IDuccProcess> getMap();
public IDuccProcessMap deepCopy();
+
+ public long getPgInCount();
+ public double getSwapUsageGb();
+ public double getSwapUsageGbMax();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java Fri May 3 18:40:17 2013
@@ -74,4 +74,8 @@ public interface IDuccWorkJob extends ID
public long getAliveProcessCount();
public boolean hasAliveProcess();
+
+ public long getPgInCount();
+ public double getSwapUsageGb();
+ public double getSwapUsageGbMax();
}
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=1478912&r1=1478911&r2=1478912&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 Fri May 3 18:40:17 2013
@@ -61,6 +61,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.Version;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.authentication.DuccWebAdministrators;
+import org.apache.uima.ducc.transport.Constants;
import org.apache.uima.ducc.transport.agent.IUimaPipelineAEComponent;
import org.apache.uima.ducc.transport.event.ProcessInfo;
import org.apache.uima.ducc.transport.event.cli.SpecificationProperties;
@@ -319,10 +320,6 @@ public class DuccHandler extends DuccAbs
return retVal;
}
- private double KB = 1000;
- private double MB = 1000*KB;
- private double GB = 1000*MB;
-
DecimalFormat sizeFormatter = new DecimalFormat("##0.00");
private boolean fileExists(String fileName) {
@@ -344,7 +341,7 @@ public class DuccHandler extends DuccAbs
try {
File file = new File(fileName);
double size = file.length();
- size = size / MB;
+ size = size / Constants.MB;
retVal = sizeFormatter.format(size);
}
catch(Exception e) {
@@ -645,7 +642,7 @@ public class DuccHandler extends DuccAbs
// Swap
if(process.isComplete()) {
double swap = process.getSwapUsageMax();
- swap = swap/GB;
+ swap = swap/Constants.GB;
String displaySwap = formatter.format(swap);
sb.append("<td align=\"right\" "+">");
sb.append(displaySwap);
@@ -653,10 +650,10 @@ public class DuccHandler extends DuccAbs
}
else {
double swap = process.getSwapUsage();
- swap = swap/GB;
+ swap = swap/Constants.GB;
String displaySwap = formatter.format(swap);
double swapMax = process.getSwapUsageMax();
- swapMax = swapMax/GB;
+ swapMax = swapMax/Constants.GB;
String displaySwapMax = formatter.format(swapMax);
sb.append("<td title=\"max="+displaySwapMax+"\" align=\"right\" "+">");
sb.append(displaySwap);
@@ -704,7 +701,7 @@ public class DuccHandler extends DuccAbs
*/
if(process.isComplete()) {
double rss = process.getResidentMemoryMax();
- rss = rss/GB;
+ rss = rss/Constants.GB;
String displayRss = formatter.format(rss);
sb.append("<td align=\"right\" "+">");
sb.append(displayRss);
@@ -712,10 +709,10 @@ public class DuccHandler extends DuccAbs
}
else {
double rss = process.getResidentMemory();
- rss = rss/GB;
+ rss = rss/Constants.GB;
String displayRss = formatter.format(rss);
double rssMax = process.getResidentMemoryMax();
- rssMax = rssMax/GB;
+ rssMax = rssMax/Constants.GB;
String displayRssMax = formatter.format(rssMax);
sb.append("<td title=\"max="+displayRssMax+"\" align=\"right\" "+">");
sb.append(displayRss);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri May 3 18:40:17 2013
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.ws.server;
import java.io.File;
import java.io.IOException;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -56,13 +57,13 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
import org.apache.uima.ducc.transport.event.common.DuccWorkReservation;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
+import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
+import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccReservation;
import org.apache.uima.ducc.transport.event.common.IDuccReservationMap;
import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
-import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
-import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IRationale;
@@ -73,7 +74,6 @@ import org.apache.uima.ducc.ws.DuccMachi
import org.apache.uima.ducc.ws.Info;
import org.apache.uima.ducc.ws.JobInfo;
import org.apache.uima.ducc.ws.MachineInfo;
-import org.apache.uima.ducc.ws.PagingObserver;
import org.apache.uima.ducc.ws.ReservationInfo;
import org.apache.uima.ducc.ws.registry.IServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistry;
@@ -92,7 +92,7 @@ public class DuccHandlerJsonFormat exten
private static Messages messages = Messages.getInstance();
private static DuccId jobid = null;
- private static PagingObserver pagingObserver = PagingObserver.getInstance();
+ //private static PagingObserver pagingObserver = PagingObserver.getInstance();
private final String jsonFormatJobsAaData = duccContextJsonFormat+"-aaData-jobs";
private final String jsonFormatReservationsAaData = duccContextJsonFormat+"-aaData-reservations";
@@ -119,6 +119,7 @@ public class DuccHandlerJsonFormat exten
sb = new StringBuffer();
if(job.isOperational()) {
boolean multi = false;
+ /*
sb.append("<span>");
if(pagingObserver.isPaging(job)) {
multi = true;
@@ -128,6 +129,7 @@ public class DuccHandlerJsonFormat exten
sb.append("</span>");
}
sb.append("</span>");
+ */
//
String monitor = getMonitor(duccId, type, multi);
if(monitor.length() > 0) {
@@ -294,6 +296,25 @@ public class DuccHandlerJsonFormat exten
sb.append(buildRuntimeFailuresLink(job));
sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
+ // Pgin
+ sb = new StringBuffer();
+ sb.append("<span>");
+ long pgin = job.getPgInCount();
+ sb.append(""+pgin);
+ sb.append("</span>");
+ row.add(new JsonPrimitive(sb.toString()));
+ // Swap
+ DecimalFormat formatter = new DecimalFormat("##0.0");
+ sb = new StringBuffer();
+ sb.append("<span>");
+ double swap = job.getSwapUsageGbMax();
+ if(job.isCompleted()) {
+ swap = job.getSwapUsageGbMax();
+ }
+ String displaySwapMax = formatter.format(swap);
+ sb.append(displaySwapMax);
+ sb.append("</span>");
+ row.add(new JsonPrimitive(sb.toString()));
// Size
sb = new StringBuffer();
sb.append("<span>");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java Fri May 3 18:40:17 2013
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.ws.server;
import java.io.File;
import java.io.IOException;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -48,12 +49,12 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
import org.apache.uima.ducc.transport.event.common.DuccWorkReservation;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
+import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
+import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccReservation;
import org.apache.uima.ducc.transport.event.common.IDuccReservationMap;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
-import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
-import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IRationale;
@@ -64,7 +65,6 @@ import org.apache.uima.ducc.ws.DuccMachi
import org.apache.uima.ducc.ws.Info;
import org.apache.uima.ducc.ws.JobInfo;
import org.apache.uima.ducc.ws.MachineInfo;
-import org.apache.uima.ducc.ws.PagingObserver;
import org.apache.uima.ducc.ws.registry.IServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistryMap;
@@ -79,7 +79,7 @@ public class DuccHandlerLegacy extends D
private static Messages messages = Messages.getInstance();
private static DuccId jobid = null;
- private static PagingObserver pagingObserver = PagingObserver.getInstance();
+ //private static PagingObserver pagingObserver = PagingObserver.getInstance();
public final String legacyJobs = duccContextLegacy+"-jobs-data";
public final String legacyReservations = duccContextLegacy+"-reservations-data";
@@ -102,6 +102,7 @@ public class DuccHandlerLegacy extends D
DuccId duccId = job.getDuccId();
if(job.isOperational()) {
boolean multi = false;
+ /*
sb.append("<td valign=\"bottom\">");
if(pagingObserver.isPaging(job)) {
multi = true;
@@ -110,6 +111,7 @@ public class DuccHandlerLegacy extends D
sb.append("Paging");
sb.append("</span>");
}
+ */
//
String monitor = getMonitor(duccId, type, multi);
if(monitor.length() > 0) {
@@ -266,6 +268,21 @@ public class DuccHandlerLegacy extends D
sb.append("<td valign=\"bottom\" align=\"right\">");
sb.append(buildRuntimeFailuresLink(job));
sb.append("</td>");
+ // Pgin
+ sb.append("<td valign=\"bottom\" align=\"right\">");
+ long pgin = job.getPgInCount();
+ sb.append(""+pgin);
+ sb.append("</td>");
+ // Swap
+ DecimalFormat formatter = new DecimalFormat("##0.0");
+ sb.append("<td valign=\"bottom\" align=\"right\">");
+ double swap = job.getSwapUsageGbMax();
+ if(job.isCompleted()) {
+ swap = job.getSwapUsageGbMax();
+ }
+ String displaySwapMax = formatter.format(swap);
+ sb.append(displaySwapMax);
+ sb.append("</td>");
// Size
sb.append("<td valign=\"bottom\" align=\"right\">");
String size = job.getSchedulingInfo().getShareMemorySize();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp?rev=1478912&r1=1478911&r2=1478912&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp Fri May 3 18:40:17 2013
@@ -54,6 +54,8 @@ if (table_style.equals("scroll")) {
$('td:eq(16)', nRow).css( "text-align", "right" );
$('td:eq(17)', nRow).css( "text-align", "right" );
$('td:eq(18)', nRow).css( "text-align", "right" );
+ $('td:eq(19)', nRow).css( "text-align", "right" );
+ $('td:eq(20)', nRow).css( "text-align", "right" );
return nRow;
},
} );
@@ -116,6 +118,8 @@ if (table_style.equals("scroll")) {
<th title="The number of job processes currently running">Proc-<br>esses</th>
<th title="The number of job processes that failed during initialization">Init<br>Fails</th>
<th title="The number of job processes that failed during runtime (post-initialization)">Run<br>Fails</th>
+ <th title="The count for all job processes of major faults which required loading a memory page from disk">Pgin</th>
+ <th title="The GB swapped out to disk for all job processes, current if state=running or maximum if state=completed">Swap</th>
<th title="Each job process size, in GB">Size</th>
<th title="The total number of work items for this job">Total</th>
<th title="The number of work items that completed successfully">Done</th>
@@ -154,6 +158,8 @@ if (table_style.equals("classic")) {
<th title="The number of job processes currently running">Proc-<br>esses</th>
<th title="The number of job processes that failed during initialization">Init<br>Fails</th>
<th title="The number of job processes that failed during runtime (post-initialization)">Run<br>Fails</th>
+ <th title="The count for all job processes of major faults which required loading a memory page from disk">Pgin</th>
+ <th title="The GB swapped out to disk for all job processes, current if state=running or maximum if state=completed">Swap</th>
<th title="Each job process size, in GB">Size</th>
<th title="The total number of work items for this job">Total</th>
<th title="The number of work items that completed successfully">Done</th>