[btr] log message cleanups.

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index e023bb146071748877aa2643dd414f73e1d78bba..7180149ee49ade68b6310bb2f596562cb8ff08a8 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -100,6 +100,10 @@ size_t btr_pool_unused(struct btr_pool *btrp)
        return btr_pool_size(btrp) - btr_pool_filled(btrp);
 }
 
+/*
+ * Return maximal size available for one read. This is
+ * smaller than the value returned by btr_pool_unused().
+ */
 size_t btr_pool_available(struct btr_pool *btrp)
 {
        if (!btrp->whead)
@@ -122,7 +126,6 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
 
        if (size == 0)
                return;
-       //PARA_CRIT_LOG("filled: %zu, alloc %zu\n", btr_pool_filled(btrp), size);
        assert(size <= btr_pool_available(btrp));
        end = btrp->whead + size;
        assert(end <= btrp->area_end);
@@ -132,18 +135,16 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
                end = btrp->area_start;
        }
        if (end == btrp->rhead) {
-               PARA_DEBUG_LOG("btrp buffer full\n");
+               PARA_DEBUG_LOG("%s btrp buffer full\n", btrp->name);
                end = NULL; /* buffer full */
        }
        btrp->whead = end;
-       //PARA_CRIT_LOG("filled: %zu\n", btr_pool_filled(btrp));
 }
 
 static void btr_pool_deallocate(struct btr_pool *btrp, size_t size)
 {
        char *end = btrp->rhead + size;
 
-       //PARA_CRIT_LOG("filled: %zu, dealloc %zu\n", btr_pool_filled(btrp), size);
        if (size == 0)
                return;
        assert(end <= btrp->area_end);
@@ -155,7 +156,6 @@ static void btr_pool_deallocate(struct btr_pool *btrp, size_t size)
        btrp->rhead = end;
        if (btrp->rhead == btrp->whead)
                btrp->rhead = btrp->whead = btrp->area_start;
-       //PARA_CRIT_LOG("filled: %zu\n", btr_pool_filled(btrp));
 }
 
 #define FOR_EACH_CHILD(_tn, _btrn) list_for_each_entry((_tn), \
@@ -235,7 +235,6 @@ static void btr_drop_buffer_reference(struct btr_buffer_reference *br)
 {
        struct btr_buffer *btrb = br->btrb;
 
-       //PARA_CRIT_LOG("dropping buffer reference %p\n", br);
        list_del(&br->node);
        free(br);
        btrb->refcount--;
@@ -390,15 +389,8 @@ size_t btr_next_buffer(struct btr_node *btrn, char **bufp)
                }
                if (!br->btrb->pool)
                        break;
-               if (result + rv != buf) {
-                       PARA_DEBUG_LOG("%s: pool merge impossible: %p != %p\n",
-                               btrn->name, result + rv, buf);
+               if (result + rv != buf)
                        break;
-               }
-//             PARA_CRIT_LOG("%s: inplace merge (%zu, %zu)->%zu\n", btrn->name,
-//                     rv, sz, rv + sz);
-//             PARA_CRIT_LOG("%s: inplace merge %p (%zu)\n", btrn->name,
-//                     result, sz);
                rv += sz;
        }
        if (bufp)
@@ -416,7 +408,6 @@ void btr_consume(struct btr_node *btrn, size_t numbytes)
        br = get_first_input_br(btrn);
        assert(br);
 
-       //PARA_CRIT_LOG("wrap count: %zu\n", br->wrap_count);
        if (br->wrap_count == 0) {
                /*
                 * No wrap buffer. Drop buffer references whose buffer
@@ -491,12 +482,17 @@ void btr_remove_node(struct btr_node *btrn)
 size_t btr_get_input_queue_size(struct btr_node *btrn)
 {
        struct btr_buffer_reference *br;
-       size_t size = 0;
+       size_t size = 0, wrap_consumed = 0;
 
        FOR_EACH_BUFFER_REF(br, btrn) {
-               //PARA_CRIT_LOG("size: %zu\n", size);
+               if (br->wrap_count != 0) {
+                       wrap_consumed = br->consumed;
+                       continue;
+               }
                size += br_available_bytes(br);
        }
+       assert(wrap_consumed <= size);
+       size -= wrap_consumed;
        return size;
 }
 
@@ -785,8 +781,7 @@ int btr_node_status(struct btr_node *btrn, size_t min_iqs,
 {
        size_t iqs;
 
-       if (!btrn)
-               return 0;
+       assert(btrn);
        if (type != BTR_NT_LEAF) {
                if (btr_no_children(btrn))
                        return -E_BTR_NO_CHILD;