X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=23599b834a26e31adda87ecdb49da7238b0d1d10;hp=c826e8fa26a97c9036595ddf188bb984a7b4ec4e;hb=5496ca9d07ede9aaa3afd86b60cdf16ed8ccca2b;hpb=fa2f988176a46dabc3adb4144a56f34f89ae6d1b

diff --git a/buffer_tree.c b/buffer_tree.c
index c826e8fa..23599b83 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -216,20 +216,26 @@ static void flush_input_queue(struct btr_node *btrn)
 		btr_drop_buffer_reference(br);
 }
 
-void btr_del_node(struct btr_node *btrn)
+void btr_free_node(struct btr_node *btrn)
+{
+	if (!btrn)
+		return;
+	free(btrn->name);
+	free(btrn);
+}
+
+void btr_remove_node(struct btr_node *btrn)
 {
 	struct btr_node *ch;
 
 	if (!btrn)
 		return;
-	PARA_NOTICE_LOG("deleting %s\n", btrn->name);
+	PARA_NOTICE_LOG("removing btr node %s from buffer tree\n", btrn->name);
 	FOR_EACH_CHILD(ch, btrn)
 		ch->parent = NULL;
 	flush_input_queue(btrn);
 	if (btrn->parent)
 		list_del(&btrn->node);
-	free(btrn->name);
-	free(btrn);
 }
 
 size_t btr_get_input_queue_size(struct btr_node *btrn)
@@ -261,8 +267,6 @@ void btr_splice_out_node(struct btr_node *btrn)
 			list_move(&ch->node, &btrn->parent->children);
 	}
 	assert(list_empty(&btrn->children));
-	free(btrn->name);
-	free(btrn);
 }
 
 /**
@@ -404,3 +408,29 @@ void btr_log_tree(struct btr_node *btrn, int loglevel)
 {
 	return log_tree_recursively(btrn, loglevel, 0);
 }
+
+/** 640K ought to be enough for everybody ;) */
+#define BTRN_MAX_PENDING (640 * 1024)
+
+int btr_node_status(struct btr_node *btrn, size_t min_iqs,
+	enum btr_node_type type)
+{
+	size_t iqs;
+
+	if (type != BTR_NT_LEAF) {
+		if (btr_no_children(btrn))
+			return -E_BTR_NO_CHILD;
+		if (btr_bytes_pending(btrn) > BTRN_MAX_PENDING)
+			return 0;
+	}
+	if (type != BTR_NT_ROOT) {
+		if (btr_eof(btrn))
+			return -E_BTR_EOF;
+		iqs = btr_get_input_queue_size(btrn);
+		if (iqs == 0) /* we have a parent, because not eof */
+			return 0;
+		if (iqs < min_iqs && !btr_no_parent(btrn))
+			return 0;
+	}
+	return 1;
+}