Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 19:19:32 +01:00
Code Issues Projects Releases Wiki Activity

Added memory reporting stuff to cpustats.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-10-24 13:38:55 +00:00
parent 6acd477e5a
commit aa088ef6d9
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/Status.py
View File

@ -174,17 +174,41 @@ class Status(callbacks.Privmsg):
'running.')
return
activeThreads = threading.activeCount()
response = 'I have taken %s seconds of user time and %s seconds of '\
'system time, for a total of %s seconds of CPU time. My '\
'children have taken %s seconds of user time and %s seconds'\
' of system time for a total of %s seconds of CPU time. ' \
'I\'ve taken a total of %s%% of this computer\'s time. ' \
'Out of %s I have %s active. ' % \
response = ('I have taken %.2f seconds of user time and %.2f seconds '
'of system time, for a total of %.2f seconds of CPU '
'time. My children have taken %.2f seconds of user time '
'and %.2f seconds of system time for a total of %.2f '
'seconds of CPU time. I\'ve taken a total of %.2f%% of '
'this computer\'s time. Out of %s I have %s active.' %
(user, system, user + system,
childUser, childSystem, childUser + childSystem,
(user+system+childUser+childSystem)/timeRunning,
utils.nItems(world.threadsSpawned, 'thread', 'spawned'),
activeThreads)
activeThreads))
mem = None
pid = os.getpid()
try:
if sys.platform.startswith('linux'):
mem = 0
fd = file('/proc/%s/status' % pid)
for line in fd:
if line.startswith('VmSize'):
line = line.rstrip()
mem = int(line.split()[1])
break
assert mem, 'Format changed in /proc/<pid>/status'
elif sys.platform.startswith('netbsd'):
mem = os.stat('/proc/%s/mem')[7]
elif sys.platform.startswith('freebsd') or \
sys.platform.startswith('openbsd'):
r = os.popen('/bin/ps -l -p %s' % pid)
line = r.readline()
line = line.strip()
r.close()
mem = int(line.split()[20])
response += ' I\'m taking up %s kB of memory.' % mem
except Exception, e:
debug.msg(debug.exnToString(e))
irc.reply(msg, response)
def cmdstats(self, irc, msg, args):

5
test/test_Status.py
View File

@ -31,6 +31,8 @@
from test import *
import sys
import world
class StatusTestCase(PluginTestCase, PluginDocumentation):
@ -51,6 +53,9 @@ class StatusTestCase(PluginTestCase, PluginDocumentation):
self.assertError('cpustats')
world.startedAt = 0
self.assertNotError('cpustats')
for s in ['linux', 'freebsd', 'openbsd', 'netbsd']:
if sys.platform.startswith(s):
self.assertRegexp('cpustats', 'kB')
finally:
world.startedAt = original
def testUptime(self):