msg/Dispatcher: pass const Message* to ms_can_fast_dispatch

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc
index 919d355d50f783442153e68369e3b90e146b6ca2..263e81f85b483e6d03119fdc360a565e0e8baf62 100644 (file)
--- a/src/msg/DispatchQueue.cc
+++ b/src/msg/DispatchQueue.cc
@@ -60,7 +60,7 @@ void DispatchQueue::post_dispatch(Message *m, uint64_t msize)
   ldout(cct,20) << "done calling dispatch on " << m << dendl;
 }
 
-bool DispatchQueue::can_fast_dispatch(Message *m) const
+bool DispatchQueue::can_fast_dispatch(const Message *m) const
 {
   return msgr->ms_can_fast_dispatch(m);
 }

diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h
index a331739c4c1fe145cb8b0062c082778e713eb16d..b4366cef489ee436e0ce1ea44f6f0472a8420774 100644 (file)
--- a/src/msg/DispatchQueue.h
+++ b/src/msg/DispatchQueue.h
@@ -195,7 +195,7 @@ class DispatchQueue {
     cond.Signal();
   }
 
-  bool can_fast_dispatch(Message *m) const;
+  bool can_fast_dispatch(const Message *m) const;
   void fast_dispatch(Message *m);
   void fast_preprocess(Message *m);
   void enqueue(Message *m, int priority, uint64_t id);

diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h
index 48d1dfc28f5708eb2b3a595e0b58260272a78d62..5af27ea17f389ed62ac7e0d2959c16dd0f1212e3 100644 (file)
--- a/src/msg/Dispatcher.h
+++ b/src/msg/Dispatcher.h
@@ -59,7 +59,7 @@ public:
    * @param m The message we want to fast dispatch.
    * @returns True if the message can be fast dispatched; false otherwise.
    */
-  virtual bool ms_can_fast_dispatch(Message *m) const { return false;}
+  virtual bool ms_can_fast_dispatch(const Message *m) const { return false;}
   /**
    * This function determines if a dispatcher is included in the
    * list of fast-dispatch capable Dispatchers.

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 6d08c169847c62bc98a096793e8bf3c0a00072c9..6331fcf0e42eadbc9efbeac5778daead8254d2f6 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -547,7 +547,7 @@ public:
    *
    * @param m The Message we are testing.
    */
-  bool ms_can_fast_dispatch(Message *m) {
+  bool ms_can_fast_dispatch(const Message *m) {
     for (list<Dispatcher*>::iterator p = fast_dispatchers.begin();
         p != fast_dispatchers.end();
         ++p) {

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 31de193e19e8604099e645154433005e89f40cd7..8b4a2085517af5506805fa3bbd40428dcb00f704 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1694,7 +1694,7 @@ public:
     explicit HeartbeatDispatcher(OSD *o) : Dispatcher(o->cct), osd(o) {}
 
     bool ms_can_fast_dispatch_any() const { return true; }
-    bool ms_can_fast_dispatch(Message *m) const {
+    bool ms_can_fast_dispatch(const Message *m) const override {
       switch (m->get_type()) {
        case CEPH_MSG_PING:
        case MSG_OSD_PING:
@@ -2372,7 +2372,7 @@ protected:
 
  private:
   bool ms_can_fast_dispatch_any() const { return true; }
-  bool ms_can_fast_dispatch(Message *m) const {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_OSD_OP:
     case CEPH_MSG_OSD_BACKOFF:

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 68d15db818b3fc29886aeece654063fc5a169831..3942349adcff3880209aace990cf2df625de6df2 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -2003,7 +2003,7 @@ private:
   bool ms_can_fast_dispatch_any() const {
     return true;
   }
-  bool ms_can_fast_dispatch(Message *m) const {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_OSD_OPREPLY:
     case CEPH_MSG_WATCH_NOTIFY:

diff --git a/src/test/msgr/perf_msgr_client.cc b/src/test/msgr/perf_msgr_client.cc
index da66e2478b49064fcd5acb0be3650574cd8891b0..8da71c5ad04e6967d3ddf7d63cf6ba9699b33277 100644 (file)
--- a/src/test/msgr/perf_msgr_client.cc
+++ b/src/test/msgr/perf_msgr_client.cc
@@ -39,7 +39,7 @@ class MessengerClient {
    public:
     ClientDispatcher(uint64_t delay, ClientThread *t): Dispatcher(g_ceph_context), think_time(delay), thread(t) {}
     bool ms_can_fast_dispatch_any() const override { return true; }
-    bool ms_can_fast_dispatch(Message *m) const override {
+    bool ms_can_fast_dispatch(const Message *m) const override {
       switch (m->get_type()) {
       case CEPH_MSG_OSD_OPREPLY:
         return true;

diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc
index 8ce3acb85b3966c42929cc52709fc01e7aa2fb7a..2d428386ecb90a55dac761ed4dfc8c95ebeae526 100644 (file)
--- a/src/test/msgr/perf_msgr_server.cc
+++ b/src/test/msgr/perf_msgr_server.cc
@@ -79,7 +79,7 @@ class ServerDispatcher : public Dispatcher {
     op_tp.stop();
   }
   bool ms_can_fast_dispatch_any() const override { return true; }
-  bool ms_can_fast_dispatch(Message *m) const override {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_OSD_OP:
       return true;

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index 71017f41ee641f32a07c2f2cda8e07c09f93eb7c..fdda005e267a16442378173df02d1f21e67488ba 100644 (file)
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -103,7 +103,7 @@ class FakeDispatcher : public Dispatcher {
                           is_server(s), got_new(false), got_remote_reset(false),
                           got_connect(false), loopback(false) {}
   bool ms_can_fast_dispatch_any() const override { return true; }
-  bool ms_can_fast_dispatch(Message *m) const override {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_PING:
       return true;
@@ -814,7 +814,7 @@ class SyntheticDispatcher : public Dispatcher {
       Dispatcher(g_ceph_context), lock("SyntheticDispatcher::lock"), is_server(s), got_new(false),
       got_remote_reset(false), got_connect(false), index(0), workload(wl) {}
   bool ms_can_fast_dispatch_any() const override { return true; }
-  bool ms_can_fast_dispatch(Message *m) const override {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_PING:
     case MSG_COMMAND:
@@ -1374,7 +1374,7 @@ class MarkdownDispatcher : public Dispatcher {
   explicit MarkdownDispatcher(bool s): Dispatcher(g_ceph_context), lock("MarkdownDispatcher::lock"),
                               last_mark(false), count(0) {}
   bool ms_can_fast_dispatch_any() const override { return false; }
-  bool ms_can_fast_dispatch(Message *m) const override {
+  bool ms_can_fast_dispatch(const Message *m) const override {
     switch (m->get_type()) {
     case CEPH_MSG_PING:
       return true;