X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=buffer_tree.c;h=c826e8fa26a97c9036595ddf188bb984a7b4ec4e;hb=83b222427d80c325b6f30e6693fbc5c05d8fa11f;hp=b7420ebeeb38e70f85ad4c9f34fa215b59504f61;hpb=dfecdabf4aa13e3587b7c73be0f051693dab4d20;p=paraslash.git

diff --git a/buffer_tree.c b/buffer_tree.c
index b7420ebe..c826e8fa 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -119,6 +119,11 @@ void btr_add_output(char *buf, size_t size, struct btr_node *btrn)
 {
 	struct btr_buffer *btrb;
 
+	assert(size != 0);
+	if (list_empty(&btrn->children)) {
+		free(buf);
+		return;
+	}
 	btrb = new_btrb(buf, size);
 	add_btrb_to_children(btrb, btrn, 0);
 }
@@ -137,6 +142,17 @@ void btr_pushdown(struct btr_node *btrn)
 		btr_pushdown_br(br, btrn);
 }
 
+int btr_pushdown_one(struct btr_node *btrn)
+{
+	struct btr_buffer_reference *br;
+
+	if (list_empty(&btrn->input_queue))
+		return 0;
+	br = list_first_entry(&btrn->input_queue, struct btr_buffer_reference, node);
+	btr_pushdown_br(br, btrn);
+	return 1;
+}
+
 /* Return true if this node has no children. */
 bool btr_no_children(struct btr_node *btrn)
 {
@@ -166,6 +182,9 @@ size_t btr_get_buffer_by_reference(struct btr_buffer_reference *br, char **buf)
 	return br_available_bytes(br);
 }
 
+/**
+ * \return zero if the input buffer queue is empty.
+ */
 size_t btr_next_buffer(struct btr_node *btrn, char **bufp)
 {
 	struct btr_buffer_reference *br;
@@ -244,7 +263,6 @@ void btr_splice_out_node(struct btr_node *btrn)
 	assert(list_empty(&btrn->children));
 	free(btrn->name);
 	free(btrn);
-	return 1;
 }
 
 /**
@@ -307,9 +325,9 @@ void *btr_context(struct btr_node *btrn)
  *
  * This is a quite expensive operation.
  *
- * \return The number of buffers that have been merged (zero, one or two).
+ * \return The number of buffers that have been available (zero, one or two).
  */
-int btr_merge(struct btr_node *btrn)
+static int merge_input(struct btr_node *btrn)
 {
 	struct btr_buffer_reference *brs[2], *br;
 	char *bufs[2], *buf;
@@ -349,3 +367,40 @@ int btr_merge(struct btr_node *btrn)
 	para_list_add(&br->node, &btrn->input_queue);
 	return 2;
 }
+
+void btr_merge(struct btr_node *btrn, size_t dest_size)
+{
+	for (;;) {
+		char *buf;
+		size_t len = btr_next_buffer(btrn, &buf);
+		if (len >= dest_size)
+			return;
+		if (merge_input(btrn) < 2)
+			return;
+	}
+}
+
+bool btr_eof(struct btr_node *btrn)
+{
+	char *buf;
+	size_t len = btr_next_buffer(btrn, &buf);
+
+	return (len == 0 && btr_no_parent(btrn));
+}
+
+void log_tree_recursively(struct btr_node *btrn, int loglevel, int depth)
+{
+	struct btr_node *ch;
+	const char spaces[] = "                 ", *space = spaces + 16 - depth;
+
+	if (depth > 16)
+		return;
+	para_log(loglevel, "%s%s\n", space, btrn->name);
+	FOR_EACH_CHILD(ch, btrn)
+		log_tree_recursively(ch, loglevel, depth + 1);
+}
+
+void btr_log_tree(struct btr_node *btrn, int loglevel)
+{
+	return log_tree_recursively(btrn, loglevel, 0);
+}