From aaad5f58373c6d38a60048685181b94ca46f33b3 Mon Sep 17 00:00:00 2001
From: Robert Hausch <rob.hausch@gmail.com>
Date: Sat, 7 Apr 2012 17:04:36 -0700
Subject: [PATCH] Added Memory monitor

---
 monitor.py             |   2 ++
 sensors/.cpu.py.swp    | Bin 0 -> 12288 bytes
 sensors/.memory.py.swp | Bin 0 -> 12288 bytes
 sensors/__init__.py    |   0
 sensors/__init__.pyc   | Bin 0 -> 149 bytes
 sensors/cpu.py         |  20 ++++++++++++++++++++
 sensors/cpu.pyc        | Bin 0 -> 1596 bytes
 sensors/memory.py      |  18 ++++++++++++++++++
 sensors/memory.pyc     | Bin 0 -> 1117 bytes
 9 files changed, 40 insertions(+)
 create mode 100644 sensors/.cpu.py.swp
 create mode 100644 sensors/.memory.py.swp
 create mode 100644 sensors/__init__.py
 create mode 100644 sensors/__init__.pyc
 create mode 100755 sensors/cpu.py
 create mode 100644 sensors/cpu.pyc
 create mode 100644 sensors/memory.py
 create mode 100644 sensors/memory.pyc

diff --git a/monitor.py b/monitor.py
index b8d5010..207e849 100755
--- a/monitor.py
+++ b/monitor.py
@@ -23,6 +23,7 @@
 from socket import *
 
 from sensors.cpu import *
+from sensors.memory import *
 
 HOST = ''
 PORT = 6000
@@ -35,6 +36,7 @@ class Stats:
 	def __init__(self):
 		self.sensors = []
 		self.sensors.append(cpu_monitor())
+		self.sensors.append(mem_monitor())
 
 	def getStats(self):
 		message = ''
