From 7ba48458ee5dc0b32beee350a804d561ee6439df Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 20 Apr 2009 10:22:25 -0700
Subject: [PATCH] mem: gather meminfo stats

---
 src/common/MemoryModel.cc | 18 ++++++++++++++++++
 src/common/MemoryModel.h  |  2 +-
 src/mds/MDCache.cc        |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc
index 0acd854d66d25..423778e517c3a 100644
--- a/src/common/MemoryModel.cc
+++ b/src/common/MemoryModel.cc
@@ -79,4 +79,22 @@ void MemoryModel::_sample(snap *psnap)
   }
 
   psnap->heap = heap >> 10;
+
+  // ...
+  struct mallinfo mi = mallinfo();
+  
+  psnap->malloc = mi.uordblks >> 10;
+  psnap->mmap = mi.hblks >> 10;
+  
+
+  ofstream log("/tmp/memlog", ios::app);
+  log << "heap " << heap
+      << "\trss " << psnap->rss
+      << "\tmi\t" << mi.arena
+      << "\t" << mi.ordblks
+      << "\t" << mi.uordblks / 1024
+      << "\t" << mi.fordblks / 1024
+      << "\t" << mi.hblks 
+      << "\t" << mi.hblkhd / 1024
+      << std::endl;
 }
diff --git a/src/common/MemoryModel.h b/src/common/MemoryModel.h
index 9092b354f5f65..509b7d9b36463 100644
--- a/src/common/MemoryModel.h
+++ b/src/common/MemoryModel.h
@@ -25,7 +25,7 @@ public:
     int data;
     int lib;
     
-    int heap;
+    int heap, malloc, mmap;
 
     int get_total() { return size; }
     int get_rss() { return rss; }
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 5aa469661cba4..22666206ea6a5 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5095,10 +5095,11 @@ void MDCache::check_memory_usage()
   float caps_per_inode = (float)num_caps / (float)inode_map.size();
   //float cap_rate = (float)num_inodes_with_caps / (float)inode_map.size();
 
-  dout(10) << "check_memory_usage"
+  dout(0) << "check_memory_usage"
 	   << " total " << last.get_total()
 	   << ", rss " << last.get_rss()
 	   << ", heap " << last.get_heap()
+	   << ", malloc " << last.malloc << " mmap " << last.mmap
 	   << ", baseline " << baseline.get_heap()
 	   << ", buffers " << (buffer_total_alloc.test() >> 10)
 	   << ", max " << g_conf.mds_mem_max
-- 
2.39.5