tcmalloc: warn if you try and dump without the profiler running.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
index 3c4d6f155b5..aead1cf89f0 100644
--- a/src/perfglue/heap_profiler.cc
+++ b/src/perfglue/heap_profiler.cc
@@ -79,11 +79,15 @@ void ceph_heap_profiler_handle_command(const std::vector<std::string>& cmd,
                                        LogClient &clog)
 {
   if (cmd.size() == 2 && cmd[1] == "dump") {
-    char *heap_stats = new char[1024];
-    ceph_heap_profiler_stats(heap_stats, 1024);
-    clog.info() << g_conf.name << "dumping heap profile now.\n"
-        << heap_stats << std::endl;
-    ceph_heap_profiler_dump("admin request");
+    if (!ceph_heap_profiler_running())
+      clog.info() << "heap profiler not running; can't dump!\n";
+    else {
+      char *heap_stats = new char[1024];
+      ceph_heap_profiler_stats(heap_stats, 1024);
+      clog.info() << g_conf.name << "dumping heap profile now.\n"
+          << heap_stats << std::endl;
+      ceph_heap_profiler_dump("admin request");
+    }
   } else if (cmd.size() == 2 && cmd[1] == "export_config") {
     char val[sizeof(int)*8+1];
     snprintf(val, sizeof(val), "%i", g_conf.profiler_allocation_interval);