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 2019/08/08 18:12:34 UTC
svn commit: r1864726 -
/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Author: cwiklik
Date: Thu Aug 8 18:12:34 2019
New Revision: 1864726
URL: http://svn.apache.org/viewvc?rev=1864726&view=rev
Log:
UIMA-6044 modified to fix cpu reportoing for POPs.
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1864726&r1=1864725&r2=1864726&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java Thu Aug 8 18:12:34 2019
@@ -199,26 +199,19 @@ public class LinuxProcessMetricsProcesso
private long getCpuTime(long totalCpuUsageInNanos) throws Exception {
long cp = -1;
if (agent.useCgroups) {
- if (managedProcess.getDuccProcess().getProcessState().equals(ProcessState.Running)
- || managedProcess.getDuccProcess().getProcessState()
- .equals(ProcessState.Initializing)) {
-
- long timeRunning = 1;
- if (process.getTimeWindowInit() != null) {
- timeRunning = process.getTimeWindowInit().getElapsedMillis();
- }
- if (process.getTimeWindowRun() != null) {
- timeRunning += process.getTimeWindowRun().getElapsedMillis();
- }
- long totalCpuUsageInMillis = totalCpuUsageInNanos / 1000000;
- // normalize time in running state into seconds
- percentCPU = Math.round(100 * ((totalCpuUsageInMillis * 1.0) / (timeRunning * 1.0)));
+ long timeRunning = 1;
+ if (process.getTimeWindowInit() != null) {
+ timeRunning = process.getTimeWindowInit().getElapsedMillis();
+ }
+ if (process.getTimeWindowRun() != null) {
+ timeRunning += process.getTimeWindowRun().getElapsedMillis();
+ }
+ long totalCpuUsageInMillis = totalCpuUsageInNanos / 1000000;
+ // normalize time in running state into seconds
+ percentCPU = Math.round(100 * ((totalCpuUsageInMillis * 1.0) / (timeRunning * 1.0)));
- cp = percentCPU;
+ cp = percentCPU;
- } else {
- cp = percentCPU;
- }
}
return cp;