Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ni3oP-0006do-Iq for qemu-devel@nongnu.org; Thu, 18 Feb 2010 05:40:49 -0500 Received: from [199.232.76.173] (port=37749 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ni3oO-0006dd-9O for qemu-devel@nongnu.org; Thu, 18 Feb 2010 05:40:48 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Ni3oM-0005DW-Sk for qemu-devel@nongnu.org; Thu, 18 Feb 2010 05:40:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25506) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ni3oM-0005DS-GF for qemu-devel@nongnu.org; Thu, 18 Feb 2010 05:40:46 -0500 From: Juan Quintela In-Reply-To: <1266250769-5816-2-git-send-email-kwolf@redhat.com> (Kevin Wolf's message of "Mon, 15 Feb 2010 17:19:27 +0100") References: <1266250769-5816-1-git-send-email-kwolf@redhat.com> <1266250769-5816-2-git-send-email-kwolf@redhat.com> Date: Thu, 18 Feb 2010 11:40:02 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH 1/3] qcow2: Factor next_refcount_table_size out List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: hch@lst.de, qemu-devel@nongnu.org, gleb@redhat.com, armbru@redhat.com Kevin Wolf wrote: > When the refcount table grows, it doesn't only grow by one entry but reserves > some space for future refcount blocks. The algorithm to calculate the number of > entries stays the same with the fixes, so factor it out before replacing the > rest. > > Signed-off-by: Kevin Wolf > --- > block/qcow2-refcount.c | 34 +++++++++++++++++++++++----------- > 1 files changed, 23 insertions(+), 11 deletions(-) > > diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c > index 2fdc26b..0e2ecd7 100644 > --- a/block/qcow2-refcount.c > +++ b/block/qcow2-refcount.c > @@ -123,6 +123,28 @@ static int get_refcount(BlockDriverState *bs, int64_t cluster_index) > return be16_to_cpu(s->refcount_block_cache[block_index]); > } > > +/* > + * Rounds the refcount table size up to avoid growing the table for each single > + * refcount block that is allocated. > + */ > +static unsigned int next_refcount_table_size(BDRVQcowState *s, > + unsigned int min_size) > +{ > + unsigned int refcount_table_clusters = 0; > + unsigned int new_table_size = 1; > + > + while (min_size > new_table_size) { > + if (refcount_table_clusters == 0) { > + refcount_table_clusters = 1; > + } else { > + refcount_table_clusters = (refcount_table_clusters * 3 + 1) / 2; > + } > + new_table_size = refcount_table_clusters << (s->cluster_bits - 3); > + } > + > + return new_table_size; > +} > + couldn't something like: static unsigned int next_refcount_table_size(BDRVQcowState *s, unsigned int min_size) { unsigned int refcount_table_clusters = 1; unsigned int min_clusters = (min_size >> (s->clusters_bits -3)) + 1; while (min_clusters > refcount_table_clusters) { refcount_table_clusters = (refcount_table_clusters * 3 + 1) / 2; } return refconut_table_clusters << (s->cluster_bits - 3); } That removes the if from the inside loop, and makes the comparison in clusters not in size. What do you think? > static int grow_refcount_table(BlockDriverState *bs, int min_size) > { > BDRVQcowState *s = bs->opaque; > @@ -136,17 +158,7 @@ static int grow_refcount_table(BlockDriverState *bs, int min_size) > if (min_size <= s->refcount_table_size) > return 0; > /* compute new table size */ > - refcount_table_clusters = s->refcount_table_size >> (s->cluster_bits - 3); > - for(;;) { > - if (refcount_table_clusters == 0) { > - refcount_table_clusters = 1; > - } else { > - refcount_table_clusters = (refcount_table_clusters * 3 + 1) / 2; > - } > - new_table_size = refcount_table_clusters << (s->cluster_bits - 3); > - if (min_size <= new_table_size) > - break; > - } > + new_table_size = next_refcount_table_size(s, min_size); > #ifdef DEBUG_ALLOC2 > printf("grow_refcount_table from %d to %d\n", > s->refcount_table_size,