write: Add --buffer-tree option.

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index 9a59fff9c0419ac95ea4f71c62ef87e108973dbb..1ca4a1536cdd452116303bbf43f7f24de4ef9c42 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -4,7 +4,7 @@
 #include "para.h"
 #include "list.h"
 #include "string.h"
-//#include "buffer_tree.h"
+#include "buffer_tree.h"
 
 
 struct btr_buffer {
@@ -44,8 +44,6 @@ struct btr_node {
 #define FOR_EACH_BUFFER_REF_SAFE(_br, _tmp, _btrn) \
        list_for_each_entry_safe((_br), (_tmp), &(_btrn)->input_queue, node)
 
-INIT_STDERR_LOGGING(0);
-
 struct btr_node *btr_new_node(char *name, struct btr_node *parent)
 {
        struct btr_node *btrn = para_malloc(sizeof(*btrn));
@@ -77,7 +75,7 @@ static struct btr_buffer *new_btrb(char *buf, size_t size)
 /*
  * Deallocate the reference, release the resources if refcount drops to zero.
  */
-void btr_drop_buffer_reference(struct btr_buffer_reference *br)
+static void btr_drop_buffer_reference(struct btr_buffer_reference *br)
 {
        struct btr_buffer *btrb = br->btrb;
 
@@ -111,7 +109,7 @@ void btr_add_output(char *buf, size_t size, struct btr_node *btrn)
        add_btrb_to_children(btrb, btrn);
 }
 
-void btr_pushdown_br(struct btr_buffer_reference *br, struct btr_node *btrn)
+static void btr_pushdown_br(struct btr_buffer_reference *br, struct btr_node *btrn)
 {
        add_btrb_to_children(br->btrb, btrn);
        btr_drop_buffer_reference(br);
@@ -126,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);
 }
@@ -143,13 +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;
@@ -161,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);
 }
@@ -179,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);
@@ -198,7 +209,19 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
        return size;
 }
 
-int main(void)
+/**
+ * Return the size of the largest input queue.
+ *
+ * Iterates over all children of the given node.
+ */
+size_t btr_bytes_pending(struct btr_node *btrn)
 {
-       return 1;
+       size_t max_size = 0;
+       struct btr_node *ch;
+
+       FOR_EACH_CHILD(ch, btrn) {
+               size_t size = btr_get_input_queue_size(ch);
+               max_size = PARA_MAX(max_size, size);
+       }
+       return max_size;
 }