btrfs-tree: connect methods to the debug stream interface

In some cases functions already had existing debug stream support
which can be redirected to the new interface.  In other cases, new
debug messages are added.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

diff --git a/lib/btrfs-tree.cc b/lib/btrfs-tree.cc
index a20919ee9ac507b42ff10aa839daa42b0b907119..dd3bee0926aefaa95b8d27358af9085cb27fcf7c 100644 (file)
--- a/lib/btrfs-tree.cc
+++ b/lib/btrfs-tree.cc
@@ -5,6 +5,12 @@
 #include "crucible/hexdump.h"
 #include "crucible/seeker.h"
 
+#define CRUCIBLE_BTRFS_TREE_DEBUG(x) do { \
+       if (BtrfsIoctlSearchKey::s_debug_ostream) { \
+               (*BtrfsIoctlSearchKey::s_debug_ostream) << x; \
+       } \
+} while (false)
+
 namespace crucible {
        using namespace std;
 
@@ -355,6 +361,7 @@ namespace crucible {
        BtrfsTreeItem
        BtrfsTreeFetcher::at(uint64_t logical)
        {
+               CRUCIBLE_BTRFS_TREE_DEBUG("at " << logical);
                BtrfsIoctlSearchKey &sk = m_sk;
                fill_sk(sk, logical);
                // Exact match, should return 0 or 1 items
@@ -397,9 +404,10 @@ namespace crucible {
        BtrfsTreeFetcher::rlower_bound(uint64_t logical)
        {
        #if 0
-       #define BTFRLB_DEBUG(x) do { cerr << x; } while (false)
+               static bool btfrlb_debug = getenv("BTFLRB_DEBUG");
+       #define BTFRLB_DEBUG(x) do { if (btfrlb_debug) cerr << x; } while (false)
        #else
-       #define BTFRLB_DEBUG(x) do { } while (false)
+       #define BTFRLB_DEBUG(x) CRUCIBLE_BTRFS_TREE_DEBUG(x)
        #endif
                BtrfsTreeItem closest_item;
                uint64_t closest_logical = 0;
@@ -474,6 +482,7 @@ namespace crucible {
        BtrfsTreeItem
        BtrfsTreeFetcher::next(uint64_t logical)
        {
+               CRUCIBLE_BTRFS_TREE_DEBUG("next " << logical);
                const auto scaled_logical = scale_logical(logical);
                if (scaled_logical + 1 > scaled_max_logical()) {
                        return BtrfsTreeItem();
@@ -484,6 +493,7 @@ namespace crucible {
        BtrfsTreeItem
        BtrfsTreeFetcher::prev(uint64_t logical)
        {
+               CRUCIBLE_BTRFS_TREE_DEBUG("prev " << logical);
                const auto scaled_logical = scale_logical(logical);
                if (scaled_logical < 1) {
                        return BtrfsTreeItem();
@@ -568,9 +578,10 @@ namespace crucible {
        BtrfsCsumTreeFetcher::get_sums(uint64_t const logical, size_t count, function<void(uint64_t logical, const uint8_t *buf, size_t bytes)> output)
        {
        #if 0
-       #define BCTFGS_DEBUG(x) do { cerr << x; } while (false)
+               static bool bctfgs_debug = getenv("BCTFGS_DEBUG");
+       #define BCTFGS_DEBUG(x) do { if (bctfgs_debug) cerr << x; } while (false)
        #else
-       #define BCTFGS_DEBUG(x) do { } while (false)
+       #define BCTFGS_DEBUG(x) CRUCIBLE_BTRFS_TREE_DEBUG(x)
        #endif
                const uint64_t logical_end = logical + count * block_size();
                BtrfsTreeItem bti = rlower_bound(logical);