diff options
author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-06-16 08:05:33 +0200 |
---|---|---|
committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-06-16 08:05:33 +0200 |
commit | 45b79036bed41e170dd4fca0bbec4425aee5033e (patch) | |
tree | fa5c79277de1a5862bdfb815fb918fb90356bfe3 | |
parent | 6c99d2f028a889602134f7117ff571991634dcf8 (diff) |
devcons: add current pool allocations to #c/swap
-rwxr-xr-x | sys/man/3/cons | 7 | ||||
-rw-r--r-- | sys/src/9/port/devcons.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/man/3/cons b/sys/man/3/cons index 7ecb9ffb2..a12f1cf23 100755 --- a/sys/man/3/cons +++ b/sys/man/3/cons @@ -253,8 +253,8 @@ device holds a text block giving memory usage statistics: \fIn\fP kernel \fIn\fP/\fIm\fP user \fIn\fP/\fIm\fP swap -\fIn\fP/\fIm\fP kernel malloc -\fIn\fP/\fIm\fP kernel draw +\fIa\fP/\fIn\fP/\fIm\fP kernel malloc +\fIa\fP/\fIn\fP/\fIm\fP kernel draw .EE .PP These are total memory (bytes), system page size (bytes), @@ -267,6 +267,9 @@ indicates used out of .I m available. +For kernel malloc and kernel draw, +.IR a +indicates the current allocation in bytes. These numbers are not blank padded. .PP To turn on swapping, write to diff --git a/sys/src/9/port/devcons.c b/sys/src/9/port/devcons.c index 0db1a0e9a..dc761f493 100644 --- a/sys/src/9/port/devcons.c +++ b/sys/src/9/port/devcons.c @@ -609,15 +609,17 @@ consread(Chan *c, void *buf, long n, vlong off) "%lud kernel\n" "%lud/%lud user\n" "%lud/%lud swap\n" - "%llud/%llud kernel malloc\n" - "%llud/%llud kernel draw\n", + "%llud/%llud/%llud kernel malloc\n" + "%llud/%llud/%llud kernel draw\n", (uvlong)conf.npage*BY2PG, (uvlong)BY2PG, conf.npage-conf.upages, palloc.user-palloc.freecount-fscache.pgref-swapimage.pgref, palloc.user, conf.nswap-swapalloc.free, conf.nswap, + (uvlong)mainmem->curalloc, (uvlong)mainmem->cursize, (uvlong)mainmem->maxsize, + (uvlong)imagmem->curalloc, (uvlong)imagmem->cursize, (uvlong)imagmem->maxsize); |