X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=2c02c69466f19111241aa835dd2f919cf710ecc0;hp=28999df50a38b31277a156acfd012e2e54806535;hb=05492521d51352fa8c4f55b71b33e14656f0bd0d;hpb=c87045a40b9462ebeb28cc169d7bb3721c9a81d3

diff --git a/buffer_tree.c b/buffer_tree.c
index 28999df5..2c02c694 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -41,6 +41,8 @@ struct btr_node {
 
 #define FOR_EACH_CHILD(_tn, _btrn) list_for_each_entry((_tn), \
 	&((_btrn)->children), node)
+#define FOR_EACH_CHILD_SAFE(_tn, _tmp, _btrn) \
+	list_for_each_entry_safe((_tn), (_tmp), &((_btrn)->children), node)
 
 #define FOR_EACH_BUFFER_REF(_br, _btrn) \
 	list_for_each_entry((_br), &(_btrn)->input_queue, node)
@@ -60,6 +62,10 @@ struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
 		list_add_tail(&btrn->node, &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);
+	else
+		PARA_INFO_LOG("added %s as btr root\n", name);
 	return btrn;
 }
 
@@ -160,6 +166,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;
@@ -219,22 +228,25 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
 	return size;
 }
 
-int btr_splice_out_node(struct btr_node *btrn)
+void btr_splice_out_node(struct btr_node *btrn)
 {
-	struct btr_node *ch;
+	struct btr_node *ch, *tmp;
 
-	if (!btrn)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (btr_get_input_queue_size(btrn) != 0)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	assert(btrn);
 	PARA_NOTICE_LOG("splicing out %s\n", btrn->name);
+	btr_pushdown(btrn);
 	if (btrn->parent)
 		list_del(&btrn->node);
-	FOR_EACH_CHILD(ch, btrn)
+	FOR_EACH_CHILD_SAFE(ch, tmp, btrn) {
+		PARA_INFO_LOG("parent(%s): %s\n", ch->name,
+			btrn->parent? btrn->parent->name : "NULL");
 		ch->parent = btrn->parent;
+		if (btrn->parent)
+			list_move(&ch->node, &btrn->parent->children);
+	}
+	assert(list_empty(&btrn->children));
 	free(btrn->name);
 	free(btrn);
-	return 1;
 }
 
 /**
@@ -269,16 +281,20 @@ int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result)
 
 	for (; btrn; btrn = btrn->parent) {
 		struct btr_node *parent = btrn->parent;
-		PARA_CRIT_LOG("parent: %p\n", parent);
 		if (!parent)
 			return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 		if (!parent->execute)
 			continue;
+		PARA_INFO_LOG("parent: %s, cmd: %s\n", parent->name, command);
 		ret = parent->execute(parent, command, value_result);
 		if (ret == -ERRNO_TO_PARA_ERROR(ENOTSUP))
 			continue;
 		if (ret < 0)
 			return ret;
+		if (value_result && *value_result)
+			PARA_NOTICE_LOG("%s(%s): %s\n", command, parent->name,
+				*value_result);
+		return 1;
 	}
 	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
@@ -293,7 +309,7 @@ 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)
 {
@@ -335,3 +351,15 @@ int btr_merge(struct btr_node *btrn)
 	para_list_add(&br->node, &btrn->input_queue);
 	return 2;
 }
+
+void btr_merge_to(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 (btr_merge(btrn) < 2)
+			return;
+	}
+}