log: uninline SubsystemMap mutators

This lets you do something like

 p g_ceph_context->_conf->subsys.set_log_level(ceph_subsys_mon, 20)

from gdb.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/Makefile.am b/src/Makefile.am
index 18323dcaa3f935699aff8e46706f4dc97912e599..9ac4f2f406e69fc9ad2ef781d85af682d7f8a8ba 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1010,6 +1010,7 @@ libcommon_files = \
        json_spirit/json_spirit_writer.cpp \
        json_spirit/json_spirit_value.cpp \
        log/Log.cc \
+       log/SubsystemMap.cc \
        mon/MonCaps.cc \
        mon/MonClient.cc \
        mon/MonMap.cc \

diff --git a/src/log/SubsystemMap.h b/src/log/SubsystemMap.h
index 31233e0e1c622b4b2ff79c1e764f82ec3cf70710..70f1246ebe74ee6943e9190ec5bed31c4e7ebf1c 100644 (file)
--- a/src/log/SubsystemMap.h
+++ b/src/log/SubsystemMap.h
@@ -7,6 +7,8 @@
 #include <string>
 #include <vector>
 
+#include "include/assert.h"
+
 namespace ceph {
 namespace log {
 
@@ -32,25 +34,9 @@ public:
     return m_max_name_len;
   }
 
-  void add(unsigned subsys, string name, int log, int gather) {
-    if (subsys >= m_subsys.size())
-      m_subsys.resize(subsys + 1);
-    m_subsys[subsys].name = name;
-    m_subsys[subsys].log_level = log;
-    m_subsys[subsys].gather_level = gather;
-    if (name.length() > m_max_name_len)
-      m_max_name_len = name.length();
-  }
-  
-  void set_log_level(unsigned subsys, int log) {
-    assert(subsys < m_subsys.size());
-    m_subsys[subsys].log_level = log;
-  }
-
-  void set_gather_level(unsigned subsys, int gather) {
-    assert(subsys < m_subsys.size());
-    m_subsys[subsys].gather_level = gather;
-  }
+  void add(unsigned subsys, std::string name, int log, int gather);  
+  void set_log_level(unsigned subsys, int log);
+  void set_gather_level(unsigned subsys, int gather);
 
   int get_log_level(unsigned subsys) const {
     if (subsys >= m_subsys.size())
@@ -64,7 +50,7 @@ public:
     return m_subsys[subsys].gather_level;
   }
 
-  const string& get_name(unsigned subsys) const {
+  const std::string& get_name(unsigned subsys) const {
     if (subsys >= m_subsys.size())
       subsys = 0;
     return m_subsys[subsys].name;