os/bluestore/StupidAllocator: use hex for debug

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

diff --git a/src/os/bluestore/StupidAllocator.cc b/src/os/bluestore/StupidAllocator.cc
index 9330860c4320ec932d4a72d6e2e60081a53b10ec..1f40ae1504c3427bc2cbaff6b2ad9c81a394750b 100644 (file)
--- a/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc
@@ -27,21 +27,23 @@ unsigned StupidAllocator::_choose_bin(uint64_t orig_len)
 {
   uint64_t len = orig_len / g_conf->bdev_block_size;
   int bin = std::min((int)cbits(len), (int)free.size() - 1);
-  dout(30) << __func__ << " len " << orig_len << " -> " << bin << dendl;
+  dout(30) << __func__ << " len 0x" << std::hex << orig_len << std::dec
+          << " -> " << bin << dendl;
   return bin;
 }
 
 void StupidAllocator::_insert_free(uint64_t off, uint64_t len)
 {
   unsigned bin = _choose_bin(len);
-  dout(30) << __func__ << " " << off << "~" << len << " in bin " << bin << dendl;
+  dout(30) << __func__ << " 0x" << std::hex << off << "~" << len << std::dec
+          << " in bin " << bin << dendl;
   while (true) {
     free[bin].insert(off, len, &off, &len);
     unsigned newbin = _choose_bin(len);
     if (newbin == bin)
       break;
-    dout(30) << __func__ << " promoting " << off << "~" << len
-            << " to bin " << newbin << dendl;
+    dout(30) << __func__ << " promoting 0x" << std::hex << off << "~" << len
+            << std::dec << " to bin " << newbin << dendl;
     free[bin].erase(off, len);
     bin = newbin;
   }
@@ -50,8 +52,9 @@ void StupidAllocator::_insert_free(uint64_t off, uint64_t len)
 int StupidAllocator::reserve(uint64_t need)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " need " << need << " num_free " << num_free
-          << " num_reserved " << num_reserved << dendl;
+  dout(10) << __func__ << " need 0x" << std::hex << need
+          << " num_free 0x" << num_free
+          << " num_reserved 0x" << num_reserved << std::dec << dendl;
   if ((int64_t)need > num_free - num_reserved)
     return -ENOSPC;
   num_reserved += need;
@@ -61,8 +64,9 @@ int StupidAllocator::reserve(uint64_t need)
 void StupidAllocator::unreserve(uint64_t unused)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " unused " << unused << " num_free " << num_free
-          << " num_reserved " << num_reserved << dendl;
+  dout(10) << __func__ << " unused 0x" << std::hex << unused
+          << " num_free 0x" << num_free
+          << " num_reserved 0x" << num_reserved << std::dec << dendl;
   assert(num_reserved >= (int64_t)unused);
   num_reserved -= unused;
 }
@@ -85,9 +89,9 @@ int StupidAllocator::allocate(
   uint64_t *offset, uint32_t *length)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " want_size " << want_size
-          << " alloc_unit " << alloc_unit
-          << " hint " << hint
+  dout(10) << __func__ << " want_size 0x" << std::hex << want_size
+          << " alloc_unit 0x" << alloc_unit
+          << " hint 0x" << hint << std::dec
           << dendl;
   uint64_t want = MAX(alloc_unit, want_size);
   int bin = _choose_bin(want);
@@ -160,21 +164,22 @@ int StupidAllocator::allocate(
     uint64_t max =
       alloc_unit * (rand() % g_conf->bluestore_debug_small_allocations);
     if (max && *length > max) {
-      dout(10) << __func__ << " shortening allocation of " << *length << " -> "
-              << max << " due to debug_small_allocations" << dendl;
+      dout(10) << __func__ << " shortening allocation of 0x" << std::hex
+              << *length << " -> 0x"
+              << max << " due to debug_small_allocations" << std::dec << dendl;
       *length = max;
     }
   }
-  dout(30) << __func__ << " got " << *offset << "~" << *length << " from bin "
-          << bin << dendl;
+  dout(30) << __func__ << " got 0x" << std::hex << *offset << "~" << *length
+          << " from bin " << std::dec << bin << dendl;
 
   free[bin].erase(*offset, *length);
   uint64_t off, len;
   if (*offset && free[bin].contains(*offset - skew - 1, &off, &len)) {
     int newbin = _choose_bin(len);
     if (newbin != bin) {
-      dout(30) << __func__ << " demoting " << off << "~" << len
-              << " to bin " << newbin << dendl;
+      dout(30) << __func__ << " demoting 0x" << std::hex << off << "~" << len
+              << std::dec << " to bin " << newbin << dendl;
       free[bin].erase(off, len);
       _insert_free(off, len);
     }
@@ -182,8 +187,8 @@ int StupidAllocator::allocate(
   if (free[bin].contains(*offset + *length, &off, &len)) {
     int newbin = _choose_bin(len);
     if (newbin != bin) {
-      dout(30) << __func__ << " demoting " << off << "~" << len
-              << " to bin " << newbin << dendl;
+      dout(30) << __func__ << " demoting 0x" << std::hex << off << "~" << len
+              << std::dec << " to bin " << newbin << dendl;
       free[bin].erase(off, len);
       _insert_free(off, len);
     }
@@ -239,7 +244,8 @@ int StupidAllocator::release(
   uint64_t offset, uint64_t length)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " " << offset << "~" << length << dendl;
+  dout(10) << __func__ << " 0x" << std::hex << offset << "~" << length
+          << std::dec << dendl;
   uncommitted.insert(offset, length);
   num_uncommitted += length;
   return 0;
@@ -260,7 +266,8 @@ void StupidAllocator::dump(ostream& out)
     for (auto p = free[bin].begin();
         p != free[bin].end();
         ++p) {
-      dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
+      dout(30) << __func__ << "  0x" << std::hex << p.get_start() << "~"
+              << p.get_len() << std::dec << dendl;
     }
   }
   dout(30) << __func__ << " committing: "
@@ -268,21 +275,24 @@ void StupidAllocator::dump(ostream& out)
   for (auto p = committing.begin();
        p != committing.end();
        ++p) {
-    dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
+    dout(30) << __func__ << "  0x" << std::hex << p.get_start() << "~"
+            << p.get_len() << std::dec << dendl;
   }
   dout(30) << __func__ << " uncommitted: "
           << uncommitted.num_intervals() << " extents" << dendl;
   for (auto p = uncommitted.begin();
        p != uncommitted.end();
        ++p) {
-    dout(30) << __func__ << "  " << p.get_start() << "~" << p.get_len() << dendl;
+    dout(30) << __func__ << "  0x" << std::hex << p.get_start() << "~"
+            << p.get_len() << std::dec << dendl;
   }
 }
 
 void StupidAllocator::init_add_free(uint64_t offset, uint64_t length)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " " << offset << "~" << length << dendl;
+  dout(10) << __func__ << " 0x" << std::hex << offset << "~" << length
+          << std::dec << dendl;
   _insert_free(offset, length);
   num_free += length;
 }
@@ -290,14 +300,16 @@ void StupidAllocator::init_add_free(uint64_t offset, uint64_t length)
 void StupidAllocator::init_rm_free(uint64_t offset, uint64_t length)
 {
   std::lock_guard<std::mutex> l(lock);
-  dout(10) << __func__ << " " << offset << "~" << length << dendl;
+  dout(10) << __func__ << " 0x" << std::hex << offset << "~" << length
+          << std::dec << dendl;
   btree_interval_set<uint64_t> rm;
   rm.insert(offset, length);
   for (unsigned i = 0; i < free.size() && !rm.empty(); ++i) {
     btree_interval_set<uint64_t> overlap;
     overlap.intersection_of(rm, free[i]);
     if (!overlap.empty()) {
-      dout(20) << __func__ << " bin " << i << " rm " << overlap << dendl;
+      dout(20) << __func__ << " bin " << i << " rm 0x" << std::hex << overlap
+              << std::dec << dendl;
       free[i].subtract(overlap);
       rm.subtract(overlap);
     }