Software / code / prosody
Changeset
4951:e3ff2656cb37
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 08 Jul 2012 18:54:56 +0100 |
| parents | 4949:521976cb56e6 (current diff) 4950:02e5e9fa37b8 (diff) |
| children | 4953:24c2150cc8b0 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/util-src/pposix.c Sun Jul 08 18:49:44 2012 +0100 +++ b/util-src/pposix.c Sun Jul 08 18:54:56 2012 +0100 @@ -622,14 +622,20 @@ { struct mallinfo info = mallinfo(); lua_newtable(L); + /* This is the total size of memory allocated with sbrk by malloc, in bytes. */ lua_pushinteger(L, info.arena); lua_setfield(L, -2, "allocated"); + /* This is the total size of memory allocated with mmap, in bytes. */ lua_pushinteger(L, info.hblkhd); lua_setfield(L, -2, "allocated_mmap"); + /* This is the total size of memory occupied by chunks handed out by malloc. */ lua_pushinteger(L, info.uordblks); lua_setfield(L, -2, "used"); + /* This is the total size of memory occupied by free (not in use) chunks. */ lua_pushinteger(L, info.fordblks); lua_setfield(L, -2, "unused"); + /* This is the size of the top-most releasable chunk that normally borders the + end of the heap (i.e., the high end of the virtual address space's data segment). */ lua_pushinteger(L, info.keepcost); lua_setfield(L, -2, "returnable"); return 1;
