[Hyperic-hq-discuss] hq r6849 - in trunk: plugins/system/src/org/hyperic/hq/plugin/system src/org/hyperic/hq/livedata/formatters

[<do...@hy...>]

Author: dougm
Date: 2007-11-16 17:33:34 -0800 (Fri, 16 Nov 2007)
New Revision: 6849
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6849

Modified:
   trunk/plugins/system/src/org/hyperic/hq/plugin/system/TopData.java
   trunk/src/org/hyperic/hq/livedata/formatters/TopFormatter.java
Log:
CurrentProcessSummary -> ProcStat

Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/TopData.java
===================================================================
--- trunk/plugins/system/src/org/hyperic/hq/plugin/system/TopData.java	2007-11-17 00:38:55 UTC (rev 6848)
+++ trunk/plugins/system/src/org/hyperic/hq/plugin/system/TopData.java	2007-11-17 01:33:34 UTC (rev 6849)
@@ -30,8 +30,8 @@
 import java.util.List;
 
 import org.hyperic.sigar.CpuPerc;
-import org.hyperic.sigar.CurrentProcessSummary;
 import org.hyperic.sigar.Mem;
+import org.hyperic.sigar.ProcStat;
 import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.SigarException;
 import org.hyperic.sigar.Swap;
@@ -40,7 +40,7 @@
 public class TopData {
 
     private UptimeData _uptime;
-    private CurrentProcessSummary _currentProcessSummary;
+    private ProcStat _procStat;
     private CpuPerc _cpu;
     private Mem _mem;
     private Swap _swap;
@@ -52,7 +52,7 @@
         throws SigarException {
 
         _uptime = UptimeData.gather(sigar);
-        _currentProcessSummary = CurrentProcessSummary.get(sigar);
+        _procStat = sigar.getProcStat();
         _cpu = sigar.getCpuPerc();
         _mem = sigar.getMem();
         _swap = sigar.getSwap();
@@ -93,8 +93,8 @@
         return _uptime;
     }
 
-    public CurrentProcessSummary getCurrentProcessSummary() {
-        return _currentProcessSummary;
+    public ProcStat getProcStat() {
+        return _procStat;
     }
 
     public CpuPerc getCpu() {
@@ -115,7 +115,7 @@
 
     public void print(PrintStream out) {
         out.println(getUptime());
-        out.println(getCurrentProcessSummary());
+        out.println(getProcStat());
         out.println(getCpu());
         out.println(getMem());
         out.println(getSwap());

Modified: trunk/src/org/hyperic/hq/livedata/formatters/TopFormatter.java
===================================================================
--- trunk/src/org/hyperic/hq/livedata/formatters/TopFormatter.java	2007-11-17 00:38:55 UTC (rev 6848)
+++ trunk/src/org/hyperic/hq/livedata/formatters/TopFormatter.java	2007-11-17 01:33:34 UTC (rev 6849)
@@ -36,8 +36,8 @@
 import org.hyperic.hq.plugin.system.TopData;
 import org.hyperic.hq.plugin.system.UptimeData;
 import org.hyperic.sigar.CpuPerc;
-import org.hyperic.sigar.CurrentProcessSummary;
 import org.hyperic.sigar.Mem;
+import org.hyperic.sigar.ProcStat;
 import org.hyperic.sigar.Swap;
 import org.hyperic.util.config.ConfigResponse;
 import org.hyperic.util.config.ConfigSchema;
@@ -117,7 +117,7 @@
          .append("<br/>");
         
         
-        CurrentProcessSummary ps = t.getCurrentProcessSummary();
+        ProcStat ps = t.getProcStat();
         r.append("<b>Processes</b>: ")
          .append(h(BUNDLE.format("formatter.top.procSummary", 
                                  "" + ps.getTotal(), "" + ps.getRunning(),