Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing @serverload to work on Mac/BSD. Use -o rss instead of rsz. This works on Linux/BSD/Mac with no extra per-OS logic needed.

Browse source
This commit is contained in:
Greg Taylor 2011-04-23 03:16:29 +00:00
parent 7dc4901ccc
commit ce2a8e9ffe
1 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/system.py
View file

@ -524,7 +524,7 @@ class CmdServerLoad(MuxCommand):
loadavg = os.getloadavg() loadavg = os.getloadavg()
psize = resource.getpagesize() psize = resource.getpagesize()
pid = os.getpid() pid = os.getpid()
rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rsz")).read()) / 1024.0 rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rss")).read()) / 1024.0
vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1024.0 vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1024.0
rusage = resource.getrusage(resource.RUSAGE_SELF) rusage = resource.getrusage(resource.RUSAGE_SELF)