X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=buffer_tree.c;h=d12dcde7b5055b426f40ec116f0d5533213ef522;hb=172e2ef5bc06aee5a68c37e10b1a8918895c23f9;hp=80c0425b9931d8fcf29d28cfaf14e5647cd43674;hpb=5f303cc5a96bfeaa66d2d6e899bf56d1d03ed085;p=paraslash.git

diff --git a/buffer_tree.c b/buffer_tree.c
index 80c0425b..d12dcde7 100644
--- 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) {
-		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) {
@@ -193,7 +193,8 @@ struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
 /*
  * 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)
 {
@@ -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);
-	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]);