diff --git a/sensors/.cpu.py.swp b/sensors/.cpu.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..dac057d9497875b8ec847bad1835a33c25548b4c
GIT binary patch
literal 12288
zcmeI2PiqrF7{;gGqC`bKcynqEyTx=jX+WWnQ;XoCDAamgHpwI%$<8eEM;h?oT|E0u
z#1G)ji=V)L0(<k`cfz(N3)UW0o`HwiW!`z-_x;_LeFvTAk9YaQq{nDoXYA*<cTYav
zZn6(|7;^_g53~v==Pp0+%K39c=7(=8!*nEGrh7B%M6t1}m2}!jHQCt7MWIz{g|gb%
zbXfYNoc-Aq5g-5p7bDPQz0GbX#ID_4<u`BaU+fy9KmY_l00ck)1V8`;KmY{(3j(fO
zVQ;CEOI0_ws(q!lSFhMW00ck)1V8`;KmY_l00ck)1V8`;{y_ryh_TO2#_nCE;_3hY
z>G%KfHO79Bj!550UrC=xuSu^+lGG(#AzdaN)BPjT7t(u@COsgvNWpuJgara100JNY
z0w4eaAOHd&00JQJmlJ3-jBws4UI=URiC~RJ^~CS@dDP}n@<K}$N3Encj#`I&tPMZp
zQgJJ$<Af%;GbicBdhH_Le!9=+CtEzKoh_Pne`D%HF?G}J()0PjvM1F^DMn(<C&E3_
zrpTQb?c^?xLyhZOjPfs6%lo{v-pT2&2I7$HENY%*IjR(9D3pskNw>|zOX>U1j1NVI
z)V>^1+ImLii;My-SxtqC7m}XYwHLiAvn-P|JD+8zcEf3IEf271j6Mw2Q%|xewQ*G+
U^cB9EdTY{wRB1VL2Q=G%0`;!QzW@LL

literal 0
HcmV?d00001

diff --git a/sensors/.memory.py.swp b/sensors/.memory.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..5b23281033c623dcbcadfd7d1347b6ba5a98fff6
GIT binary patch
literal 12288
zcmeI2F>ljA7>2KG849Q@MGRbus<eXGDIJh1WvdVj5lBE+%c(DkrTA>_&XK$TQYrie
zMt%kS2xeCJ1u!!(@LuAEQblP;K<`PfF8=QI_kH(lk-vWD;9*bR3w8z8RUv+Se)Z_%
z`l>j(DTEuTyq{}-vUHXGQoC}gWqSCcP8cR?5<aP{Q(3#0>(u2Y)x-9Ftg>8(R%x3X
z8)kSiRZvvtC#Hi0NZ<klR>kh!osKu&+GxsaYtJt54lN`=0wh2JBtQZrKmsH{0{;sE
zSFDJaxXh*cLTmNDa%Qg|xsd<~kN^pg011!)36KB@kN^pg015nq1mZ-9=4By{A^-jV
z<p2NoD?)sOzCvH1PtXVGJ#-AchMq$YpzF{&^b<MWL2scqkk9!P>OeOjE)pOC5+DH*
zAOR8}0TLhq5+H%Ult81ADQn}QlDE6ks_`J02(ciT8W&+)J1V_5D3*E_9r~D2t~6TK
z1y5D!%2sbW3f`8FN0r@^o59XN9-!vzXG?C%t!Z<oT2SUtX?Le?`b>Yb!)?(>)IbiE
zyPumZb}HGAT|CXSz2`fcUHFf8Wmguqbm=&lAU?0Rg<LcHJoMXHjH-Fm8-3BTNKo+H
zTCLWiyguraL{W;_`6xO`b2yHz1;8xA7`-2=$1T#V$c?L;#?)^!EUgLqsSb<EjWFB)
E3&(TO1ONa4

literal 0
HcmV?d00001

diff --git a/sensors/__init__.py b/sensors/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sensors/__init__.pyc b/sensors/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..19e6705fb87070306389bab421e008863c8359e5
GIT binary patch
literal 149
zcmZSn%*%E9e1m^70~9a<X$K%KW&si@3=F{<AQ3+eAi;n}6x#vC^fU5vQ}s(SQuCAY
z^Yl|v%k+aQi%U{-b$#>mGE4G{GV{`PT@q7sfs)0kdByof#rpB_nLw%dc)fzk5)Pmd
SHo5sJr8%i~Ad8BDm;nH)Od_8E

literal 0
HcmV?d00001

diff --git a/sensors/cpu.py b/sensors/cpu.py
new file mode 100755
index 0000000..80cde81
--- /dev/null
+++ b/sensors/cpu.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import psutil
+
+class cpu_monitor:
+	def __init__(self):
+		self.num_cpus = len(psutil.cpu_percent(0,percpu=True))
+
+	def update(self):
+		self.cpu_usage = psutil.cpu_percent(0.1, percpu=True)
+		self.cpu_times = psutil.cpu_times()
+
+	def getFormatedData(self):
+		message = ''
+		message += 'Cpu usage: '
+		message += ', '.join('%.1f'%x for x in self.cpu_usage)
+		message += ' CPU times: '
+		message += ', '.join('%.3f'%x for x in self.cpu_times)
+		return message
+
diff --git a/sensors/cpu.pyc b/sensors/cpu.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3c3c8a786fe050426ff6e84307aa9e91114b3daa
GIT binary patch
literal 1596
zcmcIk(P|Sx6upy8V_RFRK8U^rMF?n{iVtEbRc!IiC=(Sd=n}irbVGJGW@e=Y1tI=~
z{)vC#zlhIz&fPYZzBY!Pn>#ai?woVx&P2bK7k~f!@_bK@e-Zv4qxoAf2|go3kzF`7
zN$QeB@>OIa@@Cg?uG^YJT>1yUPPhnnZ&b!vk*A>;PjecKKS9%+4%x6&m}eI`jXDwY
zbEGb|+aicPu43Z`+i3nKOu%PkpzE+AL^3gEV&s!Z40HlOT--@vBs5?~ZVXHc6VW0=
zmsjJy4C!!+nPHd-b%eYemoCi1$;&LpV&5VTo$_wD-$F;!_=oV?2Sw)E;lLH|i@cq<
zkL~V}4=!7MR>_d&{neeGgD7q9a$k&n8#&iTN4iBErw}WS3Dwt_*-V)ei!#3h2h0a5
zIce8Oo17yZuk%FCO3?rQjlUm{EYYg~mI7F&wNy1M!0^CI-|M?+FQl2PDBBANm>FGC
zEJsN%IPU8SL(KJxE}2j1zC#Cf@fpVo#x;3x>_sxbM4fd4vQT3OCy(!Bes1bjk&Tnc
z+L_31i^MvR6gXJ5+oQ6nB5XAE5bieh5QvJBdA1uc*!JxTfhF*bTzhRkpmKQ)7^;+R
zuie}4RGM)NM<uehj-nMgoRyTG0&ezQ?hZ%et;^^r>W26w_|5GXubO&@8|R^M|6dw*
z8Hw#BnE%7!>L~}kz<SvRMVebuwTs-CN@_(0o*rtHRXZy<VFfvH37!_?3>BK}^g@rE
zRZ%ewvuK*ys+VLQQ*oU4G8e~z=wiHjNjXH<a?Y}<>=l?(fa;y^$*@SM52EK~YM6y+
cp<ZpE;^_5e$V@lYcWSeux24yCn=RG;0^$!y-T(jq

literal 0
HcmV?d00001

diff --git a/sensors/memory.py b/sensors/memory.py
new file mode 100644
index 0000000..e14d3ee
--- /dev/null
+++ b/sensors/memory.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import psutil
+
+class mem_monitor:
+	def __init__(self):
+		self.mem_usage = ''
+		self.virt_mem_usage = ''
+
+	def update(self):
+		self.mem_usage = psutil.phymem_usage()
+		self.virt_mem_usage = psutil.virtmem_usage()
+
+	def getFormatedData(self):
+		message = 'Memory- Phys: %.1f Virt: %.1f' % (self.mem_usage.percent, self.virt_mem_usage.percent)
+		return message
+
+
diff --git a/sensors/memory.pyc b/sensors/memory.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2be5ad039c9c3bac38bfa64b2353e1102917b450
GIT binary patch
literal 1117
zcmb_bO>fgc5FLL|NNMS<Cy*i#k}s*n6;-H$idzG6BqVZKnRwGUitWfdsbmSHO64!|
zOSo`@_tqgja3q#@{B}KlGjC=b{X9PW_2c%#Otx2q=LME~0aM@(WF;~M2&IUnh~&G-
zoyg~Dz;~160sP9}xW@Vzu(Fk@n!41c-Ejsue~aZgE!gm>kY@_cz=MeVJc%WnBurw)
zued_2cUbNe2JT-)%no>_NkX5o!ia}D0AeN^mtR|bg56Eos@WYSB-R+l+0{J3Q@nBK
zK<T2XY^n>}d}->mus7+Xb84&6Rj;e8uSb`;h04^~+BL09LEN<6*}Bt5ATXvx0gO2S
zb_^oHAoy3$bG$&#%YgNys?cwvzgtvWP++Dy_GMNQuH8n<l^zi;x}BnoCD3CSD!o5u
zDLqBTME0qa$!yj|uJ#aUtMjDS$z&MW_iYH!_igFbLh3T4?0G1s-_THwk?){;2G=WJ
z%hB-TqI0i@FV9}hho2y+hki7Atq<Y5w(ZQ;nt7F^@G6zBD(l$%eJVZyEyn46(^gPj
zT;`f{w6@Zp27QzI38?eR8lx<Y!4FYvR@i3zSuzf1#{S*s=Fxu-Uj|NL2*=(W1cP`G
a_c45Fc<5dB9oG;2c`xz}Tj3b*DEtE#*Ya!t

literal 0
HcmV?d00001