X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=dfecf10a24906f2e165ed9368f69c23e99f6e291;hp=80c0425b9931d8fcf29d28cfaf14e5647cd43674;hb=c09e475689a31b2f11a51faf379c72b9d0be73ab;hpb=5f303cc5a96bfeaa66d2d6e899bf56d1d03ed085

diff --git a/buffer_tree.c b/buffer_tree.c
index 80c0425b..dfecf10a 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -128,7 +128,7 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
 	assert(end <= btrp->area_end);
 
 	if (end == btrp->area_end) {
-		PARA_DEBUG_LOG("end of pool area reached: %p\n", end);
+		PARA_DEBUG_LOG("%s: end of pool area reached\n", btrp->name);
 		end = btrp->area_start;
 	}
 	if (end == btrp->rhead) {
@@ -193,7 +193,8 @@ struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
 /*
  * Allocate a new btr buffer.
  *
- * The freshly allocated buffer will have a zero refcount.
+ * The freshly allocated buffer will have a zero refcount and will
+ * not be associated with a btr pool.
  */
 static struct btr_buffer *new_btrb(char *buf, size_t size)
 {
@@ -621,11 +622,16 @@ next:
 		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;
-		/* 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",
@@ -688,8 +694,8 @@ static int merge_input(struct btr_node *btrn)
 	/* make a new btrb that combines the two buffers and a br to it. */
 	sz = szs[0] + szs[1];
 	buf = para_malloc(sz);
-	PARA_DEBUG_LOG("memory merging input buffers: (%zu, %zu) -> %zu\n",
-		szs[0], szs[1], sz);
+	PARA_DEBUG_LOG("%s: memory merging input buffers: (%zu, %zu) -> %zu\n",
+		btrn->name, szs[0], szs[1], sz);
 	memcpy(buf, bufs[0], szs[0]);
 	memcpy(buf + szs[0], bufs[1], szs[1]);
 
@@ -744,6 +750,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)
 
@@ -752,6 +777,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;