X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=e023bb146071748877aa2643dd414f73e1d78bba;hp=8aa66b6c7efce8a51e37ab2b52f4102f074d936d;hb=5ec0d9ef2189e22b3ee80f661196b6ae0593a525;hpb=1d7a26dca86a639db694663738ccc01acaa88aba

diff --git a/buffer_tree.c b/buffer_tree.c
index 8aa66b6c..e023bb14 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -168,25 +168,32 @@ static void btr_pool_deallocate(struct btr_pool *btrp, size_t size)
 #define FOR_EACH_BUFFER_REF_SAFE(_br, _tmp, _btrn) \
 	list_for_each_entry_safe((_br), (_tmp), &(_btrn)->input_queue, node)
 
-struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
-		btr_command_handler handler, void *context)
+/*
+	(parent, child):
+	(NULL, NULL): new, isolated node.
+	(NULL, c): new node becomes root, c must be old root
+	(p, NULL): new leaf node
+	(p, c): new internal node, ch must be child of p
+
+*/
+struct btr_node *btr_new_node(struct btr_node_description *bnd)
 {
 	struct btr_node *btrn = para_malloc(sizeof(*btrn));
 
-	btrn->name = para_strdup(name);
-	btrn->parent = parent;
-	btrn->execute = handler;
-	btrn->context = context;
+	btrn->name = para_strdup(bnd->name);
+	btrn->parent = bnd->parent;
+	btrn->execute = bnd->handler;
+	btrn->context = bnd->context;
 	btrn->start.tv_sec = 0;
 	btrn->start.tv_usec = 0;
-	if (parent)
-		list_add_tail(&btrn->node, &parent->children);
+	if (bnd->parent)
+		list_add_tail(&btrn->node, &bnd->parent->children);
 	INIT_LIST_HEAD(&btrn->children);
 	INIT_LIST_HEAD(&btrn->input_queue);
-	if (parent)
-		PARA_INFO_LOG("added %s as child of %s\n", name, parent->name);
+	if (bnd->parent)
+		PARA_INFO_LOG("added %s as child of %s\n", bnd->name, bnd->parent->name);
 	else
-		PARA_INFO_LOG("added %s as btr root\n", name);
+		PARA_INFO_LOG("added %s as btr root\n", bnd->name);
 	return btrn;
 }
 
@@ -582,18 +589,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 +631,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 +656,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 +664,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);