You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/04/24 16:51:32 UTC
svn commit: r1589757 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/
Author: cwiklik
Date: Thu Apr 24 14:51:32 2014
New Revision: 1589757
URL: http://svn.apache.org/r1589757
Log:
UIMA-3769 Added current CPU to IDuccProcess
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1589757&r1=1589756&r2=1589757&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java Thu Apr 24 14:51:32 2014
@@ -76,6 +76,8 @@ public class LinuxProcessMetricsProcesso
private long percentCPU=0;
+ private long previousPercentCPU=0;
+
// private int logCounter=0;
public LinuxProcessMetricsProcessor(DuccLogger logger, IDuccProcess process, NodeAgent agent,
String statmFilePath, String nodeStatFilePath, String processStatFilePath,
@@ -287,8 +289,6 @@ public class LinuxProcessMetricsProcesso
// used during initialization
percentCPU = 100* ( totalCpuUsage - totalCpuInitUsage )/timeSinceRunningInSeconds;
- logger.info("process", null, "----------- PID:" + process.getPID()
- + " CPU Time:" + percentCPU+"%");
// Publish cumulative CPU usage
process.setCpuTime(percentCPU);
} else {
@@ -306,6 +306,12 @@ public class LinuxProcessMetricsProcesso
// if process is not dead, report the last known percentCPU
process.setCpuTime(percentCPU);
}
+ if ( percentCPU > 0 ) {
+ process.setCurrentCPU(previousPercentCPU - percentCPU);
+ logger.info("process", null, "----------- PID:" + process.getPID()
+ + " Average CPU Time:" + percentCPU+"% Current CPU Time:"+process.getCurrentCPU());
+ previousPercentCPU = percentCPU;
+ }
// long majorFaults = processMajorFaultUsage.get().getMajorFaults();
// collects process Major faults (swap in memory)
process.setMajorFaults(totalFaults);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.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/DuccProcess.java?rev=1589757&r1=1589756&r2=1589757&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java Thu Apr 24 14:51:32 2014
@@ -65,6 +65,7 @@ public class DuccProcess implements IDuc
private long swapUsage;
private long swapUsageMax;
private long wiMillisInvestment;
+ private long currentCPU;
public DuccProcess(DuccId duccId, NodeIdentity nodeIdentity) {
setDuccId(duccId);
@@ -592,4 +593,11 @@ public class DuccProcess implements IDuc
public long getWiMillisInvestment() {
return wiMillisInvestment;
}
+
+ public void setCurrentCPU(long cpu) {
+ currentCPU = cpu;
+ }
+ public long getCurrentCPU() {
+ return currentCPU;
+ }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.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/IDuccProcess.java?rev=1589757&r1=1589756&r2=1589757&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java Thu Apr 24 14:51:32 2014
@@ -140,4 +140,8 @@ public interface IDuccProcess extends Se
public void setWiMillisInvestment(long value);
public long getWiMillisInvestment();
+
+ public void setCurrentCPU(long cpu);
+ public long getCurrentCPU();
+
}