From 6d4317c4e23171219f825163d01cd896fee3d1f5 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 6 Sep 2015 12:28:09 +0200
Subject: [PATCH] Annotate mallinfo status for command server-status

---
 src/http_command.c |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/http_command.c b/src/http_command.c
index 4123ccc..4a05abd 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -49,18 +49,27 @@ void print_meminfo(WRBUF wrbuf)
     struct mallinfo minfo;
     minfo = mallinfo();
     wrbuf_printf(wrbuf, "  <memory>\n"
-                        "   <arena>%d</arena>\n"
-                        "   <uordblks>%d</uordblks>\n"
-                        "   <fordblks>%d</fordblks>\n"
-                        "   <ordblks>%d</ordblks>\n"
-                        "   <keepcost>%d</keepcost>\n"
-                        "   <hblks>%d</hblks>\n"
-                        "   <hblkhd>%d</hblkhd>\n"
-                        "   <virt>%d</virt>\n"
-                        "   <virtuse>%d</virtuse>\n"
-                        "  </memory>\n",
-                 minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
-
+                 "    <arena>%d</arena><!--  Non-mmapped space allocated (bytes) -->\n"
+                 "    <ordblks>%d</ordblks><!--  Number of free chunks -->\n"
+                 "    <smblks>%d</smblks><!--  Number of free fastbin blocks -->\n"
+                 "    <hblks>%d</hblks><!--  Number of mmapped regions -->\n"
+                 "    <hblkhd>%d</hblkhd><!--  Space allocated in mmapped regions (bytes) -->\n"
+                 "    <usmblks>%d</usmblks><!--  Maximum total allocated space (bytes) -->\n"
+                 "    <fsmblks>%d</fsmblks><!--  Space in freed fastbin blocks (bytes) -->\n"
+                 "    <uordblks>%d</uordblks><!--  Total allocated space (bytes) -->\n"
+                 "    <fordblks>%d</fordblks><!--  Total free space (bytes) -->\n"
+                 "    <keepcost>%d</keepcost><!-- Top-most, releasable space (bytes) -->\n"
+                 "  </memory>\n",
+                 minfo.arena,
+                 minfo.ordblks,
+                 minfo.smblks,
+                 minfo.hblks,
+                 minfo.hblkhd,
+                 minfo.usmblks,
+                 minfo.fsmblks,
+                 minfo.uordblks,
+                 minfo.fordblks,
+                 minfo.keepcost);
 }
 #else
 #define print_meminfo(x)
-- 
1.7.10.4