X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=7180149ee49ade68b6310bb2f596562cb8ff08a8;hp=4160646da483bff8c8b0eea6c754d05fe17cf895;hb=b8caed98bbe13587dfb3f59d5c53746a6c6f70a8;hpb=b21e8ef1df178fed144619bd3fba8cb67148454f

diff --git a/buffer_tree.c b/buffer_tree.c
index 4160646d..7180149e 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -126,7 +126,6 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
 
 	if (size == 0)
 		return;
-	//PARA_CRIT_LOG("filled: %zu, alloc %zu\n", btr_pool_filled(btrp), size);
 	assert(size <= btr_pool_available(btrp));
 	end = btrp->whead + size;
 	assert(end <= btrp->area_end);
@@ -136,18 +135,16 @@ void btr_pool_allocate(struct btr_pool *btrp, size_t size)
 		end = btrp->area_start;
 	}
 	if (end == btrp->rhead) {
-		PARA_DEBUG_LOG("btrp buffer full\n");
+		PARA_DEBUG_LOG("%s btrp buffer full\n", btrp->name);
 		end = NULL; /* buffer full */
 	}
 	btrp->whead = end;
-	//PARA_CRIT_LOG("filled: %zu\n", btr_pool_filled(btrp));
 }
 
 static void btr_pool_deallocate(struct btr_pool *btrp, size_t size)
 {
 	char *end = btrp->rhead + size;
 
-	//PARA_CRIT_LOG("filled: %zu, dealloc %zu\n", btr_pool_filled(btrp), size);
 	if (size == 0)
 		return;
 	assert(end <= btrp->area_end);
@@ -159,7 +156,6 @@ static void btr_pool_deallocate(struct btr_pool *btrp, size_t size)
 	btrp->rhead = end;
 	if (btrp->rhead == btrp->whead)
 		btrp->rhead = btrp->whead = btrp->area_start;
-	//PARA_CRIT_LOG("filled: %zu\n", btr_pool_filled(btrp));
 }
 
 #define FOR_EACH_CHILD(_tn, _btrn) list_for_each_entry((_tn), \
@@ -239,7 +235,6 @@ static void btr_drop_buffer_reference(struct btr_buffer_reference *br)
 {
 	struct btr_buffer *btrb = br->btrb;
 
-	//PARA_CRIT_LOG("dropping buffer reference %p\n", br);
 	list_del(&br->node);
 	free(br);
 	btrb->refcount--;
@@ -394,15 +389,8 @@ size_t btr_next_buffer(struct btr_node *btrn, char **bufp)
 		}
 		if (!br->btrb->pool)
 			break;
-		if (result + rv != buf) {
-			PARA_DEBUG_LOG("%s: pool merge impossible: %p != %p\n",
-				btrn->name, result + rv, buf);
+		if (result + rv != buf)
 			break;
-		}
-//		PARA_CRIT_LOG("%s: inplace merge (%zu, %zu)->%zu\n", btrn->name,
-//			rv, sz, rv + sz);
-//		PARA_CRIT_LOG("%s: inplace merge %p (%zu)\n", btrn->name,
-//			result, sz);
 		rv += sz;
 	}
 	if (bufp)
@@ -420,7 +408,6 @@ void btr_consume(struct btr_node *btrn, size_t numbytes)
 	br = get_first_input_br(btrn);
 	assert(br);
 
-	//PARA_CRIT_LOG("wrap count: %zu\n", br->wrap_count);
 	if (br->wrap_count == 0) {
 		/*
 		 * No wrap buffer. Drop buffer references whose buffer