[btr]: Avoid large memcpy()s when creating the wrap buffers.

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index a7a3220b4d267955ae5fe467d9e08b1c48b6a5f3..dfecf10a24906f2e165ed9368f69c23e99f6e291 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -622,11 +622,16 @@ next:
                if (sz1 + sz2 >= dest_size)
                        break;
        }
                if (sz1 + sz2 >= dest_size)
                        break;
        }

+       /*
+        * 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;
        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",
                sz = sz1 + sz2;
                buf = para_malloc(sz);
                PARA_DEBUG_LOG("merging input buffers: (%p:%zu, %p:%zu) -> %p:%zu\n",


@@ -745,6 +750,25 @@ void btr_log_tree(struct btr_node *btrn, int loglevel)
        return log_tree_recursively(btrn, loglevel, 0);
 }
 
        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)
 
 /** 640K ought to be enough for everybody ;) */
 #define BTRN_MAX_PENDING (640 * 1024)