mon: constify functions needed to use dout from a const function

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d1532f31079560d21a2b90563b65b265c922e1a5..3cfc46ade0866413d7978ef4edf86bf4dc66d981 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -73,7 +73,7 @@
 #define DOUT_SUBSYS mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, this)
-static ostream& _prefix(std::ostream *_dout, Monitor *mon) {
+static ostream& _prefix(std::ostream *_dout, const Monitor *mon) {
   return *_dout << "mon." << mon->name << "@" << mon->rank
                << "(" << mon->get_state_name() << ") e" << mon->monmap->get_epoch() << " ";
 }

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 6d0ed691c39dbb321a58afdc45c1a58598dde9eb..8147a8ccbb5caca36dfe304d4f8da4d93705b3b0 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -145,7 +145,7 @@ public:
     default: return "???";
     }
   }
-  const char *get_state_name() {
+  const char *get_state_name() const {
     return get_state_name(state);
   }
 

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index e2fb70621a4285a1b5a9befa3836a1dd754616c9..6016e9e8a4d44b34f2e9c024c93f8ad760541693 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -44,7 +44,7 @@
 #define DOUT_SUBSYS mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, pg_map)
-static ostream& _prefix(std::ostream *_dout, Monitor *mon, PGMap& pg_map) {
+static ostream& _prefix(std::ostream *_dout, const Monitor *mon, const PGMap& pg_map) {
   return *_dout << "mon." << mon->name << "@" << mon->rank
                << "(" << mon->get_state_name()
                << ").pg v" << pg_map.version << " ";