mem: gather meminfo stats

diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc
index 0acd854d66d254e744b68acb0bc96d4c16378cd6..423778e517c3aa25ce0b156b5a7446ccade4191a 100644 (file)
--- 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 9092b354f5f658120d572399cadf44fefb456648..509b7d9b364634f14d1e8b6a66e8384a62fc2152 100644 (file)
--- 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 5aa469661cba43f5be3688e6c9a2338f07752617..22666206ea6a509c1fa2d49d4a83f632137b94bc 100644 (file)
--- 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