common: drop ::length() from other implementations of the OpQueue.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/common/mClockPriorityQueue.h b/src/common/mClockPriorityQueue.h
index d36ea202bad6388d7a5c1f95f45e2b08ccb01686..9b96d5010c4ac0a96b9d764367d0ec06308dec4d 100644 (file)
--- a/src/common/mClockPriorityQueue.h
+++ b/src/common/mClockPriorityQueue.h
@@ -42,9 +42,8 @@ namespace ceph {
 
     typedef std::list<std::pair<cost_t, T> > ListPairs;
 
-    static unsigned filter_list_pairs(ListPairs *l,
-                                     std::function<bool (T&&)> f) {
-      unsigned ret = 0;
+    static void filter_list_pairs(ListPairs *l,
+                                 std::function<bool (T&&)> f) {
       for (typename ListPairs::iterator i = l->end();
           i != l->begin();
           /* no inc */
@@ -52,13 +51,11 @@ namespace ceph {
        auto next = i;
        --next;
        if (f(std::move(next->second))) {
-         ++ret;
          l->erase(next);
        } else {
          i = next;
        }
       }
-      return ret;
     }
 
     struct SubQueue {
@@ -68,7 +65,6 @@ namespace ceph {
       Classes q;
 
       unsigned tokens, max_tokens;
-      int64_t size; // XXX: this is only for the sake of dump().
 
       typename Classes::iterator cur;
 
@@ -78,13 +74,12 @@ namespace ceph {
        : q(other.q),
          tokens(other.tokens),
          max_tokens(other.max_tokens),
-         size(other.size),
          cur(q.begin()) {}
 
       SubQueue()
        : tokens(0),
          max_tokens(0),
-         size(0), cur(q.begin()) {}
+         cur(q.begin()) {}
 
       void set_max_tokens(unsigned mt) {
        max_tokens = mt;
@@ -117,14 +112,12 @@ namespace ceph {
        q[cl].emplace_back(cost, std::move(item));
        if (cur == q.end())
          cur = q.begin();
-       size++;
       }
 
       void enqueue_front(K cl, cost_t cost, T&& item) {
        q[cl].emplace_front(cost, std::move(item));
        if (cur == q.end())
          cur = q.begin();
-       size++;
       }
 
       const std::pair<cost_t, T>& front() const {
@@ -153,12 +146,14 @@ namespace ceph {
        if (cur == q.end()) {
          cur = q.begin();
        }
-       size--;
       }
 
-      unsigned length() const {
-       ceph_assert(size >= 0);
-       return (unsigned)size;
+      unsigned get_size_slow() const {
+       unsigned count = 0;
+       for (const auto& cls : q) {
+         count += cls.second.size();
+       }
+       return count;
       }
 
       bool empty() const {
@@ -169,7 +164,7 @@ namespace ceph {
        for (typename Classes::iterator i = q.begin();
             i != q.end();
             /* no-inc */) {
-         size -= filter_list_pairs(&(i->second), f);
+         filter_list_pairs(&(i->second), f);
          if (i->second.empty()) {
            if (cur == i) {
              ++cur;
@@ -187,7 +182,6 @@ namespace ceph {
        if (i == q.end()) {
          return;
        }
-       size -= i->second.size();
        if (i == cur) {
          ++cur;
        }
@@ -201,7 +195,7 @@ namespace ceph {
       }
 
       void dump(ceph::Formatter *f) const {
-       f->dump_int("size", length());
+       f->dump_int("size", get_size_slow());
        f->dump_int("num_keys", q.size());
       }
     };
@@ -229,14 +223,13 @@ namespace ceph {
       // empty
     }
 
-    // XXX: used only by the unitest?
-    unsigned length() const {
+    unsigned get_size_slow() const {
       unsigned total = 0;
       total += queue_front.size();
       total += queue.request_count();
       for (auto i = high_queue.cbegin(); i != high_queue.cend(); ++i) {
-       ceph_assert(i->second.length());
-       total += i->second.length();
+       ceph_assert(i->second.get_size_slow());
+       total += i->second.get_size_slow();
       }
       return total;
     }

diff --git a/src/osd/mClockClientQueue.h b/src/osd/mClockClientQueue.h
index 7b1e494a3f5462bca0cafa6891c2d7c38d602713..84454ff6bd0504dbd96bf8d42f792f0aaa29710f 100644 (file)
--- a/src/osd/mClockClientQueue.h
+++ b/src/osd/mClockClientQueue.h
@@ -53,6 +53,10 @@ namespace ceph {
 
     const crimson::dmclock::ClientInfo* op_class_client_info_f(const InnerClient& client);
 
+    inline unsigned get_size_slow() const {
+      return queue.get_size_slow();
+    }
+
     // Ops of this priority should be deleted immediately
     inline void remove_by_class(Client cl,
                                std::list<Request> *out) override final {

diff --git a/src/osd/mClockOpClassQueue.h b/src/osd/mClockOpClassQueue.h
index c2ec06aa417b7b5331340770d683c2ace8b5e913..f7d592836249a3bdf684d4b6763809e23d2d8cf7 100644 (file)
--- a/src/osd/mClockOpClassQueue.h
+++ b/src/osd/mClockOpClassQueue.h
@@ -52,6 +52,10 @@ namespace ceph {
     const crimson::dmclock::ClientInfo*
     op_class_client_info_f(const osd_op_type_t& op_type);
 
+    inline unsigned get_size_slow() const {
+      return queue.get_size_slow();
+    }
+
     // Ops of this priority should be deleted immediately
     inline void remove_by_class(Client cl,
                                std::list<Request> *out) override final {

diff --git a/src/test/common/test_mclock_priority_queue.cc b/src/test/common/test_mclock_priority_queue.cc
index 4cdcaace4ce76b803eae5951f748d41156ca2647..8e8bcdf38cf2b6dba3219e20bd58c832c941ae1b 100644 (file)
--- a/src/test/common/test_mclock_priority_queue.cc
+++ b/src/test/common/test_mclock_priority_queue.cc
@@ -66,7 +66,7 @@ TEST(mClockPriorityQueue, Sizes)
   ceph::mClockQueue<Request,Client> q(&client_info_func);
 
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 
   Client c1(1);
   Client c2(2);
@@ -79,7 +79,7 @@ TEST(mClockPriorityQueue, Sizes)
   q.enqueue_strict(c2, 1, Request(6));
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(6u, q.length());
+  ASSERT_EQ(6u, q.get_size_slow());
 
 
   for (int i = 0; i < 6; ++i) {
@@ -87,7 +87,7 @@ TEST(mClockPriorityQueue, Sizes)
   }
 
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 }
 
 
@@ -260,11 +260,11 @@ TEST(mClockPriorityQueue, RemoveByClass)
     out.pop_front();
   }
 
-  ASSERT_EQ(6u, q.length()) << "after removal of three from client c2";
+  ASSERT_EQ(6u, q.get_size_slow()) << "after removal of three from client c2";
 
   q.remove_by_class(c3);
 
-  ASSERT_EQ(3u, q.length()) << "after removal of three from client c3";
+  ASSERT_EQ(3u, q.get_size_slow()) << "after removal of three from client c3";
   while (!q.empty()) {
     Request r = q.dequeue();
     ASSERT_TRUE((r.value & in_mask) > 0) <<
@@ -310,7 +310,7 @@ TEST(mClockPriorityQueue, RemoveByFilter)
     filtered.pop_front();
   }
 
-  ASSERT_EQ(5u, q.length()) <<
+  ASSERT_EQ(5u, q.get_size_slow()) <<
     "filter should have left five remaining elements";
   while (!q.empty()) {
     Request r = q.dequeue();

diff --git a/src/test/osd/TestMClockClientQueue.cc b/src/test/osd/TestMClockClientQueue.cc
index 7fb6aabe27e1d9619cb2cf3f30344dd12d584b35..70e054c7b933feccd53bf8437f81580102b3fa67 100644 (file)
--- a/src/test/osd/TestMClockClientQueue.cc
+++ b/src/test/osd/TestMClockClientQueue.cc
@@ -64,7 +64,7 @@ public:
 
 TEST_F(MClockClientQueueTest, TestSize) {
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 
   q.enqueue(client1, 12, 1u, create_snaptrim(100, client1));
   q.enqueue_strict(client2, 12, create_snaptrim(101, client2));
@@ -73,7 +73,7 @@ TEST_F(MClockClientQueueTest, TestSize) {
   q.enqueue(client1, 12, 1u, create_snaptrim(104, client1));
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(5u, q.length());
+  ASSERT_EQ(5u, q.get_size_slow());
 
   std::list<Request> reqs;
 
@@ -82,7 +82,7 @@ TEST_F(MClockClientQueueTest, TestSize) {
   reqs.push_back(q.dequeue());
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(2u, q.length());
+  ASSERT_EQ(2u, q.get_size_slow());
 
   q.enqueue_front(client2, 12, 1u, std::move(reqs.back()));
   reqs.pop_back();
@@ -94,14 +94,14 @@ TEST_F(MClockClientQueueTest, TestSize) {
   reqs.pop_back();
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(5u, q.length());
+  ASSERT_EQ(5u, q.get_size_slow());
 
   for (int i = 0; i < 5; ++i) {
     (void) q.dequeue();
   }
 
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 }
 
 
@@ -172,7 +172,7 @@ TEST_F(MClockClientQueueTest, TestRemoveByClass) {
     filtered_out.pop_front();
   }
 
-  ASSERT_EQ(3u, q.length());
+  ASSERT_EQ(3u, q.get_size_slow());
   Request r = q.dequeue();
   ASSERT_EQ(103u, r.get_map_epoch());
 

diff --git a/src/test/osd/TestMClockOpClassQueue.cc b/src/test/osd/TestMClockOpClassQueue.cc
index 1c9329cfdfa431e7c16d6cf014b3279d1083bad8..932066979babe8a64f0b0a18ff407e29b5addacc 100644 (file)
--- a/src/test/osd/TestMClockOpClassQueue.cc
+++ b/src/test/osd/TestMClockOpClassQueue.cc
@@ -66,7 +66,7 @@ public:
 
 TEST_F(MClockOpClassQueueTest, TestSize) {
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 
   q.enqueue(client1, 12, 0, create_snaptrim(100, client1));
   q.enqueue_strict(client2, 12, create_snaptrim(101, client2));
@@ -75,7 +75,7 @@ TEST_F(MClockOpClassQueueTest, TestSize) {
   q.enqueue(client1, 12, 0, create_snaptrim(104, client1));
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(5u, q.length());
+  ASSERT_EQ(5u, q.get_size_slow());
 
   std::list<Request> reqs;
 
@@ -84,7 +84,7 @@ TEST_F(MClockOpClassQueueTest, TestSize) {
   reqs.push_back(q.dequeue());
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(2u, q.length());
+  ASSERT_EQ(2u, q.get_size_slow());
 
   q.enqueue_front(client2, 12, 0, std::move(reqs.back()));
   reqs.pop_back();
@@ -96,14 +96,14 @@ TEST_F(MClockOpClassQueueTest, TestSize) {
   reqs.pop_back();
 
   ASSERT_FALSE(q.empty());
-  ASSERT_EQ(5u, q.length());
+  ASSERT_EQ(5u, q.get_size_slow());
 
   for (int i = 0; i < 5; ++i) {
     (void) q.dequeue();
   }
 
   ASSERT_TRUE(q.empty());
-  ASSERT_EQ(0u, q.length());
+  ASSERT_EQ(0u, q.get_size_slow());
 }
 
 
@@ -172,7 +172,7 @@ TEST_F(MClockOpClassQueueTest, TestRemoveByClass) {
     filtered_out.pop_front();
   }
 
-  ASSERT_EQ(3u, q.length());
+  ASSERT_EQ(3u, q.get_size_slow());
   Request r = q.dequeue();
   ASSERT_EQ(103u, r.get_map_epoch());