From 108ff36575e77ea5729948e035280c6760bc22c9 Mon Sep 17 00:00:00 2001
From: Nicolas Hennion <nicolas@nicolargo.com>
Date: Wed, 31 Oct 2012 17:30:24 +0100
Subject: [PATCH] CPU stats corrected for Windows

---
 glances/glances.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/glances/glances.py b/glances/glances.py
index c992790c..c59cda6b 100755
--- a/glances/glances.py
+++ b/glances/glances.py
@@ -435,10 +435,10 @@ class glancesStats:
                                      self.cputime_old.user) * percent,
                                 'idle':
                                     (self.cputime_new.idle -
-                                     self.cputime_old.idle) * percent,
-                                'nice':
-                                    (self.cputime_new.nice -
-                                     self.cputime_old.nice) * percent}
+                                     self.cputime_old.idle) * percent}
+                    if hasattr(self.cputime_new, 'nice'):
+                        self.cpu['nice'] = (self.cputime_new.nice -
+                                            self.cputime_old.nice) * percent
                     self.cputime_old = self.cputime_new
                     self.cputime_total_old = self.cputime_total_new
                 except Exception:
@@ -497,19 +497,19 @@ class glancesStats:
                     for i in range(len(self.percputime_new)):                
                         perpercent.append(100 / (self.percputime_total_new[i] -
                                                  self.percputime_total_old[i]))
-                        self.percpu.append(
-                                   {'kernel':
-                                        (self.percputime_new[i].system -
-                                         self.percputime_old[i].system) * perpercent[i],
-                                    'user':
-                                        (self.percputime_new[i].user -
-                                         self.percputime_old[i].user) * perpercent[i],
-                                    'idle':
-                                        (self.percputime_new[i].idle -
-                                         self.percputime_old[i].idle) * perpercent[i],
-                                    'nice':
-                                        (self.percputime_new[i].nice -
-                                         self.percputime_old[i].nice) * perpercent[i]} )                
+                        cpu =  {'kernel':
+                                    (self.percputime_new[i].system -
+                                     self.percputime_old[i].system) * perpercent[i],
+                                'user':
+                                    (self.percputime_new[i].user -
+                                     self.percputime_old[i].user) * perpercent[i],
+                                'idle':
+                                    (self.percputime_new[i].idle -
+                                     self.percputime_old[i].idle) * perpercent[i]}
+                        if hasattr(self.percputime_new[i], 'nice'):
+                            cpu['nice'] = (self.percputime_new[i].nice -
+                                           self.percputime_old[i].nice) * perpercent[i]
+                        self.percpu.append(cpu)                                         
                     self.percputime_old = self.percputime_new
                     self.percputime_total_old = self.percputime_total_new
                 except Exception:
@@ -2090,6 +2090,9 @@ class glancesCsv:
 
 class GlancesHandler(SocketServer.BaseRequestHandler):
     """
+    !!!
+    !!! TODO : To be replaced by http://docs.python.org/2/library/simplexmlrpcserver.html
+    !!!
     This class manages the TCP request
     Return:
     0: GET Command success