os/bluestore/StupidAllocator: use btree_map<> instead of map<>

btree_map uses about half the memory.  According to the cpp-btree docs they
are also faster than STL maps... especially when they get big.

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

diff --git a/src/os/bluestore/StupidAllocator.cc b/src/os/bluestore/StupidAllocator.cc
index d96e945569420ab76e2d95121ef8573e655f74d8..4c4f395034f057031ef356f59b9453a2040248ea 100644 (file)
--- a/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc
@@ -73,7 +73,7 @@ void StupidAllocator::unreserve(uint64_t unused)
 }
 
 /// return the effective length of the extent if we align to alloc_unit
-static uint64_t aligned_len(interval_set<uint64_t>::iterator p,
+static uint64_t aligned_len(btree_interval_set<uint64_t>::iterator p,
                            uint64_t alloc_unit)
 {
   uint64_t skew = p.get_start() % alloc_unit;
@@ -98,7 +98,7 @@ int StupidAllocator::allocate(
   int bin = _choose_bin(want);
   int orig_bin = bin;
 
-  interval_set<uint64_t>::iterator p = free[0].begin();
+  auto p = free[0].begin();
 
   if (!hint)
     hint = last_alloc;
@@ -223,7 +223,7 @@ void StupidAllocator::dump(ostream& out)
   for (unsigned bin = 0; bin < free.size(); ++bin) {
     dout(30) << __func__ << " free bin " << bin << ": "
             << free[bin].num_intervals() << " extents" << dendl;
-    for (interval_set<uint64_t>::iterator p = free[bin].begin();
+    for (auto p = free[bin].begin();
         p != free[bin].end();
         ++p) {
       dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
@@ -231,14 +231,14 @@ void StupidAllocator::dump(ostream& out)
   }
   dout(30) << __func__ << " committing: "
           << committing.num_intervals() << " extents" << dendl;
-  for (interval_set<uint64_t>::iterator p = committing.begin();
+  for (auto p = committing.begin();
        p != committing.end();
        ++p) {
     dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
   }
   dout(30) << __func__ << " uncommitted: "
           << uncommitted.num_intervals() << " extents" << dendl;
-  for (interval_set<uint64_t>::iterator p = uncommitted.begin();
+  for (auto p = uncommitted.begin();
        p != uncommitted.end();
        ++p) {
     dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
@@ -257,10 +257,10 @@ void StupidAllocator::init_rm_free(uint64_t offset, uint64_t length)
 {
   Mutex::Locker l(lock);
   dout(10) << __func__ << " " << offset << "~" << length << dendl;
-  interval_set<uint64_t> rm;
+  btree_interval_set<uint64_t> rm;
   rm.insert(offset, length);
   for (unsigned i = 0; i < free.size() && !rm.empty(); ++i) {
-    interval_set<uint64_t> overlap;
+    btree_interval_set<uint64_t> overlap;
     overlap.intersection_of(rm, free[i]);
     if (!overlap.empty()) {
       dout(20) << __func__ << " bin " << i << " rm " << overlap << dendl;
@@ -295,7 +295,7 @@ void StupidAllocator::commit_finish()
   Mutex::Locker l(lock);
   dout(10) << __func__ << " released " << num_committing
           << " in extents " << committing.num_intervals() << dendl;
-  for (interval_set<uint64_t>::iterator p = committing.begin();
+  for (auto p = committing.begin();
        p != committing.end();
        ++p) {
     _insert_free(p.get_start(), p.get_len());

diff --git a/src/os/bluestore/StupidAllocator.h b/src/os/bluestore/StupidAllocator.h
index ec71b863df192f24de741f8d6f7af5dc98e7bbd4..e5cf17d1006694d4cb11d3c30c4d03c3e3b133b3 100644 (file)
--- a/src/os/bluestore/StupidAllocator.h
+++ b/src/os/bluestore/StupidAllocator.h
@@ -5,7 +5,7 @@
 #define CEPH_OS_BLUESTORE_STUPIDALLOCATOR_H
 
 #include "Allocator.h"
-#include "include/interval_set.h"
+#include "include/btree_interval_set.h"
 #include "common/Mutex.h"
 
 class StupidAllocator : public Allocator {
@@ -16,9 +16,9 @@ class StupidAllocator : public Allocator {
   int64_t num_committing;
   int64_t num_reserved; ///< reserved bytes
 
-  vector<interval_set<uint64_t> > free;        ///< leading-edge copy
-  interval_set<uint64_t> uncommitted; ///< released but not yet usable
-  interval_set<uint64_t> committing;  ///< released but not yet usable
+  std::vector<btree_interval_set<uint64_t> > free;        ///< leading-edge copy
+  btree_interval_set<uint64_t> uncommitted; ///< released but not yet usable
+  btree_interval_set<uint64_t> committing;  ///< released but not yet usable
 
   uint64_t last_alloc;
 
@@ -44,7 +44,7 @@ public:
 
   uint64_t get_free();
 
-  void dump(ostream& out);
+  void dump(std::ostream& out);
 
   void init_add_free(uint64_t offset, uint64_t length);
   void init_rm_free(uint64_t offset, uint64_t length);