Author: cwiklik
Date: Tue Jul 2 17:06:49 2013
New Revision: 1499020
URL: http://svn.apache.org/r1499020
Log:
UIMA-3043 Modify how major faults are collected
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessMajorFaultCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessSwapUsageCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessMajorFaultCollector.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessMajorFaultCollector.java?rev=1499020&r1=1499019&r2=1499020&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessMajorFaultCollector.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessMajorFaultCollector.java
Tue Jul 2 17:06:49 2013
@@ -18,66 +18,28 @@
*/
package org.apache.uima.ducc.agent.metrics.collectors;
-import java.io.RandomAccessFile;
import java.util.concurrent.Callable;
import
org.apache.uima.ducc.common.agent.metrics.swap.DuccProcessMemoryPageLoadUsage;
import
org.apache.uima.ducc.common.agent.metrics.swap.ProcessMemoryPageLoadUsage;
import org.apache.uima.ducc.common.utils.DuccLogger;
-public class ProcessMajorFaultCollector extends AbstractMetricCollector
implements
+public class ProcessMajorFaultCollector implements
Callable<ProcessMemoryPageLoadUsage> {
-
- public ProcessMajorFaultCollector(DuccLogger logger, String pid,
- RandomAccessFile fileHandle, int howMany, int offset) {
- super(fileHandle, howMany, offset);
+ String pid;
+
+ public ProcessMajorFaultCollector(DuccLogger logger, String pid ) {
+ this.pid = pid;
}
public ProcessMemoryPageLoadUsage call() throws Exception {
try {
- super.parseMetricFile();
- return new
DuccProcessMemoryPageLoadUsage(super.metricFileContents,
- super.metricFieldOffsets,
super.metricFieldLengths);
+ //super.parseMetricFile();
+ return new DuccProcessMemoryPageLoadUsage(pid);
} catch (Exception e) {
e.printStackTrace();
throw e;
}
}
-/*
- private String execTopShell() throws Exception {
- List<String> command = new ArrayList<String>();
- command.add("top");
- command.add("-b");
- command.add("-n");
- command.add("1");
- command.add("-p");
- command.add(pid);
- ProcessBuilder builder = new ProcessBuilder(command);
- Process process = builder.start();
- InputStream is = process.getInputStream();
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- String line;
- int count = 0;
- String cpu = "";
- try {
- while ((line = br.readLine()) != null) {
- if (count == 7) {
- String[] values =
line.trim().split("\\s+");
- cpu = values[9];
- process.destroy();
- break;
- }
- count++;
- }
- } finally {
- if (is != null) {
- is.close();
- }
- }
- process.waitFor();
- return cpu;
- }
- */
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessSwapUsageCollector.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessSwapUsageCollector.java?rev=1499020&r1=1499019&r2=1499020&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessSwapUsageCollector.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessSwapUsageCollector.java
Tue Jul 2 17:06:49 2013
@@ -25,19 +25,18 @@ import org.apache.uima.ducc.common.agent
import
org.apache.uima.ducc.common.agent.metrics.swap.ProcessMemoryPageLoadUsage;
import org.apache.uima.ducc.common.utils.DuccLogger;
-public class ProcessSwapUsageCollector extends AbstractMetricCollector
implements
+public class ProcessSwapUsageCollector implements
Callable<ProcessMemoryPageLoadUsage> {
-
+ String pid;
+
public ProcessSwapUsageCollector(DuccLogger logger, String pid,
RandomAccessFile fileHandle, int howMany, int offset) {
- super(fileHandle, howMany, offset);
+ this.pid = pid;
}
public ProcessMemoryPageLoadUsage call() throws Exception {
try {
- super.parseMetricFile();
- return new
DuccProcessMemoryPageLoadUsage(super.metricFileContents,
- super.metricFieldOffsets,
super.metricFieldLengths);
+ return new DuccProcessMemoryPageLoadUsage(pid);
} catch (Exception e) {
e.printStackTrace();
throw e;
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=1499020&r1=1499019&r2=1499020&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
Tue Jul 2 17:06:49 2013
@@ -134,8 +134,8 @@ public class LinuxProcessMetricsProcesso
totalSwapUsage += processSwapSpaceUsage.getSwapUsage();
- ProcessMajorFaultCollector processMajorFaultUsageCollector =
new ProcessMajorFaultCollector(
- logger, pid, processStatFile, 42, 0);
+ ProcessMajorFaultCollector processMajorFaultUsageCollector =
+ new ProcessMajorFaultCollector(logger, pid);
processMajorFaultUsage = pool
.submit(processMajorFaultUsageCollector);
@@ -163,8 +163,8 @@ public class LinuxProcessMetricsProcesso
+ "/admin/ducc_get_process_swap_usage.sh", logger);
totalSwapUsage = processSwapSpaceUsage.getSwapUsage();
- ProcessMajorFaultCollector processMajorFaultUsageCollector = new
ProcessMajorFaultCollector(
- logger, process.getPID(), processStatFile, 42, 0);
+ ProcessMajorFaultCollector processMajorFaultUsageCollector =
+ new ProcessMajorFaultCollector(logger,
process.getPID());
processMajorFaultUsage = pool
.submit(processMajorFaultUsageCollector);
