X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=buffer_tree.c;h=1ca4a1536cdd452116303bbf43f7f24de4ef9c42;hb=8248f915d9ffef663f2a1d9c70393da6a4a5c7d2;hp=941d58dba07521dc773721b93262b56ea2466f4f;hpb=883af94f87f7d5465047c3bdd626a9dca3c2be8c;p=paraslash.git

diff --git a/buffer_tree.c b/buffer_tree.c
index 941d58db..1ca4a153 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -124,7 +124,7 @@ void btr_pushdown(struct btr_node *btrn)
 }
 
 /* Return true if this node has no children. */
-bool btr_is_leaf_node(struct btr_node *btrn)
+bool btr_no_children(struct btr_node *btrn)
 {
 	return list_empty(&btrn->children);
 }
@@ -141,14 +141,6 @@ bool btr_inplace_ok(struct btr_node *btrn)
 	return list_is_singular(&btrn->parent->children);
 }
 
-struct btr_buffer_reference *btr_next_br(struct btr_node *btrn)
-{
-	if (list_empty(&btrn->input_queue))
-		return NULL;
-	return list_first_entry(&btrn->input_queue, struct btr_buffer_reference, node);
-}
-
-
 static inline size_t br_available_bytes(struct btr_buffer_reference *br)
 {
 	return br->btrb->size - br->consumed;
@@ -160,9 +152,26 @@ size_t btr_get_buffer_by_reference(struct btr_buffer_reference *br, char **buf)
 	return br_available_bytes(br);
 }
 
-void btr_increase_used_bytes(struct btr_buffer_reference *br, size_t consumed)
+size_t btr_next_buffer(struct btr_node *btrn, char **bufp)
+{
+	struct btr_buffer_reference *br;
+
+	if (list_empty(&btrn->input_queue)) {
+		*bufp = NULL;
+		return 0;
+	}
+	br = list_first_entry(&btrn->input_queue, struct btr_buffer_reference, node);
+	return btr_get_buffer_by_reference(br, bufp);
+}
+
+void btr_consume(struct btr_node *btrn, size_t numbytes)
 {
-	br->consumed += consumed;
+	struct btr_buffer_reference *br;
+
+	assert(!list_empty(&btrn->input_queue));
+	br = list_first_entry(&btrn->input_queue, struct btr_buffer_reference, node);
+	assert(br->consumed + numbytes <= br->btrb->size);
+	br->consumed += numbytes;
 	if (br->consumed == br->btrb->size)
 		btr_drop_buffer_reference(br);
 }
@@ -178,6 +187,9 @@ void btr_del_node(struct btr_node *btrn)
 {
 	struct btr_node *ch;
 
+	if (!btrn)
+		return;
+	PARA_NOTICE_LOG("deleting %s\n", btrn->name);
 	FOR_EACH_CHILD(ch, btrn)
 		ch->parent = NULL;
 	flush_input_queue(btrn);