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

Cleaned up @serveload and @time commands. Resolves issue 149. Resolves issue 146.

Browse source
This commit is contained in:
Griatch 2011-03-26 00:26:15 +00:00
parent d2d86871e9
commit 02775398c4
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -511,7 +511,7 @@ class CmdTime(MuxCommand):
if utils.host_os_is('posix'): if utils.host_os_is('posix'):
loadavg = os.getloadavg() loadavg = os.getloadavg()
table[0].append("Server load (per minute):") table[0].append("Server load (per minute):")
table[1].append("{w%g%%{n" % (100 * loadavg[0])) table[1].append("%g" % (loadavg[0]))
stable = [] stable = []
for col in table: for col in table:
stable.append([str(val).strip() for val in col]) stable.append([str(val).strip() for val in col])
@ -547,40 +547,46 @@ class CmdServerLoad(MuxCommand):
import resource import resource
loadavg = os.getloadavg() loadavg = os.getloadavg()
psize = resource.getpagesize() psize = resource.getpagesize()
pid = os.getpid()
rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rsz")).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)
table = [["Server load (1 min):", table = [["Server load (1 min):",
"Process ID:", "Process ID:",
"Bytes per page:", "Bytes per page:",
"Time used:", "CPU time used:",
"Integral memory:", "Resident memory:",
"Max res memory:", "Virtual memory:",
"Page faults:", "Page faults:",
"Disk I/O:", "Disk I/O:",
"Network I/O", "Network I/O:",
"Context switching:" "Context switching:"
], ],
["%g%%" % (100 * loadavg[0]), ["%g" % loadavg[0],
"%10d" % os.getpid(), "%10d" % pid,
"%10d " % psize, "%10d " % psize,
"%10d" % rusage.ru_utime, "%s (%gs)" % (utils.time_format(rusage.ru_utime),rusage.ru_utime),
"%10d shared" % rusage.ru_ixrss, #"%10d shared" % rusage.ru_ixrss,
"%10d pages" % rusage.ru_maxrss, #"%10d pages" % rusage.ru_maxrss,
"%10d Mb" % rmem,
"%10d Mb" % vmem,
"%10d hard" % rusage.ru_majflt, "%10d hard" % rusage.ru_majflt,
"%10d reads" % rusage.ru_inblock, "%10d reads" % rusage.ru_inblock,
"%10d in" % rusage.ru_msgrcv, "%10d in" % rusage.ru_msgrcv,
"%10d vol" % rusage.ru_nvcsw "%10d vol" % rusage.ru_nvcsw
], ],
["", "", "", ["", "", "",
"(user: %g)" % rusage.ru_stime, "(user: %gs)" % rusage.ru_stime,
"%10d private" % rusage.ru_idrss, "",#"%10d private" % rusage.ru_idrss,
"%10d bytes" % (rusage.ru_maxrss * psize), "",#"%10d bytes" % (rusage.ru_maxrss * psize),
"%10d soft" % rusage.ru_minflt, "%10d soft" % rusage.ru_minflt,
"%10d writes" % rusage.ru_oublock, "%10d writes" % rusage.ru_oublock,
"%10d out" % rusage.ru_msgsnd, "%10d out" % rusage.ru_msgsnd,
"%10d forced" % rusage.ru_nivcsw "%10d forced" % rusage.ru_nivcsw
], ],
["", "", "", "", ["", "", "", "",
"%10d stack" % rusage.ru_isrss, "",#"%10d stack" % rusage.ru_isrss,
"", "",
"%10d swapouts" % rusage.ru_nswap, "%10d swapouts" % rusage.ru_nswap,
"", "", "", "",