From 1e3b3050183020e06cf5248bc19ba2f1d1576d3d Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Wed, 31 Jan 2007 18:51:16 +0000
Subject: [PATCH] add CpuUsage

---
 .../src/org/hyperic/sigar/jmx/SigarProcess.java  | 16 ++++++++++------
 .../org/hyperic/sigar/jmx/SigarProcessMBean.java |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bindings/java/src/org/hyperic/sigar/jmx/SigarProcess.java b/bindings/java/src/org/hyperic/sigar/jmx/SigarProcess.java
index c2bcc2de..ab4d40fc 100644
--- a/bindings/java/src/org/hyperic/sigar/jmx/SigarProcess.java
+++ b/bindings/java/src/org/hyperic/sigar/jmx/SigarProcess.java
@@ -18,9 +18,9 @@
 
 package org.hyperic.sigar.jmx;
 
+import org.hyperic.sigar.ProcCpu;
 import org.hyperic.sigar.ProcFd;
 import org.hyperic.sigar.ProcMem;
-import org.hyperic.sigar.ProcTime;
 import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.SigarException;
 import org.hyperic.sigar.SigarProxy;
@@ -66,12 +66,12 @@ public class SigarProcess implements SigarProcessMBean {
         }
     }
 
-    private synchronized ProcTime getTime() {
+    private synchronized ProcCpu getCpu() {
         try {
             long pid = this.sigar.getPid();
-            return this.sigar.getProcTime(pid);
+            return this.sigar.getProcCpu(pid);
         } catch (SigarException e) {
-            throw unexpectedError("Time", e);
+            throw unexpectedError("Cpu", e);
         }   
     }
 
@@ -109,11 +109,15 @@ public class SigarProcess implements SigarProcessMBean {
     }
 
     public Long getTimeUser() {
-        return new Long(getTime().getUser());
+        return new Long(getCpu().getUser());
     }
 
     public Long getTimeSys() {
-        return new Long(getTime().getSys());
+        return new Long(getCpu().getSys());
+    }
+
+    public Double getCpuUsage() {
+        return new Double(getCpu().getPercent());
     }
 
     public Long getOpenFd() {
diff --git a/bindings/java/src/org/hyperic/sigar/jmx/SigarProcessMBean.java b/bindings/java/src/org/hyperic/sigar/jmx/SigarProcessMBean.java
index d897328b..20dcdfb1 100644
--- a/bindings/java/src/org/hyperic/sigar/jmx/SigarProcessMBean.java
+++ b/bindings/java/src/org/hyperic/sigar/jmx/SigarProcessMBean.java
@@ -43,5 +43,7 @@ public interface SigarProcessMBean {
 
     public Long getTimeSys();
 
+    public Double getCpuUsage();
+
     public Long getOpenFd();
 }