[btr] Fix merge_input_pool().

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index d12dcde7b5055b426f40ec116f0d5533213ef522..40079c2ff9984f5207ad5f1cb0aeaaf78bf9dedc 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -582,18 +582,20 @@ static bool need_buffer_pool_merge(struct btr_node *btrn)
 
 static void merge_input_pool(struct btr_node *btrn, size_t dest_size)
 {
-       struct btr_buffer_reference *br, *wbr;
+       struct btr_buffer_reference *br, *wbr = NULL;
        int num_refs; /* including wrap buffer */
-       char *buf, *buf1, *buf2 = NULL;
-       size_t sz, sz1, sz2 = 0, wsz;
+       char *buf, *buf1 = NULL, *buf2 = NULL;
+       size_t sz, sz1 = 0, sz2 = 0, wsz;
 
-       if (list_empty(&btrn->input_queue))
+       br = get_first_input_br(btrn);
+       if (!br || br_available_bytes(br) >= dest_size)
                return;
-
        num_refs = 0;
        FOR_EACH_BUFFER_REF(br, btrn) {
                num_refs++;
                sz = btr_get_buffer_by_reference(br, &buf);
+               if (sz == 0)
+                       break;
                if (br->wrap_count != 0) {
                        assert(!wbr);
                        assert(num_refs == 1);
@@ -622,11 +624,16 @@ next:
                if (sz1 + sz2 >= dest_size)
                        break;
        }
+       if (!buf2) /* nothing to do */
+               return;
+       assert(buf1 && sz2 > 0);
+       /*
+        * If the second buffer is large, we only take the first part of it to
+        * avoid having to memcpy() huge buffers.
+        */
+       sz2 = PARA_MIN(sz2, (size_t)(64 * 1024));
        if (!wbr) {
-               assert(buf1);
-               if (!buf2) /* nothing to do */
-                       return;
-               /* make a new wrap buffer combining buf1 and buf 2. */
+               /* Make a new wrap buffer combining buf1 and buf2. */
                sz = sz1 + sz2;
                buf = para_malloc(sz);
                PARA_DEBUG_LOG("merging input buffers: (%p:%zu, %p:%zu) -> %p:%zu\n",
@@ -642,6 +649,7 @@ next:
                para_list_add(&br->node, &btrn->input_queue);
                return;
        }
+       PARA_DEBUG_LOG("increasing wrap buffer, sz1: %zu, sz2: %zu\n", sz1, sz2);
        /*
         * We already have a wrap buffer, but it is too small. It might be
         * partially used.
@@ -649,10 +657,8 @@ next:
        wsz = br_available_bytes(wbr);
        if (wbr->wrap_count == sz1 && wbr->btrb->size >= sz1 + sz2) /* nothing we can do about it */
                return;
-       assert(buf1 && buf2);
        sz = sz1 + sz2 - wbr->btrb->size; /* amount of new data */
        wbr->btrb->size += sz;
-       PARA_DEBUG_LOG("increasing wrap buffer to %zu\n", wbr->btrb->size);
        wbr->btrb->buf = para_realloc(wbr->btrb->buf, wbr->btrb->size);
        /* copy the new data to the end of the reallocated buffer */
        assert(sz2 >= sz);
@@ -745,6 +751,25 @@ void btr_log_tree(struct btr_node *btrn, int loglevel)
        return log_tree_recursively(btrn, loglevel, 0);
 }
 
+/*
+ * \return \a root if \a name is \p NULL.
+ */
+struct btr_node *btr_search_node(const char *name, struct btr_node *root)
+{
+       struct btr_node *ch;
+
+       if (!name)
+               return root;
+       if (!strcmp(root->name, name))
+               return root;
+       FOR_EACH_CHILD(ch, root) {
+               struct btr_node *result = btr_search_node(name, ch);
+               if (result)
+                       return result;
+       }
+       return NULL;
+}
+
 /** 640K ought to be enough for everybody ;) */
 #define BTRN_MAX_PENDING (640 * 1024)
 
@@ -753,6 +778,8 @@ int btr_node_status(struct btr_node *btrn, size_t min_iqs,
 {
        size_t iqs;
 
+       if (!btrn)
+               return 0;
        if (type != BTR_NT_LEAF) {
                if (btr_no_children(btrn))
                        return -E_BTR_NO_CHILD;