Fix stream grabbing.

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index 80c0425b9931d8fcf29d28cfaf14e5647cd43674..8aa66b6c7efce8a51e37ab2b52f4102f074d936d 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -128,7 +128,7 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
        assert(end <= btrp->area_end);
 
        if (end == btrp->area_end) {
        assert(end <= btrp->area_end);
 
        if (end == btrp->area_end) {

-               PARA_DEBUG_LOG("end of pool area reached: %p\n", end);
+               PARA_DEBUG_LOG("%s: end of pool area reached\n", btrp->name);

                end = btrp->area_start;
        }
        if (end == btrp->rhead) {
                end = btrp->area_start;
        }
        if (end == btrp->rhead) {


@@ -193,7 +193,8 @@ struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
 /*
  * Allocate a new btr buffer.
  *
 /*
  * Allocate a new btr buffer.
  *

- * The freshly allocated buffer will have a zero refcount.
+ * The freshly allocated buffer will have a zero refcount and will
+ * not be associated with a btr pool.

  */
 static struct btr_buffer *new_btrb(char *buf, size_t size)
 {
  */
 static struct btr_buffer *new_btrb(char *buf, size_t size)
 {


@@ -688,8 +689,8 @@ static int merge_input(struct btr_node *btrn)
        /* make a new btrb that combines the two buffers and a br to it. */
        sz = szs[0] + szs[1];
        buf = para_malloc(sz);
        /* make a new btrb that combines the two buffers and a br to it. */
        sz = szs[0] + szs[1];
        buf = para_malloc(sz);

-       PARA_DEBUG_LOG("memory merging input buffers: (%zu, %zu) -> %zu\n",
-               szs[0], szs[1], sz);
+       PARA_DEBUG_LOG("%s: memory merging input buffers: (%zu, %zu) -> %zu\n",
+               btrn->name, szs[0], szs[1], sz);

        memcpy(buf, bufs[0], szs[0]);
        memcpy(buf + szs[0], bufs[1], szs[1]);
 
        memcpy(buf, bufs[0], szs[0]);
        memcpy(buf + szs[0], bufs[1], szs[1]);
 


@@ -744,6 +745,25 @@ void btr_log_tree(struct btr_node *btrn, int loglevel)
        return log_tree_recursively(btrn, loglevel, 0);
 }
 
        return log_tree_recursively(btrn, loglevel, 0);
 }
 

+/*
+ * \return \a root if \a name is \p NULL.
+ */
+struct btr_node *btr_search_node(const char *name, struct btr_node *root)
+{
+       struct btr_node *ch;
+
+       if (!name)
+               return root;
+       if (!strcmp(root->name, name))
+               return root;
+       FOR_EACH_CHILD(ch, root) {
+               struct btr_node *result = btr_search_node(name, ch);
+               if (result)
+                       return result;
+       }
+       return NULL;
+}
+

 /** 640K ought to be enough for everybody ;) */
 #define BTRN_MAX_PENDING (640 * 1024)
 
 /** 640K ought to be enough for everybody ;) */
 #define BTRN_MAX_PENDING (640 * 1024)
 


@@ -752,6 +772,8 @@ int btr_node_status(struct btr_node *btrn, size_t min_iqs,
 {
        size_t iqs;
 
 {
        size_t iqs;
 

+       if (!btrn)
+               return 0;

        if (type != BTR_NT_LEAF) {
                if (btr_no_children(btrn))
                        return -E_BTR_NO_CHILD;
        if (type != BTR_NT_LEAF) {
                if (btr_no_children(btrn))
                        return -E_BTR_NO_CHILD;