From 685be0dbbdf2815a723ff638f754117e7dc0bc34 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 27 Apr 2010 10:39:00 +0000
Subject: [PATCH] Updated vhostmd.conf file which enables TotalCPUTime metric.

---
 vhostmd.conf | 23 +++++++++++++++++++----
 vhostmd.spec |  5 ++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/vhostmd.conf b/vhostmd.conf
index 8afd303..d1b6da0 100644
--- a/vhostmd.conf
+++ b/vhostmd.conf
@@ -150,13 +150,28 @@ within the vm element.
       <variable name="PageInRate" type="uint64"/>
       <variable name="PageFaultRate" type="uint64"/>
     </metric>
-    <!--<metric type="real64" context="host">
+    <metric type="real64" context="host">
       <name>TotalCPUTime</name>
       <action>
-        virsh -r CONNECT dominfo 0 | sed 's/: */:/'   \
-          | gawk -F: '/CPU time/ {print $2;}'
+        gawk 'BEGIN {
+          getline &lt; "/proc/uptime";
+          idle_sec  = $2;
+          while ( 0 &lt;= (getline &lt; "/proc/stat") )
+          {
+            if ( "cpu" == $1 )
+            {
+              USER_HZ = $5/idle_sec;
+              #printf "USER_HZ = %f\n", USER_HZ | "cat 1&gt;&amp;2"
+              TotalCPUTime = ($2 + $3 + $4)/USER_HZ;
+              printf "%f\n", TotalCPUTime;
+
+              break;
+            }
+          }
+          #close("cat 1&gt;&amp;2");
+        }'
       </action>
-    </metric>-->
+    </metric>
     <!-- SAP "CIM"  -->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
diff --git a/vhostmd.spec b/vhostmd.spec
index fc48e1f..8712240 100644
--- a/vhostmd.spec
+++ b/vhostmd.spec
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -192,6 +192,9 @@ exit 0
 
 
 %changelog
+* Tue Apr 27 2010 Richard W.M. Jones <rjones@redhat.com> - 0.4-6
+- Updated vhostmd.conf file which enables TotalCPUTime metric.
+
 * Tue Feb 16 2010 Richard W.M. Jones <rjones@redhat.com> - 0.4-5
 - Add a patch to link tests explicitly with -ldl (RHBZ#565096).