[btr] Add a comment to btr_pool_available().

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index e023bb146071748877aa2643dd414f73e1d78bba..4160646da483bff8c8b0eea6c754d05fe17cf895 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)
@@ -491,12 +495,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 +794,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;