osd: update mClock.*Queue to incorporate the changes on dmclock

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/osd/mClockClientQueue.cc b/src/osd/mClockClientQueue.cc
index 31ce375e35496eedcd6d9e7808ffac2148e37ba3..a56bf1d5ecd52febe55f185c2694eb7dfd68697d 100644 (file)
--- a/src/osd/mClockClientQueue.cc
+++ b/src/osd/mClockClientQueue.cc
@@ -58,24 +58,24 @@ namespace ceph {
   }
 
 
-  dmc::ClientInfo
+  const dmc::ClientInfo*
   mClockClientQueue::op_class_client_info_f(
     const mClockClientQueue::InnerClient& client)
   {
     switch(client.second) {
     case osd_op_type_t::client_op:
-      return mclock_op_tags->client_op;
+      return &mclock_op_tags->client_op;
     case osd_op_type_t::osd_subop:
-      return mclock_op_tags->osd_subop;
+      return &mclock_op_tags->osd_subop;
     case osd_op_type_t::bg_snaptrim:
-      return mclock_op_tags->snaptrim;
+      return &mclock_op_tags->snaptrim;
     case osd_op_type_t::bg_recovery:
-      return mclock_op_tags->recov;
+      return &mclock_op_tags->recov;
     case osd_op_type_t::bg_scrub:
-      return mclock_op_tags->scrub;
+      return &mclock_op_tags->scrub;
     default:
       assert(0);
-      return dmc::ClientInfo(-1, -1, -1);
+      return nullptr;
     }
   }
 

diff --git a/src/osd/mClockClientQueue.h b/src/osd/mClockClientQueue.h
index 42bb175f7a06c76a2e8f457339adcb703398e75b..b51bf7546c7a6f1115e936e9e257321d4e9786e2 100644 (file)
--- a/src/osd/mClockClientQueue.h
+++ b/src/osd/mClockClientQueue.h
@@ -62,7 +62,7 @@ namespace ceph {
 
     mClockClientQueue(CephContext *cct);
 
-    static crimson::dmclock::ClientInfo
+    static const crimson::dmclock::ClientInfo*
     op_class_client_info_f(const InnerClient& client);
 
     inline unsigned length() const override final {

diff --git a/src/osd/mClockOpClassQueue.cc b/src/osd/mClockOpClassQueue.cc
index 743c7e367257dffe943b045283262832d485238e..e8d28b7f594e8552f44750f92a06f7192044d1b1 100644 (file)
--- a/src/osd/mClockOpClassQueue.cc
+++ b/src/osd/mClockOpClassQueue.cc
@@ -58,22 +58,22 @@ namespace ceph {
   }
 
 
-  dmc::ClientInfo
+  const dmc::ClientInfo*
   mClockOpClassQueue::op_class_client_info_f(const osd_op_type_t& op_type) {
     switch(op_type) {
     case osd_op_type_t::client_op:
-      return mclock_op_tags->client_op;
+      return &mclock_op_tags->client_op;
     case osd_op_type_t::osd_subop:
-      return mclock_op_tags->osd_subop;
+      return &mclock_op_tags->osd_subop;
     case osd_op_type_t::bg_snaptrim:
-      return mclock_op_tags->snaptrim;
+      return &mclock_op_tags->snaptrim;
     case osd_op_type_t::bg_recovery:
-      return mclock_op_tags->recov;
+      return &mclock_op_tags->recov;
     case osd_op_type_t::bg_scrub:
-      return mclock_op_tags->scrub;
+      return &mclock_op_tags->scrub;
     default:
       assert(0);
-      return dmc::ClientInfo(-1, -1, -1);
+      return nullptr;
     }
   }
 

diff --git a/src/osd/mClockOpClassQueue.h b/src/osd/mClockOpClassQueue.h
index de9757f6354cbfcc59f227a2d43c0566d5816176..7a2cc6905f77bdc05b8e49ba1e1543776f5ac5b8 100644 (file)
--- a/src/osd/mClockOpClassQueue.h
+++ b/src/osd/mClockOpClassQueue.h
@@ -60,7 +60,7 @@ namespace ceph {
 
     mClockOpClassQueue(CephContext *cct);
 
-    static crimson::dmclock::ClientInfo
+    static const crimson::dmclock::ClientInfo*
     op_class_client_info_f(const osd_op_type_t& op_type);
 
     inline unsigned length() const override final {

diff --git a/src/test/common/test_mclock_priority_queue.cc b/src/test/common/test_mclock_priority_queue.cc
index 3ffb2e174dcd3b7233a4fdee1a406810b990b943..3db94d8a56fda6c5f781ac1d888190e7c194efd0 100644 (file)
--- a/src/test/common/test_mclock_priority_queue.cc
+++ b/src/test/common/test_mclock_priority_queue.cc
@@ -48,10 +48,10 @@ struct Client {
 };
 
 
-crimson::dmclock::ClientInfo client_info_func(const Client& c) {
+const crimson::dmclock::ClientInfo* client_info_func(const Client& c) {
   static const crimson::dmclock::ClientInfo
     the_info(10.0, 10.0, 10.0);
-  return the_info;
+  return &the_info;
 }