From 406cc6903645cf5860b57829e9702b7bcb593040 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Wed, 28 Sep 2005 15:56:57 +0000
Subject: [PATCH] include totals from Sigar.getCpuPerc()

---
 .../src/net/hyperic/sigar/cmd/CpuInfo.java    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java b/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java
index 9b8fc921..84b221e5 100644
--- a/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java
+++ b/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java
@@ -23,6 +23,16 @@ public class CpuInfo extends SigarCommandBase {
         return "Display cpu information";
     }
 
+    private void output(CpuPerc cpu) {
+        println("User Time....." + CpuPerc.format(cpu.getUser()));
+        println("Sys Time......" + CpuPerc.format(cpu.getSys()));
+        println("Idle Time....." + CpuPerc.format(cpu.getIdle()));
+        println("Wait Time....." + CpuPerc.format(cpu.getWait()));
+        println("Nice Time....." + CpuPerc.format(cpu.getNice()));
+        println("Combined......" + CpuPerc.format(cpu.getCombined()));
+        println("");
+    }
+
     public void output(String[] args) throws SigarException {
         net.hyperic.sigar.CpuInfo[] infos =
             this.sigar.getCpuInfoList();
@@ -38,25 +48,22 @@ public class CpuInfo extends SigarCommandBase {
         if (cacheSize != Sigar.FIELD_NOTIMPL) {
             println("Cache size...." + cacheSize);
         }
+        println("");
 
         if (!this.displayTimes) {
             return;
         }
 
         for (int i=0; i<infos.length; i++) {
+            println("CPU " + i + ".........");
             if (cpus == null) {
                 cpus = this.sigar.getCpuPercList();
             }
-            CpuPerc cpu = cpus[i];
-            println("User Time....." + CpuPerc.format(cpu.getUser()));
-            println("Sys Time......" + CpuPerc.format(cpu.getSys()));
-            println("Idle Time....." + CpuPerc.format(cpu.getIdle()));
-            println("Wait Time....." + CpuPerc.format(cpu.getWait()));
-            println("Nice Time....." + CpuPerc.format(cpu.getNice()));
-            println("Combined......" + CpuPerc.format(cpu.getCombined()));
-            
-            println("");
+            output(cpus[i]);
         }
+
+        println("Totals........");
+        output(this.sigar.getCpuPerc());
     }
 
     public static void main(String[] args) throws Exception